[PATCH] A few cosmetic patches

[Volker Lendecke]

Hi!

Attached find a few cosmetic patches

Review&push would be appreciated!

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
>From 2ab006790b397e20193fd469f6b1ce048383aac3 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 23 May 2014 15:19:05 +0200
Subject: [PATCH 1/4] smbd: Fix a typo

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/smbd/open.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a8c6d24..237e90c 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1153,7 +1153,7 @@ static bool has_delete_on_close(struct share_mode_lock *lck,
 
 /****************************************************************************
  Deal with share modes
- Invarient: Share mode must be locked on entry and exit.
+ Invariant: Share mode must be locked on entry and exit.
  Returns -1 on error, or number of share modes on success (may be zero).
 ****************************************************************************/
 
-- 
1.8.1.2


>From c260ec028333042caa8de0ccd6e1d9c37a12b7d9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 14 May 2014 10:13:48 +0200
Subject: [PATCH 2/4] serverid: Fix an incompatible pointer assignment

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/lib/serverid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 1a7e1ed..f982098 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -55,7 +55,7 @@ static struct db_context *serverid_db(void)
 
 bool serverid_parent_init(TALLOC_CTX *mem_ctx)
 {
-	struct tdb_wrap *db;
+	struct db_context *db;
 
 	db = serverid_db();
 	if (db == NULL) {
-- 
1.8.1.2


>From d963764195306ec036d712682b74b29dc7ef50fa Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 14 May 2014 09:31:20 +0200
Subject: [PATCH 3/4] messaging3: Fix whitespace

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/lib/messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 6778080..616c60d 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -785,7 +785,7 @@ void messaging_dispatch_rec(struct messaging_context *msg_ctx,
 			 * to keep the order of waiters, as
 			 * other code may depend on this.
 			 */
-			if (i <  msg_ctx->num_waiters - 1) {
+			if (i < msg_ctx->num_waiters - 1) {
 				memmove(&msg_ctx->waiters[i],
 					&msg_ctx->waiters[i+1],
 					sizeof(struct tevent_req *) *
-- 
1.8.1.2


>From ec8338c508d7a04fbad24f800561668058e93b82 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 13 May 2014 15:02:57 +0200
Subject: [PATCH 4/4] messaging3: Remove a pointless return;

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/lib/messages.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 616c60d..b045639 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -803,7 +803,6 @@ void messaging_dispatch_rec(struct messaging_context *msg_ctx,
 
 		i += 1;
 	}
-	return;
 }
 
 static int mess_parent_dgm_cleanup(void *private_data);
-- 
1.8.1.2