The branch, master has been updated via 25a20409fb39a94b64c13990c0eba4f75d482ecd (commit) via d1ec06d30148e6fd344625a2fbf1c22391bd908a (commit) from 124e2a471aeda9c900fd898178a30522d7d74221 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 25a20409fb39a94b64c13990c0eba4f75d482ecd Author: Martin Schwenke <mar...@meltin.net> Date: Tue Feb 5 12:13:57 2013 +1100 build: Fix a Makefile.in typo Objects are named *.o ;-) Signed-off-by: Martin Schwenke <mar...@meltin.net> commit d1ec06d30148e6fd344625a2fbf1c22391bd908a Author: Martin Schwenke <mar...@meltin.net> Date: Fri Jan 11 12:39:37 2013 +1100 tools/ctdb: Fix a compiler warning Signed-off-by: Martin Schwenke <mar...@meltin.net> Pair-programmed-with: Amitay Isaacs <ami...@gmail.com> ----------------------------------------------------------------------- Summary of changes: Makefile.in | 2 +- tools/ctdb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index e704d63..762f788 100755 --- a/Makefile.in +++ b/Makefile.in @@ -72,7 +72,7 @@ UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util CTDB_COMMON_OBJ = common/ctdb_io.o common/ctdb_util.o \ common/ctdb_ltdb.o common/ctdb_message.o common/cmdline.o \ lib/util/debug.o common/rb_tree.o @CTDB_SYSTEM_OBJ@ common/system_common.o \ - common/ctdb_logging.c common/ctdb_fork.o + common/ctdb_logging.o common/ctdb_fork.o CTDB_LIB_OBJ = libctdb/ctdb.o libctdb/io_elem.o libctdb/local_tdb.o \ libctdb/messages.o libctdb/sync.o libctdb/control.o \ diff --git a/tools/ctdb.c b/tools/ctdb.c index 678b555..fb3df8b 100644 --- a/tools/ctdb.c +++ b/tools/ctdb.c @@ -4935,7 +4935,7 @@ static int control_setdbseqnum(struct ctdb_context *ctdb, int argc, const char * } key.dptr = (uint8_t *)discard_const(CTDB_DB_SEQNUM_KEY); - key.dsize = strlen(key.dptr) + 1; + key.dsize = strlen(CTDB_DB_SEQNUM_KEY) + 1; data.dsize = sizeof(new_seqnum); data.dptr = talloc_size(tmp_ctx, data.dsize); -- CTDB repository