Re: [PATCH v10 04/14] Refactor write_name_quoted_relative, remove unused params
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 16, 2013, 19:15 UTC
- Message-ID
- <7v38tm68jl.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <a2794488b5ec4f221ff404b4875c7c23a54492c4.1368696028.git.worldhello.net@gmail.com>
Jiang Xin <worldhello.net@gmail.com> writes:
> After substitude path_relative() in quote.c with relative_path() from > path.c, parameters (such as len and prefix_len) are obsolte in function
s/obsolte/obsolete/;
Show 20 quoted lines
> write_name_quoted_relative(). Remove unused parameters from > write_name_quoted_relative() and related functions. > > Signed-off-by: Jiang Xin <worldhello.net@gmail.com> > --- > builtin/ls-files.c | 14 ++++++++------ > quote.c | 3 +-- > quote.h | 3 +-- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/builtin/ls-files.c b/builtin/ls-files.c > index 00f07..d3b33 100644 > --- a/builtin/ls-files.c > +++ b/builtin/ls-files.c > @@ -46,10 +46,12 @@ static const char *tag_modified = ""; > static const char *tag_skip_worktree = ""; > static const char *tag_resolve_undo = ""; > > -static void write_name(const char* name, size_t len) > +static void write_name(const char* name)
This is not a new problem but an asterisk sticks to the variable not type, i.e. "const char *name".
Show 8 quoted lines
> {
> - write_name_quoted_relative(name, len, prefix, prefix_len, stdout,
> - line_terminator);
> +
> + /* turn off prefix, if run with "--full-name" */
> + write_name_quoted_relative(name, prefix_len > 0 ? prefix : NULL,
> + stdout, line_terminator);
> }Are you sure all the callers pass a NUL terminated name and want to show them in full (not just a prefix by passing a len that is shorter than the string is)?
My quick scan indicates that is the case, but double checking.
The same comment applies to 03/14 (I checked that all callers either pass strlen() of the first parameter or -1, so that patch is safe).
Show 56 quoted lines
> static void show_dir_entry(const char *tag, struct dir_entry *ent)
> @@ -63,7 +65,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)
> return;
>
> fputs(tag, stdout);
> - write_name(ent->name, ent->len);
> + write_name(ent->name);
> }
>
> static void show_other_files(struct dir_struct *dir)
> @@ -163,7 +165,7 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
> find_unique_abbrev(ce->sha1,abbrev),
> ce_stage(ce));
> }
> - write_name(ce->name, ce_namelen(ce));
> + write_name(ce->name);
> if (debug_mode) {
> printf(" ctime: %d:%d\n", ce->ce_ctime.sec, ce->ce_ctime.nsec);
> printf(" mtime: %d:%d\n", ce->ce_mtime.sec, ce->ce_mtime.nsec);
> @@ -196,7 +198,7 @@ static void show_ru_info(void)
> printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
> find_unique_abbrev(ui->sha1[i], abbrev),
> i + 1);
> - write_name(path, len);
> + write_name(path);
> }
> }
> }
> diff --git a/quote.c b/quote.c
> index ebb8..5c880 100644
> --- a/quote.c
> +++ b/quote.c
> @@ -312,8 +312,7 @@ void write_name_quotedpfx(const char *pfx, size_t pfxlen,
> fputc(terminator, fp);
> }
>
> -void write_name_quoted_relative(const char *name, size_t len,
> - const char *prefix, size_t prefix_len,
> +void write_name_quoted_relative(const char *name, const char *prefix,
> FILE *fp, int terminator)
> {
> struct strbuf sb = STRBUF_INIT;
> diff --git a/quote.h b/quote.h
> index 5610159..ed110 100644
> --- a/quote.h
> +++ b/quote.h
> @@ -60,8 +60,7 @@ extern void quote_two_c_style(struct strbuf *, const char *, const char *, int);
> extern void write_name_quoted(const char *name, FILE *, int terminator);
> extern void write_name_quotedpfx(const char *pfx, size_t pfxlen,
> const char *name, FILE *, int terminator);
> -extern void write_name_quoted_relative(const char *name, size_t len,
> - const char *prefix, size_t prefix_len,
> +extern void write_name_quoted_relative(const char *name, const char *prefix,
> FILE *fp, int terminator);
>
> /* quote path as relative to the given prefix */