s3:registry: change reg_import.c according to coding guidelines.

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Wed Jun 27 10:07:54 CEST 2012 on sn-devel-104

1 files changed, 47 insertions, 53 deletions

diff --git a/source3/registry/reg_import.c b/source3/registry/reg_import.c
index 2ccb97ec37..8bcce6855e 100644
--- a/source3/registry/reg_import.c
+++ b/source3/registry/reg_import.c
@@ -28,52 +28,47 @@
 /* Debuglevel for tracing */
 static const int TL = 2;
 
-struct reg_import
-{
+struct reg_import {
 	struct reg_parse_callback reg_parse_callback;
 	struct reg_import_callback call;
-	void* open_key;
+	void *open_key;
 };
 
-static int
-reg_parse_callback_key(struct reg_import* cb_private,
-		       const char* key[], size_t n,
-		       bool del);
+static int reg_parse_callback_key(struct reg_import *cb_private,
+				  const char *key[], size_t n, bool del);
 
-static int
-reg_parse_callback_val(struct reg_import* cb_private,
-		       const char* name, uint32_t type,
-		       const uint8_t* data, uint32_t len);
+static int reg_parse_callback_val(struct reg_import *cb_private,
+				  const char *name, uint32_t type,
+				  const uint8_t *data, uint32_t len);
 
-static int
-reg_parse_callback_val_registry_value(struct reg_import* cb_private,
-				      const char* name, uint32_t type,
-				      const uint8_t* data, uint32_t len);
+static int reg_parse_callback_val_registry_value(struct reg_import *cb_private,
+						 const char *name,
+						 uint32_t type,
+						 const uint8_t *data,
+						 uint32_t len);
 
-static int
-reg_parse_callback_val_regval_blob(struct reg_import* cb_private,
-				   const char* name, uint32_t type,
-				   const uint8_t* data, uint32_t len);
+static int reg_parse_callback_val_regval_blob(struct reg_import *cb_private,
+					      const char *name, uint32_t type,
+					      const uint8_t *data,
+					      uint32_t len);
 
-static int
-reg_parse_callback_val_del(struct reg_import* cb_private,
-			   const char* name);
+static int reg_parse_callback_val_del(struct reg_import *cb_private,
+				      const char *name);
 
-static int
-reg_parse_callback_comment(struct reg_import* cb_private,
-			   const char* txt);
+static int reg_parse_callback_comment(struct reg_import *cb_private,
+				      const char *txt);
 
 
 /*******************************************************************************/
 
-int reg_parse_callback_key(struct reg_import* p,
-			   const char* key[], size_t n, bool del)
+int reg_parse_callback_key(struct reg_import *p,
+			   const char *key[], size_t n, bool del)
 {
 	WERROR werr = WERR_OK;
 
 	DEBUG(TL, ("%s: %s\n", __FUNCTION__, key[0]));
 
-	if (p->open_key != NULL ) {
+	if (p->open_key != NULL) {
 		werr = p->call.closekey(p->call.data, p->open_key);
 		p->open_key = NULL;
 		if (!W_ERROR_IS_OK(werr)) {
@@ -91,8 +86,7 @@ int reg_parse_callback_key(struct reg_import* p,
 			DEBUG(0, ("deletekey %s failed: %s\n",
 				  key[0], win_errstr(werr)));
 		}
-	}
-	else {
+	} else {
 		bool existing;
 		werr = p->call.createkey(p->call.data, NULL, key[0],
 					 &p->open_key, &existing);
@@ -122,9 +116,9 @@ int reg_parse_callback_key(struct reg_import* p,
 	} while(0)
 
 /*----------------------------------------------------------------------------*/
-int reg_parse_callback_val(struct reg_import* p,
-			   const char* name, uint32_t type,
-			   const uint8_t* data, uint32_t len)
+int reg_parse_callback_val(struct reg_import *p,
+			   const char *name, uint32_t type,
+			   const uint8_t *data, uint32_t len)
 {
 	WERROR werr = WERR_OK;
 
@@ -142,9 +136,9 @@ int reg_parse_callback_val(struct reg_import* p,
 }
 
 /*----------------------------------------------------------------------------*/
-int reg_parse_callback_val_registry_value(struct reg_import* p,
-					  const char* name, uint32_t type,
-					  const uint8_t* data, uint32_t len)
+int reg_parse_callback_val_registry_value(struct reg_import *p,
+					  const char *name, uint32_t type,
+					  const uint8_t *data, uint32_t len)
 {
 	WERROR werr = WERR_OK;
 	struct registry_value val = {
@@ -167,13 +161,13 @@ int reg_parse_callback_val_registry_value(struct reg_import* p,
 }
 
 /*----------------------------------------------------------------------------*/
-int reg_parse_callback_val_regval_blob(struct reg_import* p,
-				       const char* name, uint32_t type,
-				       const uint8_t* data, uint32_t len)
+int reg_parse_callback_val_regval_blob(struct reg_import *p,
+				       const char *name, uint32_t type,
+				       const uint8_t *data, uint32_t len)
 {
 	WERROR werr = WERR_OK;
 	void* mem_ctx = talloc_new(p);
-	struct regval_blob* v = NULL;
+	struct regval_blob *v = NULL;
 
 	DEBUG(TL, ("%s(%x): >%s< = [%x]\n", __FUNCTION__, type, name, len));
 	DEBUG_ADD_HEX(TL, data, len);
@@ -200,8 +194,8 @@ done:
 
 /*----------------------------------------------------------------------------*/
 
-int reg_parse_callback_val_del(struct reg_import* p,
-			       const char* name)
+int reg_parse_callback_val_del(struct reg_import *p,
+			       const char *name)
 {
 	WERROR werr = WERR_OK;
 
@@ -217,15 +211,15 @@ int reg_parse_callback_val_del(struct reg_import* p,
 }
 
 
-int reg_parse_callback_comment(struct reg_import* cb_private,
-			       const char* txt)
+int reg_parse_callback_comment(struct reg_import *cb_private,
+			       const char *txt)
 {
 	DEBUG(TL, ("%s: %s\n", __FUNCTION__, txt));
 	return 0;
 }
 
 /******************************************************************************/
-static int nop(void* data)
+static int nop(void *data)
 {
 	return 0;
 }
@@ -234,24 +228,24 @@ static int nop(void* data)
 struct reg_parse_callback *reg_import_adapter(TALLOC_CTX *talloc_ctx,
 					      struct reg_import_callback cb)
 {
-	struct reg_parse_callback* ret;
-	struct reg_import* p = talloc_zero(talloc_ctx, struct reg_import);
+	struct reg_parse_callback *ret;
+	struct reg_import *p = talloc_zero(talloc_ctx, struct reg_import);
 	if (p == NULL) {
 		goto fail;
 	}
-	if (cb.openkey == NULL ) {
+	if (cb.openkey == NULL) {
 		cb.openkey = (reg_import_callback_openkey_t)&nop;
 	}
-	if (cb.closekey == NULL ) {
+	if (cb.closekey == NULL) {
 		cb.closekey = (reg_import_callback_closekey_t)&nop;
 	}
-	if (cb.createkey == NULL ) {
+	if (cb.createkey == NULL) {
 		cb.createkey = (reg_import_callback_createkey_t)&nop;
 	}
-	if (cb.deletekey == NULL ) {
+	if (cb.deletekey == NULL) {
 		cb.deletekey = (reg_import_callback_deletekey_t)&nop;
 	}
-	if (cb.deleteval == NULL ) {
+	if (cb.deleteval == NULL) {
 		cb.deleteval = (reg_import_callback_deleteval_t)&nop;
 	}
 
@@ -283,7 +277,7 @@ struct reg_parse_callback *reg_import_adapter(TALLOC_CTX *talloc_ctx,
 		assert(false);
 	}
 
-	assert((struct reg_parse_callback*)p == ret);
+	assert((struct reg_parse_callback *)p == ret);
 	return ret;
 fail:
 	talloc_free(p);