get_patch_filename(): simplify function signature

Most functions that emit to a strbuf take the strbuf as their first
parameter; make this function follow suit.

The serial number of the patch being emitted (nr) and suffix used
for patch filename (suffix) are both recorded in rev_info; drop
these separate parameters and pass the rev_info directly.

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

diff --git a/builtin/log.c b/builtin/log.c
index 7cf157e3ea196fb072fe071a7d5a1cc2fd452a0c..d9946ecd2f277c750cd91968c87517aed288c034 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -684,7 +684,7 @@ static int reopen_stdout(struct commit *commit, const char *subject,
                        strbuf_addch(&filename, '/');
        }
 
                        strbuf_addch(&filename, '/');
        }
 

-       get_patch_filename(commit, subject, rev->nr, rev->patch_suffix, &filename);
+       get_patch_filename(&filename, commit, 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 c894930c1863bfcf33a01b2d98c48478aa874186..ceed6b62e6c0dea3e367d7aabc79605e497140d4 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -299,9 +299,12 @@ static unsigned int digits_in_number(unsigned int number)
        return result;
 }
 
        return result;
 }
 

-void get_patch_filename(struct commit *commit, const char *subject, int nr,
-                       const char *suffix, struct strbuf *buf)
+void get_patch_filename(struct strbuf *buf,
+                       struct commit *commit, const char *subject,
+                       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 suffix_len = strlen(suffix) + 1;
        int start_len = buf->len;
 


@@ -387,8 +390,9 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
                         mime_boundary_leader, opt->mime_boundary);
                extra_headers = subject_buffer;
 
                         mime_boundary_leader, opt->mime_boundary);
                extra_headers = subject_buffer;
 

-               get_patch_filename(opt->numbered_files ? NULL : commit, NULL,
-                                  opt->nr, opt->patch_suffix, &filename);
+               get_patch_filename(&filename,
+                                  opt->numbered_files ? NULL : commit, NULL,
+                                  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 f5ac238bba478851bb10b09f32ea75da05475267..c6a944a83867fbd3ed21ec2e78a8bacfb63e7cda 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -21,7 +21,8 @@ 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 commit *commit, const char *subject, int nr,
-                       const char *suffix, struct strbuf *buf);
+void get_patch_filename(struct strbuf *buf,
+                       struct commit *commit, const char *subject,
+                       struct rev_info *);

 
 #endif
 
 #endif