diff options
| author | Jeff King <peff@peff.net> | 2015-01-12 20:58:15 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-13 10:03:38 -0800 |
| commit | 444069078687fc00586824a21eff9758fc4d0625 (patch) | |
| tree | fed994ac379ffb0ece63ee16010229d7b9db9c2a | |
| parent | d64ea0f83bd7e676778f833c57f969a94518a28d (diff) | |
| download | git-444069078687fc00586824a21eff9758fc4d0625.tar.gz git-444069078687fc00586824a21eff9758fc4d0625.tar.xz | |
builtin/apply.c: use xstrdup_or_null instead of null_strdup
This file had its own identical helper that predates
xstrdup_or_null. Let's use the global one to avoid
repetition.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/apply.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 8714a8872..4bb31fd6a 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -656,11 +656,6 @@ static size_t diff_timestamp_len(const char *line, size_t len) return line + len - end; } -static char *null_strdup(const char *s) -{ - return s ? xstrdup(s) : NULL; -} - static char *find_name_common(const char *line, const char *def, int p_value, const char *end, int terminate) { @@ -683,10 +678,10 @@ static char *find_name_common(const char *line, const char *def, start = line; } if (!start) - return squash_slash(null_strdup(def)); + return squash_slash(xstrdup_or_null(def)); len = line - start; if (!len) - return squash_slash(null_strdup(def)); + return squash_slash(xstrdup_or_null(def)); /* * Generally we prefer the shorter name, especially @@ -908,7 +903,7 @@ static void parse_traditional_patch(const char *first, const char *second, struc patch->old_name = name; } else { patch->old_name = name; - patch->new_name = null_strdup(name); + patch->new_name = xstrdup_or_null(name); } } if (!name) @@ -997,7 +992,7 @@ static int gitdiff_delete(const char *line, struct patch *patch) { patch->is_delete = 1; free(patch->old_name); - patch->old_name = null_strdup(patch->def_name); + patch->old_name = xstrdup_or_null(patch->def_name); return gitdiff_oldmode(line, patch); } @@ -1005,7 +1000,7 @@ static int gitdiff_newfile(const char *line, struct patch *patch) { patch->is_new = 1; free(patch->new_name); - patch->new_name = null_strdup(patch->def_name); + patch->new_name = xstrdup_or_null(patch->def_name); return gitdiff_newmode(line, patch); } |