diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-13 18:41:34 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-13 18:41:34 +1000 |
| commit | 9b87ffe874d589b22816cee3224f9b2b44cff966 (patch) | |
| tree | bccf1393b2651e5e20cc89e5247ca8876f66ea42 | |
| parent | 8e4bfba75c5b38d37849aef0d88a619ef74aab6f (diff) | |
| download | samba-9b87ffe874d589b22816cee3224f9b2b44cff966.tar.gz samba-9b87ffe874d589b22816cee3224f9b2b44cff966.tar.xz samba-9b87ffe874d589b22816cee3224f9b2b44cff966.zip | |
fix some compiler warnings for the test tools
(This used to be ctdb commit dbfd5abafbe66c20c413a4335b2cdbd9cc24052a)
| -rw-r--r-- | ctdb/tests/src/ctdb_fetch_readonly_loop.c | 6 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_fetch_readonly_once.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/tests/src/ctdb_fetch_readonly_loop.c b/ctdb/tests/src/ctdb_fetch_readonly_loop.c index 57194e27a8..12540188bc 100644 --- a/ctdb/tests/src/ctdb_fetch_readonly_loop.c +++ b/ctdb/tests/src/ctdb_fetch_readonly_loop.c @@ -27,7 +27,7 @@ static struct ctdb_db_context *ctdb_db; -char *TESTKEY = "testkey"; +const char *TESTKEY = "testkey"; static int count; /* @@ -53,7 +53,7 @@ static void fetch_lock_once(struct ctdb_context *ctdb, struct event_context *ev) } count++; - printf("%d data:%.*s\n", (int)count, data.dsize, data.dptr); + printf("%d data:%.*s\n", (int)count, (int)data.dsize, data.dptr); talloc_free(tmp_ctx); } @@ -99,7 +99,7 @@ int main(int argc, const char *argv[]) ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0)); - key.dptr = TESTKEY; + key.dptr = discard_const(TESTKEY); key.dsize = strlen(TESTKEY); ret = ctdb_ctrl_getvnnmap(ctdb, timeval_zero(), CTDB_CURRENT_NODE, ctdb, &ctdb->vnn_map); diff --git a/ctdb/tests/src/ctdb_fetch_readonly_once.c b/ctdb/tests/src/ctdb_fetch_readonly_once.c index 9dfd97d50e..40d071f2f0 100644 --- a/ctdb/tests/src/ctdb_fetch_readonly_once.c +++ b/ctdb/tests/src/ctdb_fetch_readonly_once.c @@ -27,7 +27,7 @@ static struct ctdb_db_context *ctdb_db; -char *TESTKEY = "testkey"; +const char *TESTKEY = "testkey"; /* @@ -102,7 +102,7 @@ int main(int argc, const char *argv[]) ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0)); - key.dptr = TESTKEY; + key.dptr = discard_const(TESTKEY); key.dsize = strlen(TESTKEY); ret = ctdb_ctrl_getvnnmap(ctdb, timeval_zero(), CTDB_CURRENT_NODE, ctdb, &ctdb->vnn_map); |