diff options
| author | James Peach <jpeach@samba.org> | 2005-08-30 06:41:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:03:26 -0500 |
| commit | 8c072021efba737539b46e993df0c21a6438a82a (patch) | |
| tree | 444cbd7b0072955e7bde133aa95cec047cb89247 /source3/lib/util_unistr.c | |
| parent | 39c05dca3c52a74924a2baccab68e289cf48ce35 (diff) | |
| download | samba-8c072021efba737539b46e993df0c21a6438a82a.tar.gz samba-8c072021efba737539b46e993df0c21a6438a82a.tar.bz2 samba-8c072021efba737539b46e993df0c21a6438a82a.zip | |
r9780: Clean up a bunch of compiler warnings.
(This used to be commit 623d2e69319ffead31a780a4d6156dae45f386d7)
Diffstat (limited to 'source3/lib/util_unistr.c')
| -rw-r--r-- | source3/lib/util_unistr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index 8ed8c5c37f..d80bb2ce52 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -213,8 +213,9 @@ void init_valid_table(void) size_t dos_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate) { - return push_ucs2(NULL, dst, src, len, - STR_UNICODE|STR_NOALIGN | (null_terminate?STR_TERMINATE:0)); + int flags = null_terminate ? STR_UNICODE|STR_NOALIGN|STR_TERMINATE + : STR_UNICODE|STR_NOALIGN; + return push_ucs2(NULL, dst, src, len, flags); } |