Re: zsh 4.3.11-dev-3

[Danek Duvall <duvall@xxxxxxxxxxxxxxxxxxxxxxx>]

Danek Duvall wrote:

> Builds fine on Solaris 11 and seems to be working okay so far, but there's
> a warning in Src/Modules/datetime.c that could be cleaned up:
> getcurrentsecs() is missing "UNUSED(Param pm)" in its parameters.
> 
> The zftp module also has warnings because tcp_socket() and friends aren't
> declared.  Should it be including tcp.mdh?

A patch for those and a couple of "statement not reached" warnings is attached.

Danek

diff -durp zsh-4.3.11-dev-3.orig/Src/Builtins/rlimits.c zsh-4.3.11-dev-3/Src/Builtins/rlimits.c
--- zsh-4.3.11-dev-3.orig/Src/Builtins/rlimits.c	2010-01-05 08:29:35.000000000 -0800
+++ zsh-4.3.11-dev-3/Src/Builtins/rlimits.c	2011-05-12 13:01:00.146638714 -0700
@@ -954,7 +954,6 @@ int
 cleanup_(Module m)
 {
     return setfeatureenables(m, &module_features, NULL);
-    return 0;
 }
 
 /**/
diff -durp zsh-4.3.11-dev-3.orig/Src/Modules/datetime.c zsh-4.3.11-dev-3/Src/Modules/datetime.c
--- zsh-4.3.11-dev-3.orig/Src/Modules/datetime.c	2010-02-26 09:07:25.000000000 -0800
+++ zsh-4.3.11-dev-3/Src/Modules/datetime.c	2011-05-12 12:53:01.981573357 -0700
@@ -146,7 +146,7 @@ bin_strftime(char *nam, char **argv, Opt
 }
 
 static zlong
-getcurrentsecs()
+getcurrentsecs(UNUSED(Param pm))
 {
     return (zlong) time(NULL);
 }
diff -durp zsh-4.3.11-dev-3.orig/Src/Modules/zftp.c zsh-4.3.11-dev-3/Src/Modules/zftp.c
--- zsh-4.3.11-dev-3.orig/Src/Modules/zftp.c	2009-12-16 10:39:06.000000000 -0800
+++ zsh-4.3.11-dev-3/Src/Modules/zftp.c	2011-05-12 12:52:50.729253065 -0700
@@ -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 -durp zsh-4.3.11-dev-3.orig/Src/Zle/computil.c zsh-4.3.11-dev-3/Src/Zle/computil.c
--- zsh-4.3.11-dev-3.orig/Src/Zle/computil.c	2011-05-06 06:28:34.000000000 -0700
+++ zsh-4.3.11-dev-3/Src/Zle/computil.c	2011-05-12 13:06:22.720489284 -0700
@@ -3358,7 +3358,6 @@ bin_compvalues(char *nam, char **args, U
 
 	    return 0;
 	}
-	return 1;
 
     case 'D':
         /* This returns the description and action to use if we are at
diff -durp zsh-4.3.11-dev-3.orig/Src/cond.c zsh-4.3.11-dev-3/Src/cond.c
--- zsh-4.3.11-dev-3.orig/Src/cond.c	2010-02-19 04:45:37.000000000 -0800
+++ zsh-4.3.11-dev-3/Src/cond.c	2011-05-12 13:06:29.514991273 -0700
@@ -403,7 +403,6 @@ evalcond(Estate state, char *fromtest)
 	zwarnnam(fromtest, "bad cond code");
 	return 2;
     }
-    return 1;
 }