From: Ben Kaduk <kaduk@mit.edu>
Date: Wed, 30 Oct 2013 18:51:12 +0000 (-0400)
Subject: Clean up the code to eliminate some clang warnings
X-Git-Tag: krb5-1.13-alpha1~324
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a8eaa43045fb242739ad9729bb66f915be209b9;p=thirdparty%2Fkrb5.git

Clean up the code to eliminate some clang warnings

In ure.c, though k is a short, the literal 1 is of type 'int', and
so the operation 'k + 1' is performed at the (32-bit) width of int,
and therefore the "%d" format string is correct.

In accept_sec_context.c, the 'length' field of krb5_data is an
unsigned type, so checking for a negative value has no effect.

In net-server.c, the helper routine rtm_type_name() is only used
in code that is disabled with #if 0 conditionals; make the
definition also disabled in the same way to avoid warnings of an
unused function.

In kdc_authdata.c, equality checks in double parentheses elicit
a warning from clang.  The double-parentheses idiom is normally used
to indicate that an assignment is being performed, but the value of
the assignment is also to be used as the value for the conditional.
Since assignment and equality checking differ only by a single
character, clang considers this worthy of a warning.  Since the extra
set of parentheses is redundant and against style, it is correct to
remove them.

In several places (sim_server.c, dump.c, kdb5_destroy.c,
ovsec_kadmd.c), there are declarations of extern variables relating
to getopt() functionality that are now unused in the code.  Remove
these unused variables.
---

diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index 19d8f5f180..fce5a9c6fd 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -73,7 +73,6 @@ main(int argc, char *argv[])
     struct sockaddr_in c_sock;          /* client's address */
     char full_hname[MAXHOSTNAMELEN];
     char *cp;
-    extern int opterr, optind;
     extern char * optarg;
     int ch;
 
@@ -100,7 +99,6 @@ main(int argc, char *argv[])
      * Parse command line arguments
      *
      */
-    opterr = 0;
     while ((ch = getopt(argc, argv, "p:s:S:")) != -1) {
         switch (ch) {
         case 'p':
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index d4e80908a9..8bff367eb9 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -1479,8 +1479,6 @@ load_db(int argc, char **argv)
 {
     krb5_error_code ret;
     FILE *f = NULL;
-    extern char *optarg;
-    extern int optind;
     char *dumpfile = NULL, *dbname, buf[BUFSIZ];
     dump_version *load = NULL;
     int aindex;
diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c
index f32988a6de..e5895523b6 100644
--- a/src/kadmin/dbutil/kdb5_destroy.c
+++ b/src/kadmin/dbutil/kdb5_destroy.c
@@ -43,7 +43,6 @@ kdb5_destroy(argc, argv)
     int argc;
     char *argv[];
 {
-    extern char *optarg;
     extern int optind;
     int optchar;
     char *dbname;
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 37e66316e2..1273b07119 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -210,8 +210,6 @@ char *dump_file = KPROP_DEFAULT_FILE;
 
 int main(int argc, char *argv[])
 {
-    extern     char *optarg;
-    extern     int optind, opterr;
     int ret;
     OM_uint32 OMret, major_status, minor_status;
     char *whoami;
diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c
index 731c7d5d1c..e70a27b838 100644
--- a/src/kdc/kdc_authdata.c
+++ b/src/kdc/kdc_authdata.c
@@ -280,7 +280,7 @@ load_authdata_plugins(krb5_context context)
             void *pctx = NULL;
 
             ftable = authdata_plugins_ftables_v2[i];
-            if ((ftable->authdata_proc == NULL)) {
+            if (ftable->authdata_proc == NULL) {
                 continue;
             }
             server_init_proc = ftable->init_proc;
@@ -316,7 +316,7 @@ load_authdata_plugins(krb5_context context)
             void *pctx = NULL;
 
             ftable = authdata_plugins_ftables_v0[i];
-            if ((ftable->authdata_proc == NULL)) {
+            if (ftable->authdata_proc == NULL) {
                 continue;
             }
             server_init_proc = ftable->init_proc;
diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
index 7780b8a7db..b4be585d48 100644
--- a/src/lib/apputils/net-server.c
+++ b/src/lib/apputils/net-server.c
@@ -983,6 +983,7 @@ setup_udp_port(void *P_data, struct sockaddr *addr)
 #ifdef HAVE_STRUCT_RT_MSGHDR
 #include <net/route.h>
 
+#if 0
 static char *
 rtm_type_name(int type)
 {
@@ -1006,6 +1007,7 @@ rtm_type_name(int type)
     default: return "?";
     }
 }
+#endif
 
 static void
 do_network_reconfig(verto_ctx *ctx, verto_ev *ev)
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 82f03b7cc6..f3a9803cca 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -791,7 +791,7 @@ kg_accept_krb5(minor_status, context_handle,
                 TREAD_INT16(ptr, option.length, 0);
                 i -= 4;
 
-                if (i < option.length || option.length < 0) {
+                if (i < option.length) {
                     code = KG_BAD_LENGTH;
                     major_status = GSS_S_FAILURE;
                     goto fail;
diff --git a/src/lib/krb5/unicode/ure/ure.c b/src/lib/krb5/unicode/ure/ure.c
index 91ef7c95bb..b3fa986bdf 100644
--- a/src/lib/krb5/unicode/ure/ure.c
+++ b/src/lib/krb5/unicode/ure/ure.c
@@ -1864,7 +1864,7 @@ ure_write_dfa(ure_dfa_t dfa, FILE *out)
                     if (sym->props & (1 << k)) {
                         if (h != 0)
                           putc(',', out);
-                        fprintf(out, "%hd", k + 1);
+                        fprintf(out, "%d", k + 1);
                         h = 1;
                     }
                 }