[PATCH 09/37] lib/param: change set_variable_helper formatting

abartlet at samba.org abartlet at samba.org
Fri Jun 20 05:47:31 MDT 2014


From: Garming Sam <garming at catalyst.net.nz>

Attempting to make the code match exactly before moving it over.

Change-Id: Id5571b00a8afd7dffc6197f2c7e020dd4fd59f85
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
---
 lib/param/loadparm.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index e49f20b..44eb0a3 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1410,7 +1410,7 @@ bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
 		case P_BOOL: {
 			bool b;
 			if (!set_boolean(pszParmValue, &b)) {
-				DEBUG(0, ("set_variable(%s): value is not "
+				DEBUG(0, ("set_variable_helper(%s): value is not "
 					  "boolean!\n", pszParmValue));
 				return false;
 			}
@@ -1421,7 +1421,7 @@ bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
 		case P_BOOLREV: {
 			bool b;
 			if (!set_boolean(pszParmValue, &b)) {
-				DEBUG(0, ("set_variable(%s): value is not "
+				DEBUG(0, ("set_variable_helper(%s): value is not "
 					  "boolean!\n", pszParmValue));
 				return false;
 			}
@@ -1455,7 +1455,7 @@ bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
 				}
 			}
 
-			DEBUG(0, ("set_variable(%s): value is not "
+			DEBUG(0, ("set_variable_helper(%s): value is not "
 			          "a valid size specifier!\n", pszParmValue));
 			return false;
 		}
@@ -1464,8 +1464,9 @@ bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
 			TALLOC_FREE(*(char ***)parm_ptr);
 			*(const char * const **)parm_ptr
 				= (const char * const *)str_list_make_v3(mem_ctx,
-								      pszParmValue, NULL);
+									 pszParmValue, NULL);
 			break;
+
 		case P_LIST:
 		{
 			char **new_list = str_list_make_v3(mem_ctx,
@@ -1502,6 +1503,7 @@ bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
 			}
 			break;
 		}
+
 		case P_STRING:
 			lpcfg_string_set(mem_ctx, (char **)parm_ptr, pszParmValue);
 			break;
-- 
1.9.3



More information about the samba-technical mailing list