sha1_file: only expose empty object constants through git_hash_algo
There really isn't any case in which we want to expose the constants for empty trees and blobs outside of using the hash algorithm abstraction. Make these constants static and stop exposing the defines in cache.h. Remove the constants which are no longer in use. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
May 2, 2018 at 00:26 UTC
e1ccd7e2b1cae8d7dab4686cddbd923fb6c46953
2 files changed
+11
-18
cache.h
-16
@@ -1013,22 +1013,6 @@ static inline void oidread(struct object_id *oid, const unsigned char *hash)
1013
memcpy(oid->hash, hash, the_hash_algo->rawsz);
1014
}
1015
1016
-
1017
-#define EMPTY_TREE_SHA1_HEX \
1018
- "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
1019
-#define EMPTY_TREE_SHA1_BIN_LITERAL \
1020
- "\x4b\x82\x5d\xc6\x42\xcb\x6e\xb9\xa0\x60" \
1021
- "\xe5\x4b\xf8\xd6\x92\x88\xfb\xee\x49\x04"
1022
-extern const struct object_id empty_tree_oid;
1023
-#define EMPTY_TREE_SHA1_BIN (empty_tree_oid.hash)
1024
-
1025
-#define EMPTY_BLOB_SHA1_HEX \
1026
- "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"
1027
-#define EMPTY_BLOB_SHA1_BIN_LITERAL \
1028
- "\xe6\x9d\xe2\x9b\xb2\xd1\xd6\x43\x4b\x8b" \
1029
- "\x29\xae\x77\x5a\xd8\xc2\xe4\x8c\x53\x91"
1030
-extern const struct object_id empty_blob_oid;
1031
-
1016
static inline int is_empty_blob_sha1(const unsigned char *sha1)
1017
{
1018
return !hashcmp(sha1, the_hash_algo->empty_blob->hash);
sha1_file.c
+11
-2
@@ -35,12 +35,21 @@
35
/* The maximum size for an object header. */
36
#define MAX_HEADER_LEN 32
37
38
+
39
+#define EMPTY_TREE_SHA1_BIN_LITERAL \
40
+ "\x4b\x82\x5d\xc6\x42\xcb\x6e\xb9\xa0\x60" \
41
+ "\xe5\x4b\xf8\xd6\x92\x88\xfb\xee\x49\x04"
42
+
43
+#define EMPTY_BLOB_SHA1_BIN_LITERAL \
44
+ "\xe6\x9d\xe2\x9b\xb2\xd1\xd6\x43\x4b\x8b" \
45
+ "\x29\xae\x77\x5a\xd8\xc2\xe4\x8c\x53\x91"
46
+
47
const unsigned char null_sha1[GIT_MAX_RAWSZ];
48
const struct object_id null_oid;
40
-const struct object_id empty_tree_oid = {
49
+static const struct object_id empty_tree_oid = {
50
EMPTY_TREE_SHA1_BIN_LITERAL
51
};
43
-const struct object_id empty_blob_oid = {
52
+static const struct object_id empty_blob_oid = {
53
EMPTY_BLOB_SHA1_BIN_LITERAL
54
};
55