diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-05 15:51:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-05 15:51:37 -0700 |
| commit | cba4c4a244b8293af695e3fb7965fd73c160447a (patch) | |
| tree | 66dcdcfa9ebce7bc80d13f06a687144c81a01d1f /compat | |
| parent | 5d2bf34c22df7857c45e49d020bf1b0f4bb0db86 (diff) | |
| parent | b4f52f09ae712e1a813375712b6e58be49255cd0 (diff) | |
| download | git-cba4c4a244b8293af695e3fb7965fd73c160447a.tar.gz | |
Merge branch 'ds/win-syslog-compiler-fix' into maint
Workaround for a false positive compiler warning.
source: <pull.1294.git.1658256354725.gitgitgadget@gmail.com>
* ds/win-syslog-compiler-fix:
compat/win32: correct for incorrect compiler warning
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/win32/syslog.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c index 1f8d8934cc..0af18d8882 100644 --- a/compat/win32/syslog.c +++ b/compat/win32/syslog.c @@ -44,6 +44,7 @@ void syslog(int priority, const char *fmt, ...) while ((pos = strstr(str, "%1")) != NULL) { size_t offset = pos - str; + char *new_pos; char *oldstr = str; str = realloc(str, st_add(++str_len, 1)); if (!str) { @@ -51,9 +52,9 @@ void syslog(int priority, const char *fmt, ...) warning_errno("realloc failed"); return; } - pos = str + offset; - memmove(pos + 2, pos + 1, strlen(pos)); - pos[1] = ' '; + new_pos = str + offset; + memmove(new_pos + 2, new_pos + 1, strlen(new_pos)); + new_pos[1] = ' '; } switch (priority) { |