oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Warning fixes from Christos Zoulas

Browse Source 
- shadowed variables
- signed/unsigned confusion
- const lossage
- incomplete structure initializations
- unused code
This commit is contained in:
Love Hornquist Astrand
2011-04-29 20:25:05 -07:00
parent 66c15e7caf
commit f5f9014c90
156 changed files with 1178 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/kadm5/acl.c
View File

@@ -44,7 +44,7 @@ static struct units acl_units[] = {
{ "modify", KADM5_PRIV_MODIFY },
{ "add", KADM5_PRIV_ADD },
{ "get", KADM5_PRIV_GET },
{ NULL }
{ NULL, 0 }
};
kadm5_ret_t

4
lib/kadm5/get_s.c
View File

@@ -142,7 +142,7 @@ kadm5_s_get_principal(void *server_handle,
if(mask & KADM5_KVNO)
out->kvno = ent.entry.kvno;
if(mask & KADM5_MKVNO) {
int n;
size_t n;
out->mkvno = 0; /* XXX */
for(n = 0; n < ent.entry.keys.len; n++)
if(ent.entry.keys.val[n].mkvno) {
@@ -169,7 +169,7 @@ kadm5_s_get_principal(void *server_handle,
out->max_renewable_life = INT_MAX;
}
if(mask & KADM5_KEY_DATA){
int i;
size_t i;
Key *key;
krb5_key_data *kd;
krb5_salt salt;

11
lib/kadm5/iprop-log.c
View File

@@ -124,7 +124,7 @@ print_entry(kadm5_server_context *server_context,
strftime(t, sizeof(t), "%Y-%m-%d %H:%M:%S", localtime(&timestamp));
if(op < kadm_get || op > kadm_nop) {
if((int)op < (int)kadm_get || (int)op > (int)kadm_nop) {
printf("unknown op: %d\n", op);
krb5_storage_seek(sp, end, SEEK_SET);
return;
@@ -350,8 +350,8 @@ apply_entry(kadm5_server_context *server_context,
struct replay_options *opt = ctx;
krb5_error_code ret;
if((opt->start_version_integer != -1 && ver < opt->start_version_integer) ||
(opt->end_version_integer != -1 && ver > opt->end_version_integer)) {
if((opt->start_version_integer != -1 && ver < (uint32_t)opt->start_version_integer) ||
(opt->end_version_integer != -1 && ver > (uint32_t)opt->end_version_integer)) {
/* XXX skip this entry */
krb5_storage_seek(sp, len, SEEK_CUR);
return;
@@ -426,8 +426,11 @@ help(void *opt, int argc, char **argv)
argv[0]);
} else {
if(c->func) {
char *fake[] = { NULL, "--help", NULL };
static char shelp[] = "--help";
char *fake[3];
fake[0] = argv[0];
fake[1] = shelp;
fake[2] = NULL;
(*c->func)(2, fake);
fprintf(stderr, "\n");
}

17
lib/kadm5/ipropd_master.c
View File

@@ -575,7 +575,7 @@ process_msg (krb5_context context, slave *s, int log_fd,
}
/* new started slave that have old log */
if (s->version == 0 && tmp != 0) {
if (current_version < tmp) {
if (current_version < (uint32_t)tmp) {
krb5_warnx (context, "Slave %s (version %lu) have later version "
"the master (version %lu) OUT OF SYNC",
s->name, (unsigned long)tmp,
@@ -583,7 +583,7 @@ process_msg (krb5_context context, slave *s, int log_fd,
}
s->version = tmp;
}
if (tmp < s->version) {
if ((uint32_t)tmp < s->version) {
krb5_warnx (context, "Slave claims to not have "
"version we already sent to it");
} else {
@@ -720,10 +720,11 @@ write_stats(krb5_context context, slave *slaves, uint32_t current_version)
}
static char sHDB[] = "HDB:";
static char *realm;
static int version_flag;
static int help_flag;
static char *keytab_str = "HDB:";
static char *keytab_str = sHDB;
static char *database;
static char *config_file;
static char *port_str;
@@ -732,8 +733,8 @@ static int detach_from_console = 0;
#endif
static struct getargs args[] = {
{ "config-file", 'c', arg_string, &config_file },
{ "realm", 'r', arg_string, &realm },
{ "config-file", 'c', arg_string, &config_file, NULL, NULL },
{ "realm", 'r', arg_string, &realm, NULL, NULL },
{ "keytab", 'k', arg_string, &keytab_str,
"keytab to get authentication from", "kspec" },
{ "database", 'd', arg_string, &database, "database", "file"},
@@ -747,12 +748,12 @@ static struct getargs args[] = {
"port ipropd will listen to", "port"},
#ifdef SUPPORT_DETACH
{ "detach", 0, arg_flag, &detach_from_console,
"detach from console" },
"detach from console", NULL },
#endif
{ "hostname", 0, arg_string, rk_UNCONST(&master_hostname),
"hostname of master (if not same as hostname)", "hostname" },
{ "version", 0, arg_flag, &version_flag },
{ "help", 0, arg_flag, &help_flag }
{ "version", 0, arg_flag, &version_flag, NULL, NULL },
{ "help", 0, arg_flag, &help_flag, NULL, NULL }
};
static int num_args = sizeof(args) / sizeof(args[0]);

17
lib/kadm5/ipropd_slave.c
View File

@@ -38,7 +38,8 @@ RCSID("$Id$");
static const char *config_name = "ipropd-slave";
static krb5_log_facility *log_facility;
static char *server_time_lost = "5 min";
static char five_min[] = "5 min";
static char *server_time_lost = five_min;
static int time_before_lost;
const char *slave_str = NULL;
@@ -198,9 +199,9 @@ receive_loop (krb5_context context,
krb5_ret_int32 (sp, &tmp);
op = tmp;
krb5_ret_int32 (sp, &len);
if (vers <= server_context->log_context.version)
if ((uint32_t)vers <= server_context->log_context.version)
krb5_storage_seek(sp, len + 8, SEEK_CUR);
} while(vers <= server_context->log_context.version);
} while((uint32_t)vers <= server_context->log_context.version);
/*
* Read up rest of the entires into the memory...
@@ -460,8 +461,8 @@ static int detach_from_console = 0;
#endif
static struct getargs args[] = {
{ "config-file", 'c', arg_string, &config_file },
{ "realm", 'r', arg_string, &realm },
{ "config-file", 'c', arg_string, &config_file, NULL, NULL },
{ "realm", 'r', arg_string, &realm, NULL, NULL },
{ "keytab", 'k', arg_string, &keytab_str,
"keytab to get authentication from", "kspec" },
{ "time-lost", 0, arg_string, &server_time_lost,
@@ -470,12 +471,12 @@ static struct getargs args[] = {
"port ipropd-slave will connect to", "port"},
#ifdef SUPPORT_DETACH
{ "detach", 0, arg_flag, &detach_from_console,
"detach from console" },
"detach from console", NULL },
#endif
{ "hostname", 0, arg_string, rk_UNCONST(&slave_str),
"hostname of slave (if not same as hostname)", "hostname" },
{ "version", 0, arg_flag, &version_flag },
{ "help", 0, arg_flag, &help_flag }
{ "version", 0, arg_flag, &version_flag, NULL, NULL },
{ "help", 0, arg_flag, &help_flag, NULL, NULL }
};
static int num_args = sizeof(args) / sizeof(args[0]);

2
lib/kadm5/keys.c
View File

@@ -70,7 +70,7 @@ _kadm5_init_keys (Key *keys, int len)
int
_kadm5_exists_keys(Key *keys1, int len1, Key *keys2, int len2)
{
unsigned int i, j;
int i, j;
for (i = 0; i < len1; ++i) {
for (j = 0; j < len2; j++) {

10
lib/kadm5/log.c
View File

@@ -193,12 +193,12 @@ kadm5_log_flush (kadm5_log_context *log_context,
{
krb5_data data;
size_t len;
int ret;
ssize_t ret;
krb5_storage_to_data(sp, &data);
len = data.length;
ret = write (log_context->log_fd, data.data, len);
if (ret != len) {
if (ret < 0 || (size_t)ret != len) {
krb5_data_free(&data);
return errno;
}
@@ -696,7 +696,7 @@ kadm5_log_replay_modify (kadm5_server_context *context,
}
if (mask & KADM5_KEY_DATA) {
size_t num;
int i;
size_t i;
for (i = 0; i < ent.entry.keys.len; ++i)
free_Key(&ent.entry.keys.val[i]);
@@ -880,7 +880,7 @@ kadm5_log_previous (krb5_context context,
ret = krb5_ret_int32 (sp, &tmp);
if (ret)
goto end_of_storage;
if (tmp != *ver) {
if ((uint32_t)tmp != *ver) {
krb5_storage_seek(sp, oldoff, SEEK_SET);
krb5_set_error_message(context, KADM5_BAD_DB,
"kadm5_log_previous: log entry "
@@ -901,7 +901,7 @@ kadm5_log_previous (krb5_context context,
ret = krb5_ret_int32 (sp, &tmp);
if (ret)
goto end_of_storage;
if (tmp != *len) {
if ((uint32_t)tmp != *len) {
krb5_storage_seek(sp, oldoff, SEEK_SET);
krb5_set_error_message(context, KADM5_BAD_DB,
"kadm5_log_previous: log entry "

6
lib/kadm5/password_quality.c
View File

@@ -95,8 +95,8 @@ char_class_passwd_quality (krb5_context context,
"1234567890",
"!@#$%^&*()/?<>,.{[]}\\|'~`\" "
};
int i, counter = 0, req_classes;
size_t len;
int counter = 0, req_classes;
size_t i, len;
char *pw;
req_classes = krb5_config_get_int_default(context, NULL, 3,
@@ -234,7 +234,7 @@ struct kadm5_pw_policy_check_func builtin_funcs[] = {
{ "minimum-length", min_length_passwd_quality },
{ "character-class", char_class_passwd_quality },
{ "external-check", external_passwd_quality },
{ NULL }
{ NULL, NULL }
};
struct kadm5_pw_policy_verifier builtin_verifier = {
"builtin",

2
lib/kadm5/rename_s.c
View File

@@ -62,7 +62,7 @@ kadm5_s_rename_principal(void *server_handle,
goto out2;
{
/* fix salt */
int i;
size_t i;
Salt salt;
krb5_salt salt2;
memset(&salt, 0, sizeof(salt));

4
lib/kadm5/set_keys.c
View File

@@ -201,8 +201,8 @@ _kadm5_set_keys_randomly (kadm5_server_context *context,
{
krb5_keyblock *kblock = NULL;
kadm5_ret_t ret = 0;
int i, des_keyblock;
size_t num_keys;
int des_keyblock;
size_t i, num_keys;
Key *keys;
ret = hdb_generate_key_set(context->context, ent->principal,