summaryrefslogtreecommitdiff
path: root/sha1dc
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-03-16 22:08:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-16 22:16:45 (GMT)
commit45a574eec82424ac11c4c5fe117725597309b9c9 (patch)
treea3e7618713df7cab69d1be29d9a89c59ee0afefd /sha1dc
parent28dc98e343ca4eb370a29ceec4c19beac9b5c01e (diff)
downloadgit-45a574eec82424ac11c4c5fe117725597309b9c9.zip
git-45a574eec82424ac11c4c5fe117725597309b9c9.tar.gz
git-45a574eec82424ac11c4c5fe117725597309b9c9.tar.bz2
sha1dc: adjust header includes for git
We can replace system includes with git-compat-util.h or cache.h (and should make sure it is included first in all C files). And we can drop includes from headers entirely, as every C file should include git-compat-util.h itself. We will add in new include guards around the header files, though (otherwise you get into trouble including both sha1dc/sha1.h and cache.h). And finally, we'll use the full "sha1dc/" path for including related files. This isn't strictly necessary, but makes the expected resolution more obvious. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1dc')
-rw-r--r--sha1dc/sha1.c10
-rw-r--r--sha1dc/sha1.h6
-rw-r--r--sha1dc/ubc_check.c4
-rw-r--r--sha1dc/ubc_check.h2
4 files changed, 9 insertions, 13 deletions
diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index 27a535c..d25d93a 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -5,13 +5,9 @@
* https://opensource.org/licenses/MIT
***/
-#include <string.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "sha1.h"
-#include "ubc_check.h"
+#include "cache.h"
+#include "sha1dc/sha1.h"
+#include "sha1dc/ubc_check.h"
/*
diff --git a/sha1dc/sha1.h b/sha1dc/sha1.h
index 8855617..7d4d423 100644
--- a/sha1dc/sha1.h
+++ b/sha1dc/sha1.h
@@ -4,13 +4,13 @@
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
***/
+#ifndef SHA1DC_SHA1_H
+#define SHA1DC_SHA1_H
#if defined(__cplusplus)
extern "C" {
#endif
-#include <stdint.h>
-
/* uses SHA-1 message expansion to expand the first 16 words of W[] to 80 words */
/* void sha1_message_expansion(uint32_t W[80]); */
@@ -103,3 +103,5 @@ int SHA1DCFinal(unsigned char[20], SHA1_CTX*);
#if defined(__cplusplus)
}
#endif
+
+#endif /* SHA1DC_SHA1_H */
diff --git a/sha1dc/ubc_check.c b/sha1dc/ubc_check.c
index 27d0976..089dd47 100644
--- a/sha1dc/ubc_check.c
+++ b/sha1dc/ubc_check.c
@@ -24,8 +24,8 @@
// ubc_check has been verified against ubc_check_verify using the 'ubc_check_test' program in the tools section
*/
-#include <stdint.h>
-#include "ubc_check.h"
+#include "git-compat-util.h"
+#include "sha1dc/ubc_check.h"
static const uint32_t DV_I_43_0_bit = (uint32_t)(1) << 0;
static const uint32_t DV_I_44_0_bit = (uint32_t)(1) << 1;
diff --git a/sha1dc/ubc_check.h b/sha1dc/ubc_check.h
index b349bed..b64c306 100644
--- a/sha1dc/ubc_check.h
+++ b/sha1dc/ubc_check.h
@@ -27,8 +27,6 @@
extern "C" {
#endif
-#include <stdint.h>
-
#define DVMASKSIZE 1
typedef struct { int dvType; int dvK; int dvB; int testt; int maski; int maskb; uint32_t dm[80]; } dv_info_t;
extern dv_info_t sha1_dvs[];