diff options
| author | René Scharfe <l.s.r@web.de> | 2014-07-19 17:35:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 10:37:02 -0700 |
| commit | 5c0b13f85ab3a5326508b854768eb70c8829cda4 (patch) | |
| tree | c498179a86e3e05abb664caa8d943c81ae4142f5 /sh-i18n--envsubst.c | |
| parent | 51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb (diff) | |
| download | git-5c0b13f85ab3a5326508b854768eb70c8829cda4.tar.gz | |
use xmemdupz() to allocate copies of strings given by start and length
Use xmemdupz() to allocate the memory, copy the data and make sure to
NUL-terminate the result, all in one step. The resulting code is
shorter, doesn't contain the constants 1 and '\0', and avoids
duplicating function parameters.
For blame, the last copied byte (o->file.ptr[o->file.size]) is always
set to NUL by fake_working_tree_commit() or read_sha1_file(), so no
information is lost by the conversion to using xmemdupz().
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sh-i18n--envsubst.c')
| -rw-r--r-- | sh-i18n--envsubst.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c index 855d28cf94..6dd03a974a 100644 --- a/sh-i18n--envsubst.c +++ b/sh-i18n--envsubst.c @@ -278,9 +278,7 @@ static string_list_ty variables_set; static void note_variable (const char *var_ptr, size_t var_len) { - char *string = xmalloc (var_len + 1); - memcpy (string, var_ptr, var_len); - string[var_len] = '\0'; + char *string = xmemdupz (var_ptr, var_len); string_list_append (&variables_set, string); } |