summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
authorBen Kaduk <kaduk@mit.edu>2013-10-30 14:51:12 -0400
committerBen Kaduk <kaduk@mit.edu>2013-11-04 13:51:17 -0500
commit3a8eaa43045fb242739ad9729bb66f915be209b9 (patch)
tree6a0a8a0ab74adda71b764724a0d8f3466c9dbcee /src/kadmin
parent4547a1078afdeeb781307cf4a125baccf2edab02 (diff)
downloadkrb5-3a8eaa43045fb242739ad9729bb66f915be209b9.tar.gz
krb5-3a8eaa43045fb242739ad9729bb66f915be209b9.tar.xz
krb5-3a8eaa43045fb242739ad9729bb66f915be209b9.zip
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.
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/dbutil/dump.c2
-rw-r--r--src/kadmin/dbutil/kdb5_destroy.c1
-rw-r--r--src/kadmin/server/ovsec_kadmd.c2
3 files changed, 0 insertions, 5 deletions
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;