mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get_patch_filename(): simplify function signature

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2012-12-21 23:26:16 -08:00
parent 68cb7b6f85
commit 021f2f4c1a
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/log.c
View File

@ -684,7 +684,7 @@ static int reopen_stdout(struct commit *commit, const char *subject,
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);

12
log-tree.c
View File

@ -299,9 +299,12 @@ static unsigned int digits_in_number(unsigned int number)
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;
@ -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;
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;"

5
log-tree.h
View File

@ -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 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