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

quote_path_relative(): remove redundant parameter

Browse Source 
quote_path_relative() used to take a counted string as its parameter
(the string to be quoted).  With an earlier change, it now uses
relative_path() that does not take a counted string, and we have
been passing only the pointer to the string since then.

Remove the length parameter from quote_path_relative() to show that
this parameter was redundant.  All the changed lines show that the
caller passed either -1 (to ask the function run strlen() on the
string), or the length of the string, so the earlier conversion was
safe.

All the callers of quote_path_relative() that used to take counted string
have been audited to make sure that they are passing length of the actual
string (or -1 to ask the callee run strlen())

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiang Xin
2013-06-25 23:53:45 +08:00
committed by Junio C Hamano
parent ad66df2df1
commit 39598f9983
6 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quote.c
View File

@ -325,8 +325,8 @@ void write_name_quoted_relative(const char *name, size_t len,
}
/* quote path as relative to the given prefix */
char *quote_path_relative(const char *in, int len,
struct strbuf *out, const char *prefix)
char *quote_path_relative(const char *in, const char *prefix,
struct strbuf *out)
{
struct strbuf sb = STRBUF_INIT;
const char *rel = relative_path(in, prefix, &sb);
@ -334,9 +334,6 @@ char *quote_path_relative(const char *in, int len,
quote_c_style_counted(rel, strlen(rel), out, NULL, 0);
strbuf_release(&sb);
if (!out->len)
strbuf_addstr(out, "./");
return out->buf;
}