mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-07 23:51:14 +02:00
Code Releases Activity

Jun T: 29883: cast resource types to types they should be anyway

Browse source
This commit is contained in:
Peter Stephenson 2011-10-31 09:48:58 +00:00
parent 19550e7713
commit fdb00982f5
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2011-10-31 Peter Stephenson <pws@csr.com>
* Jun T: 29883: Src/Builtins/rlimits.c, Src/Modules/zftp.c: cast
to type in printf to work around cases where types aren't
properly distinguished.
2011-10-30 Peter Stephenson <p.w.stephenson@ntlworld.com> 2011-10-30 Peter Stephenson <p.w.stephenson@ntlworld.com>
* users/16547: Completion/Unix/Command/_perforce: quote * users/16547: Completion/Unix/Command/_perforce: quote
@ -15527,5 +15533,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5490 $ * $Revision: 1.5491 $
***************************************************** *****************************************************

24
Src/Builtins/rlimits.c
View file

@ -102,9 +102,9 @@ showlimitvalue(int lim, rlim_t val)
printf("%lld\n", val); printf("%lld\n", val);
# else # else
# ifdef RLIM_T_IS_UNSIGNED # ifdef RLIM_T_IS_UNSIGNED
printf("%lu\n", val); printf("%lu\n", (unsigned long)val);
# else # else
printf("%ld\n", val); printf("%ld\n", (long)val);
# endif /* RLIM_T_IS_UNSIGNED */ # endif /* RLIM_T_IS_UNSIGNED */
# endif /* RLIM_T_IS_LONG_LONG */ # endif /* RLIM_T_IS_LONG_LONG */
# endif /* RLIM_T_IS_QUAD_T */ # endif /* RLIM_T_IS_QUAD_T */
@ -123,9 +123,9 @@ showlimitvalue(int lim, rlim_t val)
printf("%lldus\n", val); printf("%lldus\n", val);
# else # else
# ifdef RLIM_T_IS_UNSIGNED # ifdef RLIM_T_IS_UNSIGNED
printf("%luus\n", val); printf("%luus\n", (unsigned long)val);
# else # else
printf("%ldus\n", val); printf("%ldus\n", (long)val);
# endif /* RLIM_T_IS_UNSIGNED */ # endif /* RLIM_T_IS_UNSIGNED */
# endif /* RLIM_T_IS_LONG_LONG */ # endif /* RLIM_T_IS_LONG_LONG */
# endif /* RLIM_T_IS_QUAD_T */ # endif /* RLIM_T_IS_QUAD_T */
@ -139,9 +139,9 @@ showlimitvalue(int lim, rlim_t val)
printf("%lld\n", val); printf("%lld\n", val);
# else # else
# ifdef RLIM_T_IS_UNSIGNED # ifdef RLIM_T_IS_UNSIGNED
printf("%lu\n", val); printf("%lu\n", (unsigned long)val);
# else # else
printf("%ld\n", val); printf("%ld\n", (long)val);
# endif /* RLIM_T_IS_UNSIGNED */ # endif /* RLIM_T_IS_UNSIGNED */
# endif /* RLIM_T_IS_LONG_LONG */ # endif /* RLIM_T_IS_LONG_LONG */
# endif /* RLIM_T_IS_QUAD_T */ # endif /* RLIM_T_IS_QUAD_T */
@ -158,13 +158,13 @@ showlimitvalue(int lim, rlim_t val)
printf("%lldkB\n", val / 1024L); printf("%lldkB\n", val / 1024L);
# else # else
# ifdef RLIM_T_IS_UNSIGNED # ifdef RLIM_T_IS_UNSIGNED
printf("%luMB\n", val / (1024L * 1024L)); printf("%luMB\n", (unsigned long)(val / (1024L * 1024L)));
else else
printf("%lukB\n", val / 1024L); printf("%lukB\n", (unsigned long)(val / 1024L));
# else # else
printf("%ldMB\n", val / (1024L * 1024L)); printf("%ldMB\n", (long)val / (1024L * 1024L));
else else
printf("%ldkB\n", val / 1024L); printf("%ldkB\n", (long)val / 1024L);
# endif /* RLIM_T_IS_UNSIGNED */ # endif /* RLIM_T_IS_UNSIGNED */
# endif /* RLIM_T_IS_LONG_LONG */ # endif /* RLIM_T_IS_LONG_LONG */
# endif /* RLIM_T_IS_QUAD_T */ # endif /* RLIM_T_IS_QUAD_T */
@ -398,9 +398,9 @@ printulimit(char *nam, int lim, int hard, int head)
printf("%lld\n", limit); printf("%lld\n", limit);
# else # else
# ifdef RLIM_T_IS_UNSIGNED # ifdef RLIM_T_IS_UNSIGNED
printf("%lu\n", limit); printf("%lu\n", (unsigned long)limit);
# else # else
printf("%ld\n", limit); printf("%ld\n", (long)limit);
# endif /* RLIM_T_IS_UNSIGNED */ # endif /* RLIM_T_IS_UNSIGNED */
# endif /* RLIM_T_IS_LONG_LONG */ # endif /* RLIM_T_IS_LONG_LONG */
# endif /* RLIM_T_IS_QUAD_T */ # endif /* RLIM_T_IS_QUAD_T */

2
Src/Modules/zftp.c
View file

@ -2520,7 +2520,7 @@ zftp_local(UNUSED(char *name), char **args, int flags)
printf("%s %s\n", output64(sz), mt); printf("%s %s\n", output64(sz), mt);
#else #else
DPUTS(sizeof(sz) > 4, "Shell compiled with wrong off_t size"); DPUTS(sizeof(sz) > 4, "Shell compiled with wrong off_t size");
printf("%ld %s\n", sz, mt); printf("%ld %s\n", (long)sz, mt);
#endif #endif
zsfree(mt); zsfree(mt);
if (dofd) if (dofd)