diff options
author | Günther Deschner <gd@samba.org> | 2015-12-03 15:24:26 +0100 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2016-09-28 00:04:23 +0200 |
commit | de2f32d6307a7abb34c1dc5f0dfc32fede50059e (patch) | |
tree | 31c5307794fe8d311b97b7ab9d3ef799dc34a622 /source4/lib/registry | |
parent | d5f2a36fec2837e64217322d2d2ec8d44f169772 (diff) | |
download | samba-de2f32d6307a7abb34c1dc5f0dfc32fede50059e.tar.gz |
werror: replace WERR_INVALID_PARAM with WERR_INVALID_PARAMETER in source4/lib/registry/
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/lib/registry')
-rw-r--r-- | source4/lib/registry/interface.c | 24 | ||||
-rw-r--r-- | source4/lib/registry/ldb.c | 2 | ||||
-rw-r--r-- | source4/lib/registry/local.c | 12 | ||||
-rw-r--r-- | source4/lib/registry/tests/registry.c | 2 | ||||
-rw-r--r-- | source4/lib/registry/tools/regshell.c | 18 |
5 files changed, 29 insertions, 29 deletions
diff --git a/source4/lib/registry/interface.c b/source4/lib/registry/interface.c index e4c3ca513e2..38f4d9007d8 100644 --- a/source4/lib/registry/interface.c +++ b/source4/lib/registry/interface.c @@ -90,7 +90,7 @@ _PUBLIC_ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, if (parent == NULL) { DEBUG(0, ("Invalid parent key specified for open of '%s'\n", name)); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } if (parent->context->ops->open_key == NULL) { @@ -110,7 +110,7 @@ _PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, uint32_t *type, DATA_BLOB *data) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (key->context->ops->enum_value == NULL) return WERR_NOT_SUPPORTED; @@ -133,7 +133,7 @@ _PUBLIC_ WERROR reg_key_get_info(TALLOC_CTX *mem_ctx, uint32_t *max_valbufsize) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (key->context->ops->get_key_info == NULL) return WERR_NOT_SUPPORTED; @@ -155,7 +155,7 @@ _PUBLIC_ WERROR reg_key_get_subkey_by_index(TALLOC_CTX *mem_ctx, NTTIME *last_changed_time) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (key->context->ops->enum_key == NULL) return WERR_NOT_SUPPORTED; @@ -174,7 +174,7 @@ _PUBLIC_ WERROR reg_key_get_value_by_name(TALLOC_CTX *mem_ctx, DATA_BLOB *data) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (key->context->ops->get_value == NULL) return WERR_NOT_SUPPORTED; @@ -189,7 +189,7 @@ _PUBLIC_ WERROR reg_key_del(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name) { if (parent == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (parent->context->ops->delete_key == NULL) return WERR_NOT_SUPPORTED; @@ -207,7 +207,7 @@ _PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, struct registry_key **newkey) { if (parent == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (parent->context->ops->create_key == NULL) { DEBUG(1, ("Backend '%s' doesn't support method add_key\n", @@ -226,7 +226,7 @@ _PUBLIC_ WERROR reg_val_set(struct registry_key *key, const char *value, uint32_t type, const DATA_BLOB data) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; /* A 'real' set function has preference */ if (key->context->ops->set_value == NULL) { @@ -246,7 +246,7 @@ _PUBLIC_ WERROR reg_get_sec_desc(TALLOC_CTX *ctx, struct security_descriptor **secdesc) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; /* A 'real' set function has preference */ if (key->context->ops->get_sec_desc == NULL) @@ -262,7 +262,7 @@ _PUBLIC_ WERROR reg_del_value(TALLOC_CTX *mem_ctx, struct registry_key *key, const char *valname) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (key->context->ops->delete_value == NULL) return WERR_NOT_SUPPORTED; @@ -276,7 +276,7 @@ _PUBLIC_ WERROR reg_del_value(TALLOC_CTX *mem_ctx, struct registry_key *key, _PUBLIC_ WERROR reg_key_flush(struct registry_key *key) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (key->context->ops->flush_key == NULL) return WERR_NOT_SUPPORTED; @@ -288,7 +288,7 @@ _PUBLIC_ WERROR reg_set_sec_desc(struct registry_key *key, const struct security_descriptor *security) { if (key == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; if (key->context->ops->set_sec_desc == NULL) return WERR_NOT_SUPPORTED; diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c index 8e56ac13c93..8bb6fd5c10f 100644 --- a/source4/lib/registry/ldb.c +++ b/source4/lib/registry/ldb.c @@ -545,7 +545,7 @@ WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location, struct ldb_message *attrs_msg; if (location == NULL) - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; wrap = ldb_wrap_connect(parent_ctx, ev_ctx, lp_ctx, location, session_info, credentials, 0); diff --git a/source4/lib/registry/local.c b/source4/lib/registry/local.c index 82acd0bc1be..4b00953f7d2 100644 --- a/source4/lib/registry/local.c +++ b/source4/lib/registry/local.c @@ -81,7 +81,7 @@ static WERROR local_open_key(TALLOC_CTX *mem_ctx, int el; if (path == NULL || path[0] == '\0') { - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } orig = talloc_strdup(mem_ctx, path); @@ -185,7 +185,7 @@ static WERROR local_create_key(TALLOC_CTX *mem_ctx, int el; if (path == NULL || path[0] == '\0') { - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } orig = talloc_strdup(mem_ctx, path); @@ -249,7 +249,7 @@ static WERROR local_set_value(struct registry_key *key, const char *name, struct local_key *local = (struct local_key *)key; if (name == NULL) { - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } return hive_key_set_value(local->hive_key, name, type, data); @@ -262,7 +262,7 @@ static WERROR local_get_value(TALLOC_CTX *mem_ctx, const struct local_key *local = (const struct local_key *)key; if (name == NULL) { - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } return hive_get_value(mem_ctx, local->hive_key, name, type, data); @@ -286,7 +286,7 @@ static WERROR local_delete_key(TALLOC_CTX *mem_ctx, struct registry_key *key, const struct local_key *local = (const struct local_key *)key; if (name == NULL) { - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } return hive_key_del(mem_ctx, local->hive_key, name); @@ -298,7 +298,7 @@ static WERROR local_delete_value(TALLOC_CTX *mem_ctx, struct registry_key *key, const struct local_key *local = (const struct local_key *)key; if (name == NULL) { - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } return hive_key_del_value(mem_ctx, local->hive_key, name); diff --git a/source4/lib/registry/tests/registry.c b/source4/lib/registry/tests/registry.c index 227e65b5f25..4d94b5ace74 100644 --- a/source4/lib/registry/tests/registry.c +++ b/source4/lib/registry/tests/registry.c @@ -242,7 +242,7 @@ static bool test_flush_key(struct torture_context *tctx, void *_data) torture_assert_werr_ok(tctx, error, "flush key"); torture_assert_werr_equal(tctx, reg_key_flush(NULL), - WERR_INVALID_PARAM, "flush key"); + WERR_INVALID_PARAMETER, "flush key"); return true; } diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 6b61c92707b..cba0d3f878d 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -192,12 +192,12 @@ static WERROR cmd_set(struct regshell_context *ctx, int argc, const char **argv) if (argc < 4) { fprintf(stderr, "Usage: set value-name type value\n"); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } if (!reg_string_to_val(ctx, argv[2], argv[3], &val.data_type, &val.data)) { fprintf(stderr, "Unable to interpret data\n"); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } error = reg_val_set(ctx->current, argv[1], val.data_type, val.data); @@ -218,7 +218,7 @@ static WERROR cmd_ck(struct regshell_context *ctx, int argc, const char **argv) if(argc == 2) { if (!W_ERROR_IS_OK(get_full_path(ctx, argv[1], &full_path))) { fprintf(stderr, "Unable to parse the supplied path\n"); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } error = reg_open_key(ctx->registry, ctx->root, full_path, &nkey); @@ -246,7 +246,7 @@ static WERROR cmd_print(struct regshell_context *ctx, int argc, const char **arg if (argc != 2) { fprintf(stderr, "Usage: print <valuename>\n"); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } error = reg_key_get_value_by_name(ctx, ctx->current, argv[1], @@ -299,7 +299,7 @@ static WERROR cmd_mkkey(struct regshell_context *ctx, int argc, const char **arg if(argc < 2) { fprintf(stderr, "Usage: mkkey <keyname>\n"); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } error = reg_key_add_name(ctx, ctx->current, argv[1], 0, NULL, &tmp); @@ -320,7 +320,7 @@ static WERROR cmd_rmkey(struct regshell_context *ctx, if(argc < 2) { fprintf(stderr, "Usage: rmkey <name>\n"); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } error = reg_key_del(ctx, ctx->current, argv[1]); @@ -340,7 +340,7 @@ static WERROR cmd_rmval(struct regshell_context *ctx, int argc, const char **arg if(argc < 2) { fprintf(stderr, "Usage: rmval <valuename>\n"); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } error = reg_del_value(ctx, ctx->current, argv[1]); @@ -404,7 +404,7 @@ static WERROR process_cmd(struct regshell_context *ctx, if ((ret = poptParseArgvString(line, &argc, &argv)) != 0) { fprintf(stderr, "regshell: %s\n", poptStrerror(ret)); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } for(i = 0; regshell_cmds[i].name; i++) { @@ -416,7 +416,7 @@ static WERROR process_cmd(struct regshell_context *ctx, fprintf(stderr, "No such command '%s'\n", argv[0]); - return WERR_INVALID_PARAM; + return WERR_INVALID_PARAMETER; } #define MAX_COMPLETIONS 100 |