svn commit: samba r23749 - in branches: SAMBA_3_0/source/utils
SAMBA_3_0_26/source/utils
obnox at samba.org
obnox at samba.org
Sat Jul 7 22:33:45 GMT 2007
Author: obnox
Date: 2007-07-07 22:33:45 +0000 (Sat, 07 Jul 2007)
New Revision: 23749
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23749
Log:
Simplify prototype of reg_setvalue_internal:
eliminate "type" parameter since we store only REG_SZ.
Michael
Modified:
branches/SAMBA_3_0/source/utils/net_conf.c
branches/SAMBA_3_0_26/source/utils/net_conf.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_conf.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_conf.c 2007-07-07 22:29:34 UTC (rev 23748)
+++ branches/SAMBA_3_0/source/utils/net_conf.c 2007-07-07 22:33:45 UTC (rev 23749)
@@ -147,7 +147,6 @@
*/
static WERROR reg_setvalue_internal(struct registry_key *key,
const char *valname,
- const char *valtype,
const char *valstr)
{
struct registry_value val;
@@ -155,21 +154,9 @@
ZERO_STRUCT(val);
- if (strequal(valtype, "dword")) {
- val.type = REG_DWORD;
- val.v.dword = strtoul(valstr, NULL, 10);
- }
- else if (strequal(valtype, "sz")) {
- val.type = REG_SZ;
- val.v.sz.str = CONST_DISCARD(char *, valstr);
- val.v.sz.len = strlen(valstr) + 1;
- }
- else {
- d_fprintf(stderr, "Only value types DWORD and SZ are"
- "currently implemented for setting values.\n");
- werr = WERR_INVALID_PARAM;
- goto done;
- }
+ val.type = REG_SZ;
+ val.v.sz.str = CONST_DISCARD(char *, valstr);
+ val.v.sz.len = strlen(valstr) + 1;
if (!lp_parameter_is_valid(valname)) {
d_fprintf(stderr, "Invalid parameter '%s' given.\n", valname);
@@ -577,7 +564,7 @@
}
else {
werr = reg_setvalue_internal(key, parm->label,
- "sz", valstr);
+ valstr);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -979,21 +966,21 @@
/* add config params as values */
- werr = reg_setvalue_internal(newkey, "path", "sz", path);
+ werr = reg_setvalue_internal(newkey, "path", path);
if (!W_ERROR_IS_OK(werr))
goto done;
if (comment != NULL) {
- werr = reg_setvalue_internal(newkey, "comment", "sz", comment);
+ werr = reg_setvalue_internal(newkey, "comment", comment);
if (!W_ERROR_IS_OK(werr))
goto done;
}
- werr = reg_setvalue_internal(newkey, "guest ok", "sz", guest_ok);
+ werr = reg_setvalue_internal(newkey, "guest ok", guest_ok);
if (!W_ERROR_IS_OK(werr))
goto done;
- werr = reg_setvalue_internal(newkey, "writeable", "sz", writeable);
+ werr = reg_setvalue_internal(newkey, "writeable", writeable);
if (!W_ERROR_IS_OK(werr))
goto done;
@@ -1053,7 +1040,7 @@
goto done;
}
- werr = reg_setvalue_internal(key, param, "sz", value_str);
+ werr = reg_setvalue_internal(key, param, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, "Error setting value '%s': %s\n",
param, dos_errstr(werr));
Modified: branches/SAMBA_3_0_26/source/utils/net_conf.c
===================================================================
--- branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-07-07 22:29:34 UTC (rev 23748)
+++ branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-07-07 22:33:45 UTC (rev 23749)
@@ -147,7 +147,6 @@
*/
static WERROR reg_setvalue_internal(struct registry_key *key,
const char *valname,
- const char *valtype,
const char *valstr)
{
struct registry_value val;
@@ -155,21 +154,9 @@
ZERO_STRUCT(val);
- if (strequal(valtype, "dword")) {
- val.type = REG_DWORD;
- val.v.dword = strtoul(valstr, NULL, 10);
- }
- else if (strequal(valtype, "sz")) {
- val.type = REG_SZ;
- val.v.sz.str = CONST_DISCARD(char *, valstr);
- val.v.sz.len = strlen(valstr) + 1;
- }
- else {
- d_fprintf(stderr, "Only value types DWORD and SZ are"
- "currently implemented for setting values.\n");
- werr = WERR_INVALID_PARAM;
- goto done;
- }
+ val.type = REG_SZ;
+ val.v.sz.str = CONST_DISCARD(char *, valstr);
+ val.v.sz.len = strlen(valstr) + 1;
if (!lp_parameter_is_valid(valname)) {
d_fprintf(stderr, "Invalid parameter '%s' given.\n", valname);
@@ -577,7 +564,7 @@
}
else {
werr = reg_setvalue_internal(key, parm->label,
- "sz", valstr);
+ valstr);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -979,21 +966,21 @@
/* add config params as values */
- werr = reg_setvalue_internal(newkey, "path", "sz", path);
+ werr = reg_setvalue_internal(newkey, "path", path);
if (!W_ERROR_IS_OK(werr))
goto done;
if (comment != NULL) {
- werr = reg_setvalue_internal(newkey, "comment", "sz", comment);
+ werr = reg_setvalue_internal(newkey, "comment", comment);
if (!W_ERROR_IS_OK(werr))
goto done;
}
- werr = reg_setvalue_internal(newkey, "guest ok", "sz", guest_ok);
+ werr = reg_setvalue_internal(newkey, "guest ok", guest_ok);
if (!W_ERROR_IS_OK(werr))
goto done;
- werr = reg_setvalue_internal(newkey, "writeable", "sz", writeable);
+ werr = reg_setvalue_internal(newkey, "writeable", writeable);
if (!W_ERROR_IS_OK(werr))
goto done;
@@ -1053,7 +1040,7 @@
goto done;
}
- werr = reg_setvalue_internal(key, param, "sz", value_str);
+ werr = reg_setvalue_internal(key, param, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, "Error setting value '%s': %s\n",
param, dos_errstr(werr));
More information about the samba-cvs
mailing list