apply: rename free_patch() to free_patch_list()
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Mar 2012 22:10:01 +0000 (15:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Mar 2012 22:39:31 +0000 (15:39 -0700)
As that is the only logical name for a function that walks a list
and frees each element on it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c

index 427c2634d70cd002005bf5f7f555b17e0f7a9aa5..aff1d9f75dbe9a8fa381e193a6b09fd83e03032c 100644 (file)
@@ -198,19 +198,24 @@ struct patch {
 
 static void free_patch(struct patch *patch)
 {
-       while (patch) {
-               struct patch *patch_next = patch->next;
-               struct fragment *fragment = patch->fragments;
-
-               while (fragment) {
-                       struct fragment *fragment_next = fragment->next;
-                       if (fragment->patch != NULL && fragment->free_patch)
-                               free((char *)fragment->patch);
-                       free(fragment);
-                       fragment = fragment_next;
-               }
-               free(patch);
-               patch = patch_next;
+       struct fragment *fragment = patch->fragments;
+
+       while (fragment) {
+               struct fragment *fragment_next = fragment->next;
+               if (fragment->patch != NULL && fragment->free_patch)
+                       free((char *)fragment->patch);
+               free(fragment);
+               fragment = fragment_next;
+       }
+       free(patch);
+}
+
+static void free_patch_list(struct patch *list)
+{
+       while (list) {
+               struct patch *next = list->next;
+               free_patch(list);
+               list = next;
        }
 }
 
@@ -3771,7 +3776,7 @@ static int apply_patch(int fd, const char *filename, int options)
        if (summary)
                summary_patch_list(list);
 
-       free_patch(list);
+       free_patch_list(list);
        strbuf_release(&buf);
        return 0;
 }