summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-30 13:10:18 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-30 10:38:25 +0200
commitbcd68837ee308aa4610a4c85783a4b64a349d4f9 (patch)
tree7a904125178ff906b793a05894adf9f9f4308ea3 /source4
parent944929bb69e2a4ef15f6fb7b4e5c37ab90fe93da (diff)
downloadsamba-bcd68837ee308aa4610a4c85783a4b64a349d4f9.tar.gz
samba-bcd68837ee308aa4610a4c85783a4b64a349d4f9.tar.bz2
samba-bcd68837ee308aa4610a4c85783a4b64a349d4f9.zip
lib/util Rename conv_str_size() -> conv_str_size_error()
Diffstat (limited to 'source4')
-rw-r--r--source4/client/cifsdd.c2
-rw-r--r--source4/param/loadparm.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index adf2d72af2..3ce7277614 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -152,7 +152,7 @@ int set_arg_argv(const char * argv)
}
break;
case ARG_SIZE:
- if (!conv_str_size(val, &arg->arg_val.nval)) {
+ if (!conv_str_size_error(val, &arg->arg_val.nval)) {
goto fail;
}
break;
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c8c0b193bc..0f60e4364b 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -949,7 +949,7 @@ int lpcfg_parm_bytes(struct loadparm_context *lp_ctx,
const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
- if (value && conv_str_size(value, &bval)) {
+ if (value && conv_str_size_error(value, &bval)) {
if (bval <= INT_MAX) {
return (int)bval;
}
@@ -1662,7 +1662,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
case P_BYTES:
{
uint64_t val;
- if (conv_str_size(pszParmValue, &val)) {
+ if (conv_str_size_error(pszParmValue, &val)) {
if (val <= INT_MAX) {
*(int *)parm_ptr = (int)val;
break;