Skip to content

Commit

Permalink
Clean up the code to eliminate some clang warnings
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kaduk committed Nov 4, 2013
1 parent 4547a10 commit 3a8eaa4
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 11 deletions.
2 changes: 0 additions & 2 deletions src/appl/simple/server/sim_server.c
Expand Up @@ -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;

Expand All @@ -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':
Expand Down
2 changes: 0 additions & 2 deletions src/kadmin/dbutil/dump.c
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/kadmin/dbutil/kdb5_destroy.c
Expand Up @@ -43,7 +43,6 @@ kdb5_destroy(argc, argv)
int argc;
char *argv[];
{
extern char *optarg;
extern int optind;
int optchar;
char *dbname;
Expand Down
2 changes: 0 additions & 2 deletions src/kadmin/server/ovsec_kadmd.c
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/kdc/kdc_authdata.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/lib/apputils/net-server.c
Expand Up @@ -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)
{
Expand All @@ -1006,6 +1007,7 @@ rtm_type_name(int type)
default: return "?";
}
}
#endif

static void
do_network_reconfig(verto_ctx *ctx, verto_ev *ev)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/gssapi/krb5/accept_sec_context.c
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/krb5/unicode/ure/ure.c
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 3a8eaa4

Please sign in to comment.