From: Volker Lendecke <vl@samba.org>
Date: Fri, 3 Aug 2018 10:45:59 +0000 (+0200)
Subject: mdssvc: Move a variable declaration closer to its use
X-Git-Tag: tdb-1.3.17~1615
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8df3f3499fd7421260fbe532bd6947d3c0ea8bd;p=thirdparty%2Fsamba.git

mdssvc: Move a variable declaration closer to its use

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Sep 14 10:48:47 CEST 2018 on sn-devel-144
---

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);