Rev 137: merge from volker and ronnie in http://samba.org/~tridge/ctdb

tridge at samba.org tridge at samba.org
Tue Apr 17 09:27:50 GMT 2007


------------------------------------------------------------
revno: 137
revision-id: tridge at samba.org-20070417092749-c3fed1e34bc970c8
parent: tridge at samba.org-20070417071112-06cbeeb23d25fafa
parent: ronniesahlberg at gmail.com-20070417081508-rhx2vqhbqqkyqtdm
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Tue 2007-04-17 19:27:49 +1000
message:
  merge from volker and ronnie
modified:
  common/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070417081508-rhx2vqhbqqkyqtdm
    parent: ronniesahlberg at gmail.com-20070417073849-4ea4b0uj0hykxjmv
    parent: vl at samba.org-20070417073653-il05g8tsenhh7gq0
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Tue 2007-04-17 18:15:08 +1000
    message:
      merge from volker to prevent some valgrind errors
        ------------------------------------------------------------
        merged: vl at samba.org-20070417073653-il05g8tsenhh7gq0
        parent: tridge at samba.org-20070417071112-06cbeeb23d25fafa
        committer: Volker Lendecke <vl at samba.org>
        branch nick: tridge-ctdb
        timestamp: Tue 2007-04-17 09:36:53 +0200
        message:
          ZERO_STRUCT writes one byte too many here.
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070417073849-4ea4b0uj0hykxjmv
    parent: ronniesahlberg at gmail.com-20070417064353-vf3e7wrah1ifemrb
    parent: tridge at samba.org-20070417071112-06cbeeb23d25fafa
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Tue 2007-04-17 17:38:49 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070417064353-vf3e7wrah1ifemrb
    parent: ronniesahlberg at gmail.com-20070417053506-u2nrd3z872aj9y1r
    parent: tridge at samba.org-20070417063528-1d3fb576e31269f0
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Tue 2007-04-17 16:43:53 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070417053506-u2nrd3z872aj9y1r
    parent: ronniesahlberg at gmail.com-20070417050220-hdp626ifsk4qllek
    parent: tridge at samba.org-20070417053358-ca65998497e6eb09
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Tue 2007-04-17 15:35:06 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070417050220-hdp626ifsk4qllek
    parent: ronniesahlberg at gmail.com-20070417024252-02vexdegtsoenqjh
    parent: tridge at samba.org-20070417050142-bfa384732fe44e41
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Tue 2007-04-17 15:02:20 +1000
    message:
      merge from tridge
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c	2007-04-17 06:20:32 +0000
+++ b/common/ctdb_daemon.c	2007-04-17 07:36:53 +0000
@@ -89,7 +89,7 @@
 /*XXX cant use this since it returns an int	CTDB_NO_MEMORY(ctdb, r);*/
 	talloc_set_name_const(r, "req_message packet");
 
-	ZERO_STRUCT(*r);
+	memset(r, 0, offsetof(struct ctdb_req_message, data));
 
 	r->hdr.length    = len;
 	r->hdr.ctdb_magic = CTDB_MAGIC;
@@ -171,7 +171,7 @@
 		printf("Failed to allocate reply_call in ctdb daemon\n");
 		return;
 	}
-	ZERO_STRUCT(*r);
+	memset(r, 0, offsetof(struct ctdb_reply_fetch_lock, data));
 	r->hdr.length       = length;
 	r->hdr.ctdb_magic   = CTDB_MAGIC;
 	r->hdr.ctdb_version = CTDB_VERSION;
@@ -347,7 +347,7 @@
 		printf("Failed to allocate reply_call in ctdb daemon\n");
 		return;
 	}
-	ZERO_STRUCT(*r);
+	memset(r, 0, offsetof(struct ctdb_reply_call, data));
 	r->hdr.length       = length;
 	r->hdr.ctdb_magic   = CTDB_MAGIC;
 	r->hdr.ctdb_version = CTDB_VERSION;



More information about the samba-cvs mailing list