git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/path-list.h b/path-list.h
index d6401eaa352ea068ae59c1e04354d7784eaeac96..ca2cbbaa4dccbf3359155e429231f35f55c5f7e0 100644 (file)
--- a/path-list.h
+++ b/path-list.h
@@ -1,5 +1,5 @@
-#ifndef _PATH_LIST_H_
-#define _PATH_LIST_H_
+#ifndef PATH_LIST_H
+#define PATH_LIST_H
 
 struct path_list_item {
        char *path;
@@ -13,10 +13,16 @@ struct path_list
 };
 
 void print_path_list(const char *text, const struct path_list *p);
+void path_list_clear(struct path_list *list, int free_util);
 
+/* Use these functions only on sorted lists: */
 int path_list_has_path(const struct path_list *list, const char *path);
-void path_list_clear(struct path_list *list, int free_items);
 struct path_list_item *path_list_insert(const char *path, struct path_list *list);
 struct path_list_item *path_list_lookup(const char *path, struct path_list *list);
 
-#endif /* _PATH_LIST_H_ */
+/* Use these functions only on unsorted lists: */
+struct path_list_item *path_list_append(const char *path, struct path_list *list);
+void sort_path_list(struct path_list *list);
+int unsorted_path_list_has_path(struct path_list *list, const char *path);
+
+#endif /* PATH_LIST_H */