ref-filter: remove ref_format_clear()

Now that ref_format_clear() no longer releases any memory we don't need
it anymore.  Remove it and its counterpart, ref_format_init().

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/branch.c b/builtin/branch.c
index fbb9536282dcaafc0f435d3886715f602dacef52..9a29de5bf1dd417aa9012ade5e6015cd0de06fde 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -884,7 +884,6 @@ int cmd_branch(int argc,
                string_list_clear(&output, 0);
                ref_sorting_release(sorting);
                ref_filter_clear(&filter);
-               ref_format_clear(&format);
 
                ret = 0;
                goto out;

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 715745a262aa351d94cabc084bda64d7e05f8848..8085ebd8fe97b53f0a8705a414c40e82cb9699bb 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -108,7 +108,6 @@ int cmd_for_each_ref(int argc,
        filter_and_format_refs(&filter, flags, sorting, &format);
 
        ref_filter_clear(&filter);
-       ref_format_clear(&format);
        ref_sorting_release(sorting);
        strvec_clear(&vec);
        return 0;

diff --git a/builtin/tag.c b/builtin/tag.c
index c4bd14583189001b0952eb3443d32bbc4be9de33..e8a344b9264b9c79099b4e7990c5b9595e2abae5 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -698,7 +698,6 @@ int cmd_tag(int argc,
 cleanup:
        ref_sorting_release(sorting);
        ref_filter_clear(&filter);
-       ref_format_clear(&format);
        strbuf_release(&buf);
        strbuf_release(&ref);
        strbuf_release(&reflog_msg);

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index a7f20618ffd5288ce6e37f4002893d0118d0c3df..f6b97048a57d37b6cd116385fe4a38b04b48344c 100644 (file)
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -69,6 +69,5 @@ int cmd_verify_tag(int argc,
                if (format.format)
                        pretty_print_ref(name, &oid, &format);
        }
-       ref_format_clear(&format);
        return had_error;
 }

diff --git a/ref-filter.c b/ref-filter.c
index 1c474224a04240673ebcc03502b74226ff4859c8..2ec72d66bbb2568a61fc83d5ca336de9b7b378dd 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -3660,14 +3660,3 @@ void ref_filter_clear(struct ref_filter *filter)
        free_commit_list(filter->unreachable_from);
        ref_filter_init(filter);
 }
-
-void ref_format_init(struct ref_format *format)
-{
-       struct ref_format blank = REF_FORMAT_INIT;
-       memcpy(format, &blank, sizeof(blank));
-}
-
-void ref_format_clear(struct ref_format *format)
-{
-       ref_format_init(format);
-}

diff --git a/ref-filter.h b/ref-filter.h
index 0ba94df65198a2e1374d94e3c49bf2162eba2329..013d4cfa64b310318097d8b592a756e4b39a0afa 100644 (file)
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -211,7 +211,4 @@ void filter_is_base(struct repository *r,
 void ref_filter_init(struct ref_filter *filter);
 void ref_filter_clear(struct ref_filter *filter);
 
-void ref_format_init(struct ref_format *format);
-void ref_format_clear(struct ref_format *format);
-
 #endif /*  REF_FILTER_H  */