summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/account_pol.c6
-rw-r--r--source3/lib/charcnv.c4
2 files changed, 2 insertions, 8 deletions
diff --git a/source3/lib/account_pol.c b/source3/lib/account_pol.c
index b43f582d7c..e8b382c7ab 100644
--- a/source3/lib/account_pol.c
+++ b/source3/lib/account_pol.c
@@ -118,8 +118,7 @@ BOOL account_policy_get(int field, uint32 *value)
{
fstring name;
- if (!init_account_policy())
- return False;
+ if(!init_account_policy())return False;
*value = 0;
@@ -143,8 +142,7 @@ BOOL account_policy_set(int field, uint32 value)
{
fstring name;
- if (!init_account_policy())
- return False;
+ if(!init_account_policy())return False;
fstrcpy(name, decode_account_policy_name(field));
if (!*name) {
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 5086f924db..7acb7147fd 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -420,8 +420,6 @@ size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t src_len,
if (dest_len)
dest[MIN(ret, dest_len-1)] = 0;
- else
- dest[0] = 0;
return src_len;
}
@@ -631,8 +629,6 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
ret = convert_string(CH_UCS2, CH_UNIX, src, src_len, dest, dest_len);
if (dest_len)
dest[MIN(ret, dest_len-1)] = 0;
- else
- dest[0] = 0;
return src_len;
}