------------------------------------------------------------
revno: 377
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Tue 2007-05-29 13:48:30 +1000
message:
fixed some debug messages
modified:
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2
common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
lib/util/debug.h debug.h-20070417155854-2i3crb0irl716qft-2
takeover/ctdb_takeover.c
ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-05-29 02:16:59 +0000
+++ b/common/ctdb_daemon.c 2007-05-29 03:48:30 +0000
@@ -617,11 +617,11 @@
strncpy(addr.sun_path, ctdb->daemon.name, sizeof(addr.sun_path));
if (bind(ctdb->daemon.sd, (struct sockaddr *)&addr, sizeof(addr)) ==
-1) {
- DEBUG(0,("Unable to bind on ctdb socket '%s',
ctdb->daemon.name\n"));
+ DEBUG(0,("Unable to bind on ctdb socket '%s'\n",
ctdb->daemon.name));
goto failed;
}
if (listen(ctdb->daemon.sd, 10) != 0) {
- DEBUG(0,("Unable to listen on ctdb socket '%s',
ctdb->daemon.name\n"));
+ DEBUG(0,("Unable to listen on ctdb socket '%s'\n",
ctdb->daemon.name));
goto failed;
}
=== modified file 'common/ctdb_ltdb.c'
--- a/common/ctdb_ltdb.c 2007-05-25 08:48:49 +0000
+++ b/common/ctdb_ltdb.c 2007-05-29 03:48:30 +0000
@@ -367,7 +367,7 @@
for (tmp_db=ctdb->db_list;tmp_db;tmp_db=tmp_db->next) {
if (tmp_db->db_id == ctdb_db->db_id) {
DEBUG(0,("db_id 0x%x hash collision. name1='%s'
name2='%s'\n",
- db_name, tmp_db->db_name));
+ tmp_db->db_id, db_name, tmp_db->db_name));
talloc_free(ctdb_db);
return -1;
}
@@ -448,7 +448,7 @@
ctdb_db = find_ctdb_db(ctdb, db_id);
if (!ctdb_db) {
- DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_update_seqnum\n"));
+ DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_update_seqnum\n",
db_id));
return -1;
}
@@ -491,7 +491,7 @@
struct ctdb_db_context *ctdb_db;
ctdb_db = find_ctdb_db(ctdb, db_id);
if (!ctdb_db) {
- DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_enable_seqnum\n"));
+ DEBUG(0,("Unknown db_id 0x%x in ctdb_ltdb_enable_seqnum\n",
db_id));
return -1;
}
=== modified file 'common/ctdb_recoverd.c'
--- a/common/ctdb_recoverd.c 2007-05-26 23:43:25 +0000
+++ b/common/ctdb_recoverd.c 2007-05-29 03:48:30 +0000
@@ -546,7 +546,7 @@
if (ctdb->takeover.enabled) {
ret = ctdb_takeover_run(ctdb, nodemap);
if (ret != 0) {
- DEBUG(0, (__location__, " Unable to setup public
takeover addresses\n"));
+ DEBUG(0, (__location__ " Unable to setup public
takeover addresses\n"));
return -1;
}
}
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h 2007-05-29 03:33:59 +0000
+++ b/include/ctdb_private.h 2007-05-29 03:48:30 +0000
@@ -945,7 +945,9 @@
int32_t ctdb_control_startup(struct ctdb_context *ctdb, uint32_t vnn);
void ctdb_takeover_client_destructor_hook(struct ctdb_client *client);
-int ctdb_event_script(struct ctdb_context *ctdb, const char *fmt, ...);
+int ctdb_event_script(struct ctdb_context *ctdb, const char *fmt, ...)
PRINTF_ATTRIBUTE(2,3);
void ctdb_release_all_ips(struct ctdb_context *ctdb);
+
+
#endif
=== modified file 'lib/util/debug.h'
--- a/lib/util/debug.h 2007-04-17 15:59:39 +0000
+++ b/lib/util/debug.h 2007-05-29 03:48:30 +0000
@@ -18,4 +18,4 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-void do_debug(const char *format, ...);
+void do_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
=== modified file 'takeover/ctdb_takeover.c'
--- a/takeover/ctdb_takeover.c 2007-05-29 03:33:59 +0000
+++ b/takeover/ctdb_takeover.c 2007-05-29 03:48:30 +0000
@@ -239,7 +239,7 @@
}
if (nlines != ctdb->num_nodes) {
- DEBUG(0,("Number of lines in %s does not match number of
nodes!\n"));
+ DEBUG(0,("Number of lines in %s does not match number of
nodes!\n", alist));
talloc_free(lines);
return -1;
}
