diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Src/Builtins/rlimits.c | 1 | ||||
| -rw-r--r-- | Src/Modules/datetime.c | 2 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 1 | ||||
| -rw-r--r-- | Src/Zle/computil.c | 1 | ||||
| -rw-r--r-- | Src/cond.c | 1 |
6 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c1103e60a..c5431af71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-13 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Danek: 29254: Src/cond.c, Src/Builtins/rlimits.c, + Src/Modules/datetime.c, Src/Modules/zftp.c, Src/Zle/computil.c: + fix some compiler warnings. + 2011-05-13 Peter Stephenson <pws@csr.com> * Jérémie Roquet: 29258: Src/Zle/zle_utils.c: mark a couple @@ -14682,5 +14688,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5297 $ +* $Revision: 1.5298 $ ***************************************************** diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index 7ee0de012..ffcb92052 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -954,7 +954,6 @@ int cleanup_(Module m) { return setfeatureenables(m, &module_features, NULL); - return 0; } /**/ diff --git a/Src/Modules/datetime.c b/Src/Modules/datetime.c index 0dc42fda8..45818b968 100644 --- a/Src/Modules/datetime.c +++ b/Src/Modules/datetime.c @@ -146,7 +146,7 @@ bin_strftime(char *nam, char **argv, Options ops, UNUSED(int func)) } static zlong -getcurrentsecs() +getcurrentsecs(UNUSED(Param pm)) { return (zlong) time(NULL); } diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 1558d354f..8d688abd4 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -50,6 +50,7 @@ struct zftp_session; typedef struct zftp_session *Zftp_session; #include "tcp.h" +#include "tcp.mdh" #include "zftp.mdh" #include "zftp.pro" diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index e5a99485c..cd508d0ac 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -3358,7 +3358,6 @@ bin_compvalues(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) return 0; } - return 1; case 'D': /* This returns the description and action to use if we are at diff --git a/Src/cond.c b/Src/cond.c index b911bfb33..c67354297 100644 --- a/Src/cond.c +++ b/Src/cond.c @@ -403,7 +403,6 @@ evalcond(Estate state, char *fromtest) zwarnnam(fromtest, "bad cond code"); return 2; } - return 1; } |