From: Michael Adam <obnox@samba.org>
Date: Sun, 16 Mar 2008 23:22:12 +0000 (+0100)
Subject: registry: reformat regdb_store_keys_internal(), killing long lines.
X-Git-Tag: samba-3.3.0pre1~3287
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=966b2414cb6efdfe5acb412ed9bdfd7589ee694c;p=thirdparty%2Fsamba.git

registry: reformat regdb_store_keys_internal(), killing long lines.

Michael
---

diff --git a/source/registry/reg_backend_db.c b/source/registry/reg_backend_db.c
index 0ef76fe82f6..f91ddb7d8cd 100644
--- a/source/registry/reg_backend_db.c
+++ b/source/registry/reg_backend_db.c
@@ -401,7 +401,8 @@ static bool regdb_store_keys_internal(const char *key, REGSUBKEY_CTR *ctr)
 
 	/* allocate some initial memory */
 
-	if (!(buffer = (uint8 *)SMB_MALLOC(1024))) {
+	buffer = (uint8 *)SMB_MALLOC(1024);
+	if (buffer == NULL) {
 		return false;
 	}
 	buflen = 1024;
@@ -409,22 +410,25 @@ static bool regdb_store_keys_internal(const char *key, REGSUBKEY_CTR *ctr)
 
 	/* store the number of subkeys */
 
-	len += tdb_pack(buffer+len, buflen-len, "d", num_subkeys );
+	len += tdb_pack(buffer+len, buflen-len, "d", num_subkeys);
 
 	/* pack all the strings */
 
 	for (i=0; i<num_subkeys; i++) {
-		len += tdb_pack( buffer+len, buflen-len, "f", regsubkey_ctr_specific_key(ctr, i) );
-		if ( len > buflen ) {
+		len += tdb_pack(buffer+len, buflen-len, "f",
+				regsubkey_ctr_specific_key(ctr, i));
+		if (len > buflen) {
 			/* allocate some extra space */
-			if ((buffer = (uint8 *)SMB_REALLOC( buffer, len*2 )) == NULL) {
-				DEBUG(0,("regdb_store_keys: Failed to realloc memory of size [%d]\n", len*2));
+			buffer = (uint8 *)SMB_REALLOC(buffer, len*2);
+			if(buffer == NULL) {
+				DEBUG(0, ("regdb_store_keys: Failed to realloc "
+					  "memory of size [%d]\n", len*2));
 				ret = false;
 				goto done;
 			}
 			buflen = len*2;
-
-			len = tdb_pack( buffer+len, buflen-len, "f", regsubkey_ctr_specific_key(ctr, i) );
+			len = tdb_pack(buffer+len, buflen-len, "f",
+				       regsubkey_ctr_specific_key(ctr, i));
 		}
 	}
 
@@ -440,7 +444,7 @@ static bool regdb_store_keys_internal(const char *key, REGSUBKEY_CTR *ctr)
 
 done:
 	TALLOC_FREE(ctx);
-	SAFE_FREE( buffer );
+	SAFE_FREE(buffer);
 	return ret;
 }