attr.c: tighten constness around "git_attr" structure

gitster · gitster · commit ec4d77aa508a · 2017-02-01T13:46:52.000-08:00
It holds an interned string, and git_attr_name() is a way to peek
into it.  Make sure the involved pointer types are pointer-to-const.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Brandon Williams &lt;bmwill@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/attr.c b/attr.c
@@ -43,7 +43,7 @@ static int cannot_trust_maybe_real;
 static struct git_attr_check *check_all_attr;
 static struct git_attr *(git_attr_hash[HASHSIZE]);
 
-char *git_attr_name(struct git_attr *attr)
+const char *git_attr_name(const struct git_attr *attr)
 {
 	return attr->name;
 }
diff --git a/attr.h b/attr.h
@@ -25,7 +25,7 @@ extern const char git_attr__false[];
  * Unset one is returned as NULL.
  */
 struct git_attr_check {
-	struct git_attr *attr;
+	const struct git_attr *attr;
 	const char *value;
 };
 
@@ -34,7 +34,7 @@ struct git_attr_check {
  * return value is a pointer to a null-delimited string that is part
  * of the internal data structure; it should not be modified or freed.
  */
-char *git_attr_name(struct git_attr *);
+extern const char *git_attr_name(const struct git_attr *);
 
 int git_check_attr(const char *path, int, struct git_attr_check *);
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ static int cannot_trust_maybe_real;`
`43`	`43`	`static struct git_attr_check *check_all_attr;`
`44`	`44`	`static struct git_attr *(git_attr_hash[HASHSIZE]);`
`45`	`45`
`46`		`-char git_attr_name(struct git_attr attr)`
	`46`	`+const char git_attr_name(const struct git_attr attr)`
`47`	`47`	`{`
`48`	`48`	`return attr->name;`
`49`	`49`	`}`