[PATCH] A few small ones for mdssvc

[Volker Lendecke]

Hi!

Review appreciated!

Thanks, 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

Meet us at Storage Developer Conference (SDC)
Santa Clara, CA USA, September 24th-27th 2018
-------------- next part --------------
From 3837518dd56bd8b5ff254d0f1a34d5e322cfb469 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 3 Aug 2018 12:38:47 +0200
Subject: [PATCH 1/4] mdssvc: Simplify sl_unpack_loop

Move a variable declaration closer to its use, avoid a redundant
?true:false;

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/rpc_server/mdssvc/marshalling.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source3/rpc_server/mdssvc/marshalling.c b/source3/rpc_server/mdssvc/marshalling.c
index 976702c49d4..76db6ffa39e 100644
--- a/source3/rpc_server/mdssvc/marshalling.c
+++ b/source3/rpc_server/mdssvc/marshalling.c
@@ -1058,7 +1058,6 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 	int i, toc_index, subcount;
 	uint64_t result;
 	sl_nil_t nil;
-	sl_bool_t b;
 	struct sl_tag tag, cpx_tag;
 
 	while (count > 0) {
@@ -1119,8 +1118,9 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 			count -= subcount;
 			break;
 
-		case SQ_TYPE_BOOL:
-			b = tag.count != 0 ? true : false;
+		case SQ_TYPE_BOOL: {
+			sl_bool_t b = (tag.count != 0);
+
 			result = dalloc_add_copy(query, &b, sl_bool_t);
 			if (result != 0) {
 				return -1;
@@ -1128,6 +1128,7 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 			offset += tag.size;
 			count--;
 			break;
+		}
 
 		case SQ_TYPE_INT64:
 			subcount = sl_unpack_ints(query, buf, offset, bufsize, encoding);
-- 
2.11.0


From a4a187770b00a04583e209e40eba07646b3bffee Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 3 Aug 2018 12:43:37 +0200
Subject: [PATCH 2/4] mdssvc: Move a variable declaration closer to its use

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/rpc_server/mdssvc/marshalling.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source3/rpc_server/mdssvc/marshalling.c b/source3/rpc_server/mdssvc/marshalling.c
index 76db6ffa39e..562afa6c974 100644
--- a/source3/rpc_server/mdssvc/marshalling.c
+++ b/source3/rpc_server/mdssvc/marshalling.c
@@ -1058,7 +1058,7 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 	int i, toc_index, subcount;
 	uint64_t result;
 	sl_nil_t nil;
-	struct sl_tag tag, cpx_tag;
+	struct sl_tag tag;
 
 	while (count > 0) {
 		if (offset >= toc_offset) {
@@ -1071,7 +1071,9 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 		}
 
 		switch (tag.type) {
-		case SQ_TYPE_COMPLEX:
+		case SQ_TYPE_COMPLEX: {
+			struct sl_tag cpx_tag;
+
 			if (tag.count < 1) {
 				DEBUG(1,("%s: invalid tag.count: %d\n",
 					 __func__, tag.count));
@@ -1101,6 +1103,7 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 			 */
 			count--;
 			break;
+		}
 
 		case SQ_TYPE_NULL:
 			subcount = tag.count;
-- 
2.11.0


From 2c8a5ffa661bf9eeb3b96d8717e633180b809bd8 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 3 Aug 2018 12:44:31 +0200
Subject: [PATCH 3/4] mdssvc: Move a variable declaration closer to its use

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/rpc_server/mdssvc/marshalling.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source3/rpc_server/mdssvc/marshalling.c b/source3/rpc_server/mdssvc/marshalling.c
index 562afa6c974..af059545759 100644
--- a/source3/rpc_server/mdssvc/marshalling.c
+++ b/source3/rpc_server/mdssvc/marshalling.c
@@ -1058,9 +1058,10 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 	int i, toc_index, subcount;
 	uint64_t result;
 	sl_nil_t nil;
-	struct sl_tag tag;
 
 	while (count > 0) {
+		struct sl_tag tag;
+
 		if (offset >= toc_offset) {
 			return -1;
 		}
-- 
2.11.0


From c3a34acfd556178d843f920b43359ddca98ce64e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 3 Aug 2018 12:45:59 +0200
Subject: [PATCH 4/4] mdssvc: Move a variable declaration closer to its use

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/rpc_server/mdssvc/marshalling.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source3/rpc_server/mdssvc/marshalling.c b/source3/rpc_server/mdssvc/marshalling.c
index af059545759..b5931c7f060 100644
--- a/source3/rpc_server/mdssvc/marshalling.c
+++ b/source3/rpc_server/mdssvc/marshalling.c
@@ -1057,7 +1057,6 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 {
 	int i, toc_index, subcount;
 	uint64_t result;
-	sl_nil_t nil;
 
 	while (count > 0) {
 		struct sl_tag tag;
@@ -1106,12 +1105,13 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 			break;
 		}
 
-		case SQ_TYPE_NULL:
+		case SQ_TYPE_NULL: {
+			sl_nil_t nil = 0;
+
 			subcount = tag.count;
 			if (subcount > count) {
 				return -1;
 			}
-			nil = 0;
 			for (i = 0; i < subcount; i++) {
 				result = dalloc_add_copy(query, &nil, sl_nil_t);
 				if (result != 0) {
@@ -1121,6 +1121,7 @@ static ssize_t sl_unpack_loop(DALLOC_CTX *query,
 			offset += tag.size;
 			count -= subcount;
 			break;
+		}
 
 		case SQ_TYPE_BOOL: {
 			sl_bool_t b = (tag.count != 0);
-- 
2.11.0