get_patch_filename(): split into two functions

The function switched between two operating modes depending on the
NULL-ness of its two parameters, as a hacky way to share small part
of implementation, sacrificing cleanliness of the API.

Implement "fmt_output_subject()" function that takes a subject
string and gives the name for the output file, and on top of it,
implement "fmt_output_commit()" function that takes a commit and
gives the name for the output file.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index 3c6f20a2352622998a5d98dc412574838f911850..8cfb4da66291d4b3788e804a013f8e1d27633d51 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -686,8 +686,10 @@ static int reopen_stdout(struct commit *commit, const char *subject,
 
        if (rev->numbered_files)
                strbuf_addf(&filename, "%d", rev->nr);
 
        if (rev->numbered_files)
                strbuf_addf(&filename, "%d", rev->nr);

+       else if (commit)
+               fmt_output_commit(&filename, commit, rev);

        else
        else

-               get_patch_filename(&filename, commit, subject, rev);
+               fmt_output_subject(&filename, subject, rev);

 
        if (!quiet)
                fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
 
        if (!quiet)
                fprintf(realstdout, "%s\n", filename.buf + outdir_offset);

diff --git a/log-tree.c b/log-tree.c
index d9f86ce624e077e423ee416ed8c2dd83059006e3..670beaebf9b6aaacd3b50c92ff2f1ee8e1c84759 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -299,26 +299,32 @@ static unsigned int digits_in_number(unsigned int number)
        return result;
 }
 
        return result;
 }
 

-void get_patch_filename(struct strbuf *buf,
-                       struct commit *commit, const char *subject,
+void fmt_output_subject(struct strbuf *filename,
+                       const char *subject,

                        struct rev_info *info)
 {
        const char *suffix = info->patch_suffix;
        int nr = info->nr;
                        struct rev_info *info)
 {
        const char *suffix = info->patch_suffix;
        int nr = info->nr;

-       int suffix_len = strlen(suffix) + 1;
-       int start_len = buf->len;
-       int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
-
-       strbuf_addf(buf, "%04d-", nr);
-       if (subject)
-               strbuf_addstr(buf, subject);
-       else if (commit) {
-               struct pretty_print_context ctx = {0};
-               format_commit_message(commit, "%f", buf, &ctx);
-       }
-       if (max_len < buf->len)
-               strbuf_setlen(buf, max_len);
-       strbuf_addstr(buf, suffix);
+       int start_len = filename->len;
+       int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
+
+       strbuf_addf(filename, "%04d-%s", nr, subject);
+
+       if (max_len < filename->len)
+               strbuf_setlen(filename, max_len);
+       strbuf_addstr(filename, suffix);
+}
+
+void fmt_output_commit(struct strbuf *filename,
+                      struct commit *commit,
+                      struct rev_info *info)
+{
+       struct pretty_print_context ctx = {0};
+       struct strbuf subject = STRBUF_INIT;
+
+       format_commit_message(commit, "%f", &subject, &ctx);
+       fmt_output_subject(filename, subject.buf, info);
+       strbuf_release(&subject);

 }
 
 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
 }
 
 void log_write_email_headers(struct rev_info *opt, struct commit *commit,


@@ -390,8 +396,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
                if (opt->numbered_files)
                        strbuf_addf(&filename, "%d", opt->nr);
                else
                if (opt->numbered_files)
                        strbuf_addf(&filename, "%d", opt->nr);
                else

-                       get_patch_filename(&filename, commit, NULL,
-                                          opt);
+                       fmt_output_commit(&filename, commit, opt);

                snprintf(buffer, sizeof(buffer) - 1,
                         "\n--%s%s\n"
                         "Content-Type: text/x-patch;"
                snprintf(buffer, sizeof(buffer) - 1,
                         "\n--%s%s\n"
                         "Content-Type: text/x-patch;"

diff --git a/log-tree.h b/log-tree.h
index c6a944a83867fbd3ed21ec2e78a8bacfb63e7cda..9140f48216be10085c9a1aea7ef1d210817c3332 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -21,8 +21,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
 void load_ref_decorations(int flags);
 
 #define FORMAT_PATCH_NAME_MAX 64
 void load_ref_decorations(int flags);
 
 #define FORMAT_PATCH_NAME_MAX 64

-void get_patch_filename(struct strbuf *buf,
-                       struct commit *commit, const char *subject,
-                       struct rev_info *);
+void fmt_output_commit(struct strbuf *, struct commit *, struct rev_info *);
+void fmt_output_subject(struct strbuf *, const char *subject, struct rev_info *);

 
 #endif
 
 #endif