diff options
| author | Nikolas Garofil <nikolas@garofil.be> | 2014-06-07 13:48:40 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-06-07 13:48:40 -0700 |
| commit | 4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7 (patch) | |
| tree | 8cb6ff32488f450f6f3455cf5f4bf24f2c6f5eb2 /Src/utils.c | |
| parent | 37ccdf58c09941a0e649551b8c30add1dfe512d5 (diff) | |
| download | zsh-4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7.tar.gz zsh-4f4d2b8247ef08e34fe73d91c0a8d8a2eb1f18c7.zip | |
32737, 32736 (32741), 32735, 32734, 32733, 32732 (32739): Strict compilation
fixes
Src/utils.c: properly ifdef declarations
Src/zsh_system.h: memmove() should return its dest argument
Src/signals.c: define ret before use
Src/mem.c: remove unused pointers
Src/prototypes.h: use size_t in bcopy()
Src/compat.c: fix const declaration inconsistency
Diffstat (limited to 'Src/utils.c')
| -rw-r--r-- | Src/utils.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Src/utils.c b/Src/utils.c index 59b9435ff..cef2abef8 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2712,8 +2712,11 @@ ztrftimebuf(int *bufsizeptr, int decr) mod_export int ztrftime(char *buf, int bufsize, char *fmt, struct tm *tm) { - int hr12, decr; -#ifndef HAVE_STRFTIME + int hr12; +#ifdef HAVE_STRFTIME + int decr; + char tmp[4]; +#else static char *astr[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; static char *estr[] = @@ -2721,7 +2724,6 @@ ztrftime(char *buf, int bufsize, char *fmt, struct tm *tm) "Aug", "Sep", "Oct", "Nov", "Dec"}; #endif char *origbuf = buf; - char tmp[4]; while (*fmt) |