summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/include/smb.h8
-rw-r--r--source3/lib/account_pol.c6
-rw-r--r--source3/lib/charcnv.c4
-rw-r--r--source3/rpc_parse/parse_spoolss.c3
4 files changed, 7 insertions, 14 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 277ef3cc5b..62cc95ecb0 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -251,7 +251,7 @@ enum SID_NAME_USE
SID_NAME_DELETED, /* deleted account: needed for c2 rating */
SID_NAME_INVALID, /* invalid account */
SID_NAME_UNKNOWN, /* unknown sid type */
- SID_NAME_COMPUTER /* sid for a computer */
+ SID_NAME_COMPUTER, /* sid for a computer */
};
/**
@@ -625,7 +625,7 @@ enum pdb_elements {
PDB_NTPASSWD,
/* this must be the last element */
- PDB_COUNT
+ PDB_COUNT,
};
enum pdb_value_state {
@@ -992,8 +992,8 @@ struct bitmap {
#define TRANSACT2_FINDNOTIFYNEXT 0x0C
#define TRANSACT2_MKDIR 0x0D
#define TRANSACT2_SESSION_SETUP 0x0E
-#define TRANSACT2_GET_DFS_REFERRAL 0x10
-#define TRANSACT2_REPORT_DFS_INCONSISTANCY 0x11
+#define TRANSACT2_GET_DFS_REFERRAL 0x10
+#define TRANSACT2_REPORT_DFS_INCONSISTANCY 0x11
/* These are the NT transact sub commands. */
#define NT_TRANSACT_CREATE 1
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;
}
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 53f637db88..a5d2087a3a 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -5438,9 +5438,8 @@ BOOL make_spoolss_driver_info_3(TALLOC_CTX *mem_ctx,
done = True;
else
null_char = True;
-
break;
-
+
default:
null_char = False;
;;