[Nagios-checkins] SF.net SVN: nagios:[2744] nagioscore/trunk/lib
Nagios network monitoring software is enterprise server monitoring
Brought to you by:
egalstad,
sawolf-nagios
From: <ag...@us...> - 2013-04-09 18:30:46
|
Revision: 2744 http://nagios.svn.sourceforge.net/nagios/?rev=2744&view=rev Author: ageric Date: 2013-04-09 18:30:38 +0000 (Tue, 09 Apr 2013) Log Message: ----------- lib/tests: Janitor patch Fix a bunch of compiler warnings. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/lib/test-bitmap.c nagioscore/trunk/lib/test-dkhash.c nagioscore/trunk/lib/test-fanout.c nagioscore/trunk/lib/test-iobroker.c nagioscore/trunk/lib/test-iocache.c nagioscore/trunk/lib/test-kvvec.c nagioscore/trunk/lib/test-runcmd.c nagioscore/trunk/lib/test-squeue.c Modified: nagioscore/trunk/lib/test-bitmap.c =================================================================== --- nagioscore/trunk/lib/test-bitmap.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-bitmap.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -6,7 +6,7 @@ int main(int argc, char **argv) { bitmap *a = NULL, *b, *r_union, *r_diff, *r_symdiff, *r_intersect; - int i; + unsigned int i; int sa[] = { 2, 3, 4, 1783, 1784, 1785 }; int sb[] = { 1, 2, 3, 1784, 1785, 1786, 1790, 1791, 1792 }; Modified: nagioscore/trunk/lib/test-dkhash.c =================================================================== --- nagioscore/trunk/lib/test-dkhash.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-dkhash.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -87,7 +87,8 @@ int main(int argc, char **argv) { dkhash_table *tx, *t; - int x, ret, r2; + unsigned int x; + int ret, r2; struct test_data s; char *p1, *p2; char *strs[10]; @@ -180,7 +181,7 @@ for(x = 0; x < 10; x++) { dkhash_insert(t, strs[x], NULL, strs[x]); } - for(x = 9; x >= 0; x--) { + for(x = 9; x; x--) { p1 = strs[x]; p2 = dkhash_remove(t, p1, NULL); test(p1 == p2, "remove should return a value"); Modified: nagioscore/trunk/lib/test-fanout.c =================================================================== --- nagioscore/trunk/lib/test-fanout.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-fanout.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -1,3 +1,5 @@ +#define _GNU_SOURCE 1 +#include <stdio.h> #include "fanout.c" #include "t-utils.h" @@ -15,7 +17,7 @@ static void run_tests(int ntests, int fo_size) { - struct tcase *test; + struct tcase *tc; unsigned long last_ptr, *ptr; int i, added = 0, removed = 0; fanout_table *fo; @@ -23,10 +25,10 @@ last_ptr = ntests; fo = fanout_create(fo_size); - test = calloc(ntests, sizeof(*test)); + tc = calloc(ntests, sizeof(*tc)); for (i = 0; i < ntests; i++) { - test[i].value = i; - if (!fanout_add(fo, test[i].key, &test[i].value)) + tc[i].value = i; + if (!fanout_add(fo, tc[i].key, &tc[i].value)) added++; } ok_int(added, ntests, "Adding stuff must work"); @@ -42,14 +44,14 @@ fo = fanout_create(fo_size); for (i = 0; i < ntests; i++) { - test[i].value = i; - if (!fanout_add(fo, test[i].key, &test[i].value)) + tc[i].value = i; + if (!fanout_add(fo, tc[i].key, &tc[i].value)) added++; } fanout_destroy(fo, destructor); ok_int(destroyed, ntests, "Expected ntest entries in destructor"); destroyed = 0; - free(test); + free(tc); } struct test_data { @@ -86,10 +88,10 @@ ok_int(fanout_get(fot, 123887987) == NULL, 1, "get on empty table must yield NULL"); for (k = 0; k < 16385; k++) { - struct test_data *td = calloc(1, sizeof(*td)); - td->key = k; - asprintf(&td->name, "%lu", k); - fanout_add(fot, k, td); + struct test_data *tdata = calloc(1, sizeof(*td)); + tdata->key = k; + asprintf(&tdata->name, "%lu", k); + fanout_add(fot, k, tdata); } td = fanout_get(fot, k - 1); ok_int(td != NULL, 1, "get must get what add inserts"); Modified: nagioscore/trunk/lib/test-iobroker.c =================================================================== --- nagioscore/trunk/lib/test-iobroker.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-iobroker.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -60,13 +60,13 @@ buf[len] = 0; - test(len == strlen(msg[i]), "len match for message %d", i); + test(len == (int)strlen(msg[i]), "len match for message %d", i); test(!memcmp(buf, msg[i], len), "data match for message %d", i); } i++; - if (i < 0 || i >= ARRAY_SIZE(msg)) { + if (i < 0 || i >= (int)ARRAY_SIZE(msg)) { fprintf(stderr, "i = %d in connected_handler(). What's up with that?\n", i); return 0; } Modified: nagioscore/trunk/lib/test-iocache.c =================================================================== --- nagioscore/trunk/lib/test-iocache.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-iocache.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -61,7 +61,7 @@ int main(int argc, char **argv) { - int i; + unsigned int i; struct strcode sc[] = { ADDSTR("\n"), ADDSTR("\0\0"), Modified: nagioscore/trunk/lib/test-kvvec.c =================================================================== --- nagioscore/trunk/lib/test-kvvec.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-kvvec.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -143,7 +143,7 @@ struct key_value *kv = &k.kv[i]; test(kv->key_len == kv->value_len, "%d.%d; key_len=%d; value_len=%d (%s = %s)", j, i, kv->key_len, kv->value_len, kv->key, kv->value); - test(kv->value_len == strlen(kv->value), + test(kv->value_len == (int)strlen(kv->value), "%d.%d; kv->value_len(%d) == strlen(%s)(%d)", j, i, kv->value_len, kv->value, (int)strlen(kv->value)); } Modified: nagioscore/trunk/lib/test-runcmd.c =================================================================== --- nagioscore/trunk/lib/test-runcmd.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-runcmd.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include "runcmd.c" #include "t-utils.h" #include <stdio.h> @@ -106,8 +107,8 @@ for (i = 0; anomaly[i].cmd; i++) { int out_argc; char *out_argv[256]; - int ret = runcmd_cmd2strv(anomaly[i].cmd, &out_argc, out_argv); - ok_int(ret, anomaly[i].ret, anomaly[i].cmd); + int result = runcmd_cmd2strv(anomaly[i].cmd, &out_argc, out_argv); + ok_int(result, anomaly[i].ret, anomaly[i].cmd); } } r2 = t_end(); @@ -119,9 +120,9 @@ for (i = 0; parse_case[i].cmd; i++) { int x, out_argc; char *out_argv[256]; - int ret = runcmd_cmd2strv(parse_case[i].cmd, &out_argc, out_argv); + int result = runcmd_cmd2strv(parse_case[i].cmd, &out_argc, out_argv); out_argv[out_argc] = NULL; - ok_int(ret, 0, parse_case[i].cmd); + ok_int(result, 0, parse_case[i].cmd); ok_int(out_argc, parse_case[i].argc_exp, parse_case[i].cmd); for (x = 0; x < parse_case[x].argc_exp && out_argv[x]; x++) { ok_str(parse_case[i].argv_exp[x], out_argv[x], "argv comparison test"); Modified: nagioscore/trunk/lib/test-squeue.c =================================================================== --- nagioscore/trunk/lib/test-squeue.c 2013-04-09 18:29:56 UTC (rev 2743) +++ nagioscore/trunk/lib/test-squeue.c 2013-04-09 18:30:38 UTC (rev 2744) @@ -43,7 +43,7 @@ squeue_event *evt; } sq_test_event; -static unsigned long sq_high = 0; +static time_t sq_high = 0; static int sq_walker(squeue_event *evt, void *arg) { static int walks = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |