werror: replace WERR_NOMEM with WERR_NOT_ENOUGH_MEMORY in source3/registry/

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

9 files changed, 51 insertions, 51 deletions

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 16ff8337914..da33ca508e3 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -148,7 +148,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 	    !(regkey->token = dup_nt_token(regkey, token)) ||
 	    !(regkey->key = talloc_zero(regkey, struct registry_key_handle)))
 	{
-		result = WERR_NOMEM;
+		result = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -185,7 +185,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 	}
 
 	if (key->name == NULL) {
-		result = WERR_NOMEM;
+		result = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -263,7 +263,7 @@ WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
 
 	path = talloc_strdup(frame, name);
 	if (path == NULL) {
-		err = WERR_NOMEM;
+		err = WERR_NOT_ENOUGH_MEMORY;
 		goto error;
 	}
 
@@ -279,7 +279,7 @@ WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
 
 		name_component = talloc_strndup(frame, path, (p - path));
 		if (name_component == NULL) {
-			err = WERR_NOMEM;
+			err = WERR_NOT_ENOUGH_MEMORY;
 			goto error;
 		}
 
@@ -324,7 +324,7 @@ WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
 	if (!(*name = talloc_strdup(mem_ctx,
 			regsubkey_ctr_specific_key(key->subkeys, idx))))
 	{
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	if (last_write_time) {
@@ -358,7 +358,7 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
 
 	val = talloc_zero(mem_ctx, struct registry_value);
 	if (val == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	val->type = regval_type(blob);
@@ -368,7 +368,7 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
 	    && !(*pname = talloc_strdup(
 			 mem_ctx, regval_name(blob)))) {
 		TALLOC_FREE(val);
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	*pval = val;
@@ -395,7 +395,7 @@ static WERROR reg_enumvalue_nocachefill(TALLOC_CTX *mem_ctx,
 
 	val = talloc_zero(mem_ctx, struct registry_value);
 	if (val == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	val->type = regval_type(blob);
@@ -405,7 +405,7 @@ static WERROR reg_enumvalue_nocachefill(TALLOC_CTX *mem_ctx,
 	    && !(*pname = talloc_strdup(
 			 mem_ctx, regval_name(blob)))) {
 		TALLOC_FREE(val);
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	*pval = val;
@@ -469,7 +469,7 @@ WERROR reg_querymultiplevalues(TALLOC_CTX *mem_ctx,
 
 	vals = talloc_zero_array(mem_ctx, struct registry_value, num_names);
 	if (vals == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	for (n=0; n < num_names; n++) {
@@ -539,7 +539,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
 	*max_valbufsize = max_size;
 
 	if (!(mem_ctx = talloc_new(key))) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	err = regkey_get_secdesc(mem_ctx, key->key, &secdesc);
@@ -569,12 +569,12 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
 
 	mem_ctx = talloc_new(ctx);
 	if (mem_ctx == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	path = talloc_strdup(mem_ctx, subkeypath);
 	if (path == NULL) {
-		err = WERR_NOMEM;
+		err = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -682,7 +682,7 @@ static WERROR reg_deletekey_internal(TALLOC_CTX *mem_ctx,
 	struct registry_key *key;
 	name = talloc_strdup(mem_ctx, path);
 	if (name == NULL) {
-		err = WERR_NOMEM;
+		err = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -797,7 +797,7 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
 
 	if (res == 0) {
 		TALLOC_FREE(key->values);
-		err = WERR_NOMEM;
+		err = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c
index 560209e62d7..d30877792ac 100644
--- a/source3/registry/reg_api_regf.c
+++ b/source3/registry/reg_api_regf.c
@@ -58,7 +58,7 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
 	registry_key.name = talloc_strdup(regfile->mem_ctx, topkeypath);
 	if (!registry_key.name) {
 		DEBUG(0, ("reg_load_tree: Talloc failed for reg_key.name!\n"));
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	/* now start parsing the values and subkeys */
@@ -113,7 +113,7 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
 				       topkeypath,
 				       subkey->keyname);
 		if (path == NULL) {
-			return WERR_NOMEM;
+			return WERR_NOT_ENOUGH_MEMORY;
 		}
 		result = reg_load_tree(regfile, path, subkey);
 		if (!W_ERROR_IS_OK(result)) {
@@ -195,7 +195,7 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
 
 	key_tmp = talloc_strdup(regfile->mem_ctx, keypath);
 	if (!key_tmp) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 	if (!reg_split_key(key_tmp, &parentpath, &keyname)) {
 		return WERR_OBJECT_PATH_INVALID;
@@ -211,7 +211,7 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
 
 	registry_key.name = talloc_strdup(regfile->mem_ctx, keypath);
 	if (registry_key.name == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	registry_key.ops = reghook_cache_find(registry_key.name);
@@ -252,7 +252,7 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
 		subkeypath = talloc_asprintf(regfile->mem_ctx, "%s\\%s",
 					     keypath, subkeyname);
 		if (subkeypath == NULL) {
-			result = WERR_NOMEM;
+			result = WERR_NOT_ENOUGH_MEMORY;
 			goto done;
 		}
 		result = reg_write_tree(regfile, subkeypath, key);
diff --git a/source3/registry/reg_api_util.c b/source3/registry/reg_api_util.c
index b206e7d898e..1c79fcf9a89 100644
--- a/source3/registry/reg_api_util.c
+++ b/source3/registry/reg_api_util.c
@@ -40,7 +40,7 @@ WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
 	WERROR err;
 
 	if (!(path = SMB_STRDUP(orig_path))) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	p = strchr(path, '\\');
@@ -99,7 +99,7 @@ WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
 	WERROR err;
 
 	if (!(path = SMB_STRDUP(orig_path))) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	p = strchr(path, '\\');
@@ -151,7 +151,7 @@ WERROR reg_delete_path(const struct security_token *token,
 	WERROR err;
 
 	if (!(path = SMB_STRDUP(orig_path))) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	p = strchr(path, '\\');
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index f460c9dd7b7..016a9a3340d 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -734,7 +734,7 @@ WERROR regdb_init(void)
 
 	db_path = state_path("registry.tdb");
 	if (db_path == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	regdb = db_open(NULL, db_path, 0,
@@ -862,7 +862,7 @@ WERROR regdb_open( void )
 
 	db_path = state_path("registry.tdb");
 	if (db_path == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	become_root();
@@ -945,7 +945,7 @@ static WERROR regdb_delete_key_with_prefix(struct db_context *db,
 					   const char *prefix)
 {
 	char *path;
-	WERROR werr = WERR_NOMEM;
+	WERROR werr = WERR_NOT_ENOUGH_MEMORY;
 	TALLOC_CTX *mem_ctx = talloc_stackframe();
 
 	if (keyname == NULL) {
@@ -1046,13 +1046,13 @@ static WERROR regdb_store_keys_internal2(struct db_context *db,
 
 	keyname = talloc_strdup(ctx, key);
 	if (!keyname) {
-		werr = WERR_NOMEM;
+		werr = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
 	keyname = normalize_reg_path(ctx, keyname);
 	if (!keyname) {
-		werr = WERR_NOMEM;
+		werr = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -1060,7 +1060,7 @@ static WERROR regdb_store_keys_internal2(struct db_context *db,
 
 	buffer = (uint8_t *)SMB_MALLOC(1024);
 	if (buffer == NULL) {
-		werr = WERR_NOMEM;
+		werr = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 	buflen = 1024;
@@ -1089,7 +1089,7 @@ static WERROR regdb_store_keys_internal2(struct db_context *db,
 				DEBUG(0, ("regdb_store_keys: Failed to realloc "
 					  "memory of size [%u]\n",
 					  (unsigned int)(len+thistime)*2));
-				werr = WERR_NOMEM;
+				werr = WERR_NOT_ENOUGH_MEMORY;
 				goto done;
 			}
 			buflen = (len+thistime)*2;
@@ -1142,7 +1142,7 @@ static WERROR regdb_store_subkey_list(struct db_context *db, const char *parent,
 		path = talloc_asprintf(frame, "%s\\%s", parent, key);
 	}
 	if (!path) {
-		werr = WERR_NOMEM;
+		werr = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -1245,7 +1245,7 @@ static NTSTATUS regdb_store_keys_action(struct db_context *db,
 		path = talloc_asprintf(mem_ctx, "%s\\%s", store_ctx->key,
 				       oldkeyname);
 		if (!path) {
-			werr = WERR_NOMEM;
+			werr = WERR_NOT_ENOUGH_MEMORY;
 			goto done;
 		}
 
@@ -1436,7 +1436,7 @@ static WERROR regdb_create_subkey_internal(struct db_context *db,
 
 		newkey = talloc_asprintf(mem_ctx, "%s\\%s", key, subkey);
 		if (newkey == NULL) {
-			werr = WERR_NOMEM;
+			werr = WERR_NOT_ENOUGH_MEMORY;
 			goto done;
 		}
 
@@ -1563,7 +1563,7 @@ static WERROR regdb_delete_subkey(const char *key, const char *subkey, bool lazy
 
 	path = talloc_asprintf(mem_ctx, "%s\\%s", key, subkey);
 	if (path == NULL) {
-		werr = WERR_NOMEM;
+		werr = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -2095,13 +2095,13 @@ static WERROR regdb_get_secdesc(TALLOC_CTX *mem_ctx, const char *key,
 
 	tdbkey = talloc_asprintf(tmp_ctx, "%s\\%s", REG_SECDESC_PREFIX, key);
 	if (tdbkey == NULL) {
-		err = WERR_NOMEM;
+		err = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
 	tdbkey = normalize_reg_path(tmp_ctx, tdbkey);
 	if (tdbkey == NULL) {
-		err = WERR_NOMEM;
+		err = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
@@ -2115,7 +2115,7 @@ static WERROR regdb_get_secdesc(TALLOC_CTX *mem_ctx, const char *key,
 				     psecdesc);
 
 	if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MEMORY)) {
-		err = WERR_NOMEM;
+		err = WERR_NOT_ENOUGH_MEMORY;
 	} else if (!NT_STATUS_IS_OK(status)) {
 		err = WERR_REG_CORRUPT;
 	}
diff --git a/source3/registry/reg_cachehook.c b/source3/registry/reg_cachehook.c
index 1f269276aab..de8ee05d0d7 100644
--- a/source3/registry/reg_cachehook.c
+++ b/source3/registry/reg_cachehook.c
@@ -43,7 +43,7 @@ static WERROR keyname_to_path(TALLOC_CTX *mem_ctx, const char *keyname,
 	tmp_path = talloc_asprintf(mem_ctx, "\\%s", keyname);
 	if (tmp_path == NULL) {
 		DEBUG(0, ("talloc_asprintf failed!\n"));
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	*path = tmp_path;
@@ -63,7 +63,7 @@ WERROR reghook_cache_init(void)
 
 	cache_tree = pathtree_init(&regdb_ops);
 	if (cache_tree == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 	DEBUG(10, ("reghook_cache_init: new tree with default "
 		   "ops %p for key [%s]\n", (void *)&regdb_ops,
@@ -94,7 +94,7 @@ WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops)
 		   (void *)ops, key));
 
 	if (!pathtree_add(cache_tree, key, ops))
-		werr = WERR_NOMEM;
+		werr = WERR_NOT_ENOUGH_MEMORY;
 	else
 		werr = WERR_OK;
 
diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c
index 8c94413796d..ab3fb24dc2f 100644
--- a/source3/registry/reg_dispatcher.c
+++ b/source3/registry/reg_dispatcher.c
@@ -65,7 +65,7 @@ static WERROR construct_registry_sd(TALLOC_CTX *ctx, struct security_descriptor
 
 	theacl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace);
 	if (theacl == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	sd = make_sec_desc(ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
@@ -73,7 +73,7 @@ static WERROR construct_registry_sd(TALLOC_CTX *ctx, struct security_descriptor
 			   &global_sid_System, NULL, theacl,
 			   &sd_size);
 	if (sd == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	*psd = sd;
diff --git a/source3/registry/reg_import.c b/source3/registry/reg_import.c
index 5fb19ee4566..01d85af4e87 100644
--- a/source3/registry/reg_import.c
+++ b/source3/registry/reg_import.c
@@ -175,7 +175,7 @@ int reg_parse_callback_val_regval_blob(struct reg_import *p,
 	v = regval_compose(mem_ctx, name, type, data, len);
 	if (v == NULL) {
 		DEBUG(0, ("regval_compose %s failed\n", name));
-		werr = WERR_NOMEM;
+		werr = WERR_NOT_ENOUGH_MEMORY;
 		goto done;
 	}
 
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index ded69e87f06..afb549777f7 100644
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -76,13 +76,13 @@ WERROR regsubkey_ctr_init(TALLOC_CTX *mem_ctx, struct regsubkey_ctr **ctr)
 
 	*ctr = talloc_zero(mem_ctx, struct regsubkey_ctr);
 	if (*ctr == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	(*ctr)->subkeys_hash = db_open_rbt(*ctr);
 	if ((*ctr)->subkeys_hash == NULL) {
 		talloc_free(*ctr);
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	return WERR_OK;
@@ -216,7 +216,7 @@ WERROR regsubkey_ctr_addkey( struct regsubkey_ctr *ctr, const char *keyname )
 
 	if (!(newkeys = talloc_realloc(ctr, ctr->subkeys, char *,
 					     ctr->num_subkeys+1))) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	ctr->subkeys = newkeys;
@@ -226,7 +226,7 @@ WERROR regsubkey_ctr_addkey( struct regsubkey_ctr *ctr, const char *keyname )
 		/*
 		 * Don't shrink the new array again, this wastes a pointer
 		 */
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	werr = regsubkey_ctr_hash_keyname(ctr, keyname, ctr->num_subkeys);
@@ -330,7 +330,7 @@ WERROR regval_ctr_init(TALLOC_CTX *mem_ctx, struct regval_ctr **ctr)
 
 	*ctr = talloc_zero(mem_ctx, struct regval_ctr);
 	if (*ctr == NULL) {
-		return WERR_NOMEM;
+		return WERR_NOT_ENOUGH_MEMORY;
 	}
 
 	return WERR_OK;
diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index 997701d4d54..a8f76ac66b2 100644
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -1440,10 +1440,10 @@ WERROR reg_perfcount_get_hkpd(prs_struct *ps, uint32_t max_buf_size, uint32_t *o
 		*outbuf_len = buffer_size;
 
 		if (!_reg_perfcount_marshall_perf_data_block(ps, block, 0))
-			return WERR_NOMEM;
+			return WERR_NOT_ENOUGH_MEMORY;
 
 		if (!_reg_perfcount_marshall_perf_objects(ps, block, 0))
-			return WERR_NOMEM;
+			return WERR_NOT_ENOUGH_MEMORY;
 
 		return WERR_OK;
 	}
@@ -1451,7 +1451,7 @@ WERROR reg_perfcount_get_hkpd(prs_struct *ps, uint32_t max_buf_size, uint32_t *o
 	{
 		*outbuf_len = max_buf_size;
 		if (!_reg_perfcount_marshall_perf_data_block(ps, block, 0))
-			return WERR_NOMEM;
+			return WERR_NOT_ENOUGH_MEMORY;
 
 		return WERR_INSUFFICIENT_BUFFER;
 	}