Merge git://github.com/vnwildman/git

diff --git a/test-string-list.c b/test-string-list.c
index 5e9631fe34135c418b31f025d7cddf4d8969a3ec..4693295a98ca713fa65eb9b67d50113ec97ecf71 100644 (file)
--- a/test-string-list.c
+++ b/test-string-list.c
@@ -7,7 +7,7 @@
  * list (as opposed to "", which indicates a string list containing a
  * single empty string).  list->strdup_strings must be set.
  */
-void parse_string_list(struct string_list *list, const char *arg)
+static void parse_string_list(struct string_list *list, const char *arg)
 {
        if (!strcmp(arg, "-"))
                return;
@@ -15,14 +15,14 @@ void parse_string_list(struct string_list *list, const char *arg)
        (void)string_list_split(list, arg, ':', -1);
 }
 
-void write_list(const struct string_list *list)
+static void write_list(const struct string_list *list)
 {
        int i;
        for (i = 0; i < list->nr; i++)
                printf("[%d]: \"%s\"\n", i, list->items[i].string);
 }
 
-void write_list_compact(const struct string_list *list)
+static void write_list_compact(const struct string_list *list)
 {
        int i;
        if (!list->nr)
@@ -35,7 +35,7 @@ void write_list_compact(const struct string_list *list)
        }
 }
 
-int prefix_cb(struct string_list_item *item, void *cb_data)
+static int prefix_cb(struct string_list_item *item, void *cb_data)
 {
        const char *prefix = (const char *)cb_data;
        return !prefixcmp(item->string, prefix);