Replace remaining instances of strdup with xstrdup.
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
5e08ecbff2
commit
567fb65e25
@ -35,7 +35,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
|
|||||||
if (!prefixcmp(arg, "--encoding=")) {
|
if (!prefixcmp(arg, "--encoding=")) {
|
||||||
arg += 11;
|
arg += 11;
|
||||||
if (strcmp(arg, "none"))
|
if (strcmp(arg, "none"))
|
||||||
git_log_output_encoding = strdup(arg);
|
git_log_output_encoding = xstrdup(arg);
|
||||||
else
|
else
|
||||||
git_log_output_encoding = "";
|
git_log_output_encoding = "";
|
||||||
}
|
}
|
||||||
|
2
commit.c
2
commit.c
@ -706,7 +706,7 @@ static char *logmsg_reencode(const struct commit *commit,
|
|||||||
encoding = get_header(commit, "encoding");
|
encoding = get_header(commit, "encoding");
|
||||||
use_encoding = encoding ? encoding : utf8;
|
use_encoding = encoding ? encoding : utf8;
|
||||||
if (!strcmp(use_encoding, output_encoding))
|
if (!strcmp(use_encoding, output_encoding))
|
||||||
out = strdup(commit->buffer);
|
out = xstrdup(commit->buffer);
|
||||||
else
|
else
|
||||||
out = reencode_string(commit->buffer,
|
out = reencode_string(commit->buffer,
|
||||||
output_encoding, use_encoding);
|
output_encoding, use_encoding);
|
||||||
|
@ -1038,7 +1038,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
|
|||||||
if (!prefixcmp(arg, "--encoding=")) {
|
if (!prefixcmp(arg, "--encoding=")) {
|
||||||
arg += 11;
|
arg += 11;
|
||||||
if (strcmp(arg, "none"))
|
if (strcmp(arg, "none"))
|
||||||
git_log_output_encoding = strdup(arg);
|
git_log_output_encoding = xstrdup(arg);
|
||||||
else
|
else
|
||||||
git_log_output_encoding = "";
|
git_log_output_encoding = "";
|
||||||
continue;
|
continue;
|
||||||
|
Loading…
Reference in New Issue
Block a user