[SCM] CTDB repository - branch master updated - ctdb-2.3-63-gf9556a6

[Michael Adam]

The branch, master has been updated
       via  f9556a6f1fe0046308c8b363e6dcaf3f7ce6f2b7 (commit)
       via  00d3bf092e2f72eda330978c75ec85f17e870553 (commit)
       via  cb3a1c5af3b796dba30cae07118670d3c9e57df7 (commit)
      from  7b7aa7b599536cd60ebb84d363607bb4e953248a (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f9556a6f1fe0046308c8b363e6dcaf3f7ce6f2b7
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 19 16:54:06 2013 +0200

    util: In passing the code, fix a space vs. tab in set_close_on_exec().
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit 00d3bf092e2f72eda330978c75ec85f17e870553
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 19 17:07:19 2013 +0200

    server: standardize formatting of comment block for ctdb_reply_dmaster() while I'm at it..
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit cb3a1c5af3b796dba30cae07118670d3c9e57df7
Author: Michael Adam <obnox at samba.org>
Date:   Tue Aug 13 10:17:45 2013 +0200

    server: fix wording and punctuation in comment block for ctdb_reply_dmaster().
    
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 common/ctdb_util.c |    2 +-
 server/ctdb_call.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index a2da3bc..0274a76 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -376,7 +376,7 @@ void set_close_on_exec(int fd)
 {
 	unsigned v;
 	v = fcntl(fd, F_GETFD, 0);
-        fcntl(fd, F_SETFD, v | FD_CLOEXEC);
+	fcntl(fd, F_SETFD, v | FD_CLOEXEC);
 }
 
 
diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index 6288ff2..a6fd85e 100644
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -983,12 +983,12 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 	talloc_free(r);
 }
 
-/*
-  called when a CTDB_REPLY_CALL packet comes in
-
-  This packet comes in response to a CTDB_REQ_CALL request packet. It
-  contains any reply data from the call
-*/
+/**
+ * called when a CTDB_REPLY_CALL packet comes in
+ *
+ * This packet comes in response to a CTDB_REQ_CALL request packet. It
+ * contains any reply data from the call
+ */
 void ctdb_reply_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 {
 	struct ctdb_reply_call *c = (struct ctdb_reply_call *)hdr;
@@ -1082,9 +1082,9 @@ finished_ro:
 /*
   called when a CTDB_REPLY_DMASTER packet comes in
 
-  This packet comes in from the lmaster response to a CTDB_REQ_CALL
+  This packet comes in from the lmaster in response to a CTDB_REQ_CALL
   request packet. It means that the current dmaster wants to give us
-  the dmaster role
+  the dmaster role.
 */
 void ctdb_reply_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 {


-- 
CTDB repository