From 5d6ccf5ce7f28e576a87f6c6f4f99fae90e06db6 Mon Sep 17 00:00:00 2001 From: Jason McMullan Date: Fri, 3 Jun 2005 11:05:39 -0400 Subject: [PATCH] [PATCH] Anal retentive 'const unsigned char *sha1' Make 'sha1' parameters const where possible Signed-off-by: Jason McMullan Signed-off-by: Linus Torvalds --- blob.c | 2 +- blob.h | 2 +- cache.h | 2 +- commit.c | 6 +++--- commit.h | 4 ++-- delta.c | 2 +- delta.h | 2 +- object.c | 8 ++++---- object.h | 6 +++--- sha1_file.c | 2 +- tag.c | 2 +- tag.h | 2 +- tree.c | 2 +- tree.h | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/blob.c b/blob.c index c800cd390..ea52ad5c9 100644 --- a/blob.c +++ b/blob.c @@ -4,7 +4,7 @@ const char *blob_type = "blob"; -struct blob *lookup_blob(unsigned char *sha1) +struct blob *lookup_blob(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { diff --git a/blob.h b/blob.h index 8004c835e..ea5d9e9f8 100644 --- a/blob.h +++ b/blob.h @@ -9,7 +9,7 @@ struct blob { struct object object; }; -struct blob *lookup_blob(unsigned char *sha1); +struct blob *lookup_blob(const unsigned char *sha1); int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size); diff --git a/cache.h b/cache.h index 74307f182..6a7525afc 100644 --- a/cache.h +++ b/cache.h @@ -167,7 +167,7 @@ extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, uns extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size); extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1); -extern int check_sha1_signature(unsigned char *sha1, void *buf, unsigned long size, const char *type); +extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type); /* Read a tree into the cache */ extern int read_tree(void *buffer, unsigned long size, int stage); diff --git a/commit.c b/commit.c index 21ac2fe9d..9fa03ef03 100644 --- a/commit.c +++ b/commit.c @@ -5,7 +5,7 @@ const char *commit_type = "commit"; -static struct commit *check_commit(struct object *obj, unsigned char *sha1) +static struct commit *check_commit(struct object *obj, const unsigned char *sha1) { if (obj->type != commit_type) { error("Object %s is a %s, not a commit", @@ -15,7 +15,7 @@ static struct commit *check_commit(struct object *obj, unsigned char *sha1) return (struct commit *) obj; } -struct commit *lookup_commit_reference(unsigned char *sha1) +struct commit *lookup_commit_reference(const unsigned char *sha1) { struct object *obj = parse_object(sha1); @@ -26,7 +26,7 @@ struct commit *lookup_commit_reference(unsigned char *sha1) return check_commit(obj, sha1); } -struct commit *lookup_commit(unsigned char *sha1) +struct commit *lookup_commit(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { diff --git a/commit.h b/commit.h index 51d95764a..57c1b62fa 100644 --- a/commit.h +++ b/commit.h @@ -19,8 +19,8 @@ struct commit { extern const char *commit_type; -struct commit *lookup_commit(unsigned char *sha1); -struct commit *lookup_commit_reference(unsigned char *sha1); +struct commit *lookup_commit(const unsigned char *sha1); +struct commit *lookup_commit_reference(const unsigned char *sha1); int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size); diff --git a/delta.c b/delta.c index b31957a1d..db85989e7 100644 --- a/delta.c +++ b/delta.c @@ -17,7 +17,7 @@ struct delta { } u; }; -struct delta *lookup_delta(unsigned char *sha1) +struct delta *lookup_delta(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { diff --git a/delta.h b/delta.h index 8e4efdf4a..df97ff84f 100644 --- a/delta.h +++ b/delta.h @@ -12,7 +12,7 @@ extern void *patch_delta(void *src_buf, unsigned long src_size, /* handling of delta objects */ struct delta; struct object_list; -extern struct delta *lookup_delta(unsigned char *sha1); +extern struct delta *lookup_delta(const unsigned char *sha1); extern int parse_delta_buffer(struct delta *item, void *buffer, unsigned long size); extern int parse_delta(struct delta *item, unsigned char sha1); extern int process_deltas(void *src, unsigned long src_size, diff --git a/object.c b/object.c index 5e72a7878..5e8378857 100644 --- a/object.c +++ b/object.c @@ -10,7 +10,7 @@ struct object **objs; int nr_objs; static int obj_allocs; -static int find_object(unsigned char *sha1) +static int find_object(const unsigned char *sha1) { int first = 0, last = nr_objs; @@ -31,7 +31,7 @@ static int find_object(unsigned char *sha1) return -first-1; } -struct object *lookup_object(unsigned char *sha1) +struct object *lookup_object(const unsigned char *sha1) { int pos = find_object(sha1); if (pos >= 0) @@ -39,7 +39,7 @@ struct object *lookup_object(unsigned char *sha1) return NULL; } -void created_object(unsigned char *sha1, struct object *obj) +void created_object(const unsigned char *sha1, struct object *obj) { int pos = find_object(sha1); @@ -98,7 +98,7 @@ void mark_reachable(struct object *obj, unsigned int mask) } } -struct object *parse_object(unsigned char *sha1) +struct object *parse_object(const unsigned char *sha1) { unsigned long mapsize; void *map = map_sha1_file(sha1, &mapsize); diff --git a/object.h b/object.h index cde8471b5..ca455d571 100644 --- a/object.h +++ b/object.h @@ -21,12 +21,12 @@ struct object { extern int nr_objs; extern struct object **objs; -struct object *lookup_object(unsigned char *sha1); +struct object *lookup_object(const unsigned char *sha1); -void created_object(unsigned char *sha1, struct object *obj); +void created_object(const unsigned char *sha1, struct object *obj); /** Returns the object, having parsed it to find out what it is. **/ -struct object *parse_object(unsigned char *sha1); +struct object *parse_object(const unsigned char *sha1); void add_ref(struct object *refer, struct object *target); diff --git a/sha1_file.c b/sha1_file.c index 7cfd43c51..e648c068b 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -266,7 +266,7 @@ static char *find_sha1_file(const unsigned char *sha1, struct stat *st) return NULL; } -int check_sha1_signature(unsigned char *sha1, void *map, unsigned long size, const char *type) +int check_sha1_signature(const unsigned char *sha1, void *map, unsigned long size, const char *type) { char header[100]; unsigned char real_sha1[20]; diff --git a/tag.c b/tag.c index 26494ca96..4041af257 100644 --- a/tag.c +++ b/tag.c @@ -3,7 +3,7 @@ const char *tag_type = "tag"; -struct tag *lookup_tag(unsigned char *sha1) +struct tag *lookup_tag(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { diff --git a/tag.h b/tag.h index 41826870f..3e8c32d73 100644 --- a/tag.h +++ b/tag.h @@ -12,7 +12,7 @@ struct tag { char *signature; /* not actually implemented */ }; -extern struct tag *lookup_tag(unsigned char *sha1); +extern struct tag *lookup_tag(const unsigned char *sha1); extern int parse_tag_buffer(struct tag *item, void *data, unsigned long size); extern int parse_tag(struct tag *item); diff --git a/tree.c b/tree.c index aa55ddb68..2432f09a0 100644 --- a/tree.c +++ b/tree.c @@ -73,7 +73,7 @@ int read_tree(void *buffer, unsigned long size, int stage) return read_tree_recursive(buffer, size, "", 0, stage); } -struct tree *lookup_tree(unsigned char *sha1) +struct tree *lookup_tree(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { diff --git a/tree.h b/tree.h index 056bd86fa..74fe09d76 100644 --- a/tree.h +++ b/tree.h @@ -24,7 +24,7 @@ struct tree { struct tree_entry_list *entries; }; -struct tree *lookup_tree(unsigned char *sha1); +struct tree *lookup_tree(const unsigned char *sha1); int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size); -- 2.26.2