gitweb: Convert generated contents to utf8 in commitdiff_plain
[gitweb.git] / path-list.c
index f15a10de37bc453c3b495ef8b3d3046d3611ce2f..3d83b7ba9e8c934db8d8ecc9d545cab25be89837 100644 (file)
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "cache.h"
 #include "path-list.h"
 
@@ -45,7 +44,7 @@ static int add_entry(struct path_list *list, const char *path)
                                (list->nr - index)
                                * sizeof(struct path_list_item));
        list->items[index].path = list->strdup_paths ?
-               strdup(path) : (char *)path;
+               xstrdup(path) : (char *)path;
        list->items[index].util = NULL;
        list->nr++;
 
@@ -57,7 +56,7 @@ struct path_list_item *path_list_insert(const char *path, struct path_list *list
        int index = add_entry(list, path);
 
        if (index < 0)
-               index = 1 - index;
+               index = -1 - index;
 
        return list->items + index;
 }
@@ -77,17 +76,18 @@ struct path_list_item *path_list_lookup(const char *path, struct path_list *list
        return list->items + i;
 }
 
-void path_list_clear(struct path_list *list, int free_items)
+void path_list_clear(struct path_list *list, int free_util)
 {
        if (list->items) {
                int i;
-               if (free_items)
-                       for (i = 0; i < list->nr; i++) {
-                               if (list->strdup_paths)
-                                       free(list->items[i].path);
-                               if (list->items[i].util)
-                                       free(list->items[i].util);
-                       }
+               if (list->strdup_paths) {
+                       for (i = 0; i < list->nr; i++)
+                               free(list->items[i].path);
+               }
+               if (free_util) {
+                       for (i = 0; i < list->nr; i++)
+                               free(list->items[i].util);
+               }
                free(list->items);
        }
        list->items = NULL;
@@ -102,4 +102,3 @@ void print_path_list(const char *text, const struct path_list *p)
        for (i = 0; i < p->nr; i++)
                printf("%s:%p\n", p->items[i].path, p->items[i].util);
 }
-