[PATCH] Anal retentive 'const unsigned char *sha1'

Jason McMullan · Linus Torvalds · commit 5d6ccf5ce7f2 · 2005-06-08T13:04:53.000-07:00
Make 'sha1' parameters const where possible

Signed-off-by: Jason McMullan &lt;jason.mcmullan@timesys.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +31,15 @@ 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)
 		return objs[pos];
 	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`const char *blob_type = "blob";`
`6`	`6`
`7`		`-struct blob lookup_blob(unsigned char sha1)`
	`7`	`+struct blob lookup_blob(const unsigned char sha1)`
`8`	`8`	`{`
`9`	`9`	`struct object *obj = lookup_object(sha1);`
`10`	`10`	`if (!obj) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`const char *commit_type = "commit";`
`7`	`7`
`8`		`-static struct commit check_commit(struct object obj, unsigned char *sha1)`
	`8`	`+static struct commit check_commit(struct object obj, const unsigned char *sha1)`
`9`	`9`	`{`
`10`	`10`	`if (obj->type != commit_type) {`
`11`	`11`	`error("Object %s is a %s, not a commit",`
`@@ -15,7 +15,7 @@ static struct commit check_commit(struct object obj, unsigned char *sha1)`
`15`	`15`	`return (struct commit *) obj;`
`16`	`16`	`}`
`17`	`17`
`18`		`-struct commit lookup_commit_reference(unsigned char sha1)`
	`18`	`+struct commit lookup_commit_reference(const unsigned char sha1)`
`19`	`19`	`{`
`20`	`20`	`struct object *obj = parse_object(sha1);`
`21`	`21`
`@@ -26,7 +26,7 @@ struct commit lookup_commit_reference(unsigned char sha1)`
`26`	`26`	`return check_commit(obj, sha1);`
`27`	`27`	`}`
`28`	`28`
`29`		`-struct commit lookup_commit(unsigned char sha1)`
	`29`	`+struct commit lookup_commit(const unsigned char sha1)`
`30`	`30`	`{`
`31`	`31`	`struct object *obj = lookup_object(sha1);`
`32`	`32`	`if (!obj) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct delta {`
`17`	`17`	`} u;`
`18`	`18`	`};`
`19`	`19`
`20`		`-struct delta lookup_delta(unsigned char sha1)`
	`20`	`+struct delta lookup_delta(const unsigned char sha1)`
`21`	`21`	`{`
`22`	`22`	`struct object *obj = lookup_object(sha1);`
`23`	`23`	`if (!obj) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ struct object **objs;`
`10`	`10`	`int nr_objs;`
`11`	`11`	`static int obj_allocs;`
`12`	`12`
`13`		`-static int find_object(unsigned char *sha1)`
	`13`	`+static int find_object(const unsigned char *sha1)`
`14`	`14`	`{`
`15`	`15`	`int first = 0, last = nr_objs;`
`16`	`16`
`@@ -31,15 +31,15 @@ static int find_object(unsigned char *sha1)`
`31`	`31`	`return -first-1;`
`32`	`32`	`}`
`33`	`33`
`34`		`-struct object lookup_object(unsigned char sha1)`
	`34`	`+struct object lookup_object(const unsigned char sha1)`
`35`	`35`	`{`
`36`	`36`	`int pos = find_object(sha1);`
`37`	`37`	`if (pos >= 0)`
`38`	`38`	`return objs[pos];`
`39`	`39`	`return NULL;`
`40`	`40`	`}`
`41`	`41`
`42`		`-void created_object(unsigned char sha1, struct object obj)`
	`42`	`+void created_object(const unsigned char sha1, struct object obj)`
`43`	`43`	`{`
`44`	`44`	`int pos = find_object(sha1);`
`45`	`45`
`@@ -98,7 +98,7 @@ void mark_reachable(struct object *obj, unsigned int mask)`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`-struct object parse_object(unsigned char sha1)`
	`101`	`+struct object parse_object(const unsigned char sha1)`
`102`	`102`	`{`
`103`	`103`	`unsigned long mapsize;`
`104`	`104`	`void *map = map_sha1_file(sha1, &mapsize);`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ static char find_sha1_file(const unsigned char sha1, struct stat *st)`
`266`	`266`	`return NULL;`
`267`	`267`	`}`
`268`	`268`
`269`		`-int check_sha1_signature(unsigned char sha1, void map, unsigned long size, const char *type)`
	`269`	`+int check_sha1_signature(const unsigned char sha1, void map, unsigned long size, const char *type)`
`270`	`270`	`{`
`271`	`271`	`char header[100];`
`272`	`272`	`unsigned char real_sha1[20];`