Rev 574: minor back-merge from samba4 in http://samba.org/~tridge/ctdb

tridge at samba.org tridge at samba.org
Tue Jul 10 08:13:47 GMT 2007


------------------------------------------------------------
revno: 574
revision-id: tridge at samba.org-20070710081347-5jd8uwf5k5mhbv02
parent: tridge at samba.org-20070710054605-cld6k4rlvr8eh7r7
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Tue 2007-07-10 18:13:47 +1000
message:
  minor back-merge from samba4
modified:
  client/ctdb_client.c           ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  config.mk                      config.mk-20070416041303-xql6zaaq90w8kovl-1
  include/includes.h             includes.h-20061117234101-o3qt14umlg9en8z0-17
  lib/util/util_file.c           util_file.c-20070607122900-1qsfd63pwgknirtn-1
=== modified file 'client/ctdb_client.c'
--- a/client/ctdb_client.c	2007-07-10 05:29:31 +0000
+++ b/client/ctdb_client.c	2007-07-10 08:13:47 +0000
@@ -1612,8 +1612,8 @@
 	char *keystr, *datastr;
 	struct ctdb_ltdb_header *h = (struct ctdb_ltdb_header *)data.dptr;
 
-	keystr  = hex_encode(ctdb, key.dptr, key.dsize);
-	datastr = hex_encode(ctdb, data.dptr+sizeof(*h), data.dsize-sizeof(*h));
+	keystr  = hex_encode_talloc(ctdb, key.dptr, key.dsize);
+	datastr = hex_encode_talloc(ctdb, data.dptr+sizeof(*h), data.dsize-sizeof(*h));
 
 	fprintf(f, "dmaster: %u\n", h->dmaster);
 	fprintf(f, "rsn: %llu\n", (unsigned long long)h->rsn);

=== modified file 'config.mk'
--- a/config.mk	2007-04-21 03:08:22 +0000
+++ b/config.mk	2007-07-10 08:13:47 +0000
@@ -7,24 +7,12 @@
 OBJ_FILES = opendb_ctdb.o
 
 ##################
-[SUBSYSTEM::ctdb_tcp]
-OBJ_FILES = \
-		tcp/tcp_init.o \
-		tcp/tcp_io.o \
-		tcp/tcp_connect.o
-
-##################
 [SUBSYSTEM::ctdb]
 OBJ_FILES = \
 		ctdb_cluster.o \
-		common/ctdb.o \
-		common/ctdb_call.o \
+		client/ctdb_client.o \
+		common/ctdb_io.o \
+		common/ctdb_ltdb.o \
 		common/ctdb_message.o \
-		common/ctdb_ltdb.o \
-		common/ctdb_util.o \
-		common/ctdb_io.o \
-		common/ctdb_client.o \
-		common/ctdb_daemon.o \
-		common/ctdb_lockwait.o
+		common/ctdb_util.o
 PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
-PRIVATE_DEPENDENCIES = ctdb_tcp

=== modified file 'include/includes.h'
--- a/include/includes.h	2007-06-07 12:26:27 +0000
+++ b/include/includes.h	2007-07-10 08:13:47 +0000
@@ -34,7 +34,7 @@
 _PUBLIC_ struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs);
 double timeval_elapsed(struct timeval *tv);
 char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *mem_ctx);
-char *hex_encode(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len);
+char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len);
 _PUBLIC_ const char **str_list_add(const char **list, const char *s);
 _PUBLIC_ int set_blocking(int fd, BOOL set);
 

=== modified file 'lib/util/util_file.c'
--- a/lib/util/util_file.c	2007-06-07 12:30:29 +0000
+++ b/lib/util/util_file.c	2007-07-10 08:13:47 +0000
@@ -102,7 +102,7 @@
 	return file_lines_parse(p, size, numlines, mem_ctx);
 }
 
-char *hex_encode(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len)
+char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len)
 {
 	int i;
 	char *hex_buffer;



More information about the samba-cvs mailing list