Fix funny types used in attribute value representation

[git.git] / attr.h

diff --git a/attr.h b/attr.h
index 8ec2d3d35ce02d15adb0c3b4c72ce2d435d5a1ae..f1c2038b0923d3130937eef965667204a8634e6d 100644 (file)
--- a/attr.h
+++ b/attr.h
@@ -4,21 +4,29 @@
 /* An attribute is a pointer to this opaque structure */
 struct git_attr;
 
+/*
+ * Given a string, return the gitattribute object that
+ * corresponds to it.
+ */
 struct git_attr *git_attr(const char *, int);
 
 /* Internal use */
-#define ATTR__TRUE     ((void *) 1)
-#define ATTR__FALSE    ((void *) 0)
-#define ATTR__UNSET    ((void *) -1)
+extern const char git_attr__true[];
+extern const char git_attr__false[];
 
 /* For public to check git_attr_check results */
-#define ATTR_TRUE(v) ((v) == ATTR__TRUE)
-#define ATTR_FALSE(v) ((v) == ATTR__FALSE)
-#define ATTR_UNSET(v) ((v) == ATTR__UNSET)
+#define ATTR_TRUE(v) ((v) == git_attr__true)
+#define ATTR_FALSE(v) ((v) == git_attr__false)
+#define ATTR_UNSET(v) ((v) == NULL)
 
+/*
+ * Send one or more git_attr_check to git_checkattr(), and
+ * each 'value' member tells what its value is.
+ * Unset one is returned as NULL.
+ */
 struct git_attr_check {
        struct git_attr *attr;
-       void *value;
+       const char *value;
 };
 
 int git_checkattr(const char *path, int, struct git_attr_check *);