diff options
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/charset_macosxfs.c | 14 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/source3/modules/charset_macosxfs.c b/source3/modules/charset_macosxfs.c index bbfd4be355..baf2a0071c 100644 --- a/source3/modules/charset_macosxfs.c +++ b/source3/modules/charset_macosxfs.c @@ -201,9 +201,9 @@ static void hexdump( const char * label, const char * s, size_t len ) * perfect fits. */ static size_t macosxfs_encoding_pull( - void *cd, /* Encoder handle */ - const char **inbuf, size_t *inbytesleft, /* Script string */ - char **outbuf, size_t *outbytesleft) /* UTF-16-LE string */ + void *cd, /* Encoder handle */ + char **inbuf, size_t *inbytesleft, /* Script string */ + char **outbuf, size_t *outbytesleft) /* UTF-16-LE string */ { static const int script_code = kCFStringEncodingUTF8; static CFMutableStringRef cfstring = NULL; @@ -323,9 +323,9 @@ static size_t macosxfs_encoding_pull( } static size_t macosxfs_encoding_push( - void *cd, /* Encoder handle */ - const char **inbuf, size_t *inbytesleft, /* UTF-16-LE string */ - char **outbuf, size_t *outbytesleft) /* Script string */ + void *cd, /* Encoder handle */ + char **inbuf, size_t *inbytesleft, /* UTF-16-LE string */ + char **outbuf, size_t *outbytesleft) /* Script string */ { static const int script_code = kCFStringEncodingUTF8; static CFMutableStringRef cfstring = NULL; @@ -373,7 +373,7 @@ static size_t macosxfs_encoding_push( charsconverted = CFStringGetBytes( cfstring, CFRangeMake(0,cfsize), script_code, 0, False, - (uint8_t *)(*outbuf), *outbytesleft, &outsize); + *outbuf, *outbytesleft, &outsize); if (0 == charsconverted) { debug_out("String conversion: " diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 76a03e9ffb..ca27cf0ac3 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -791,10 +791,6 @@ static BOOL vfswrap_lock(vfs_handle_struct *handle, files_struct *fsp, int fd, i BOOL result; START_PROFILE(syscall_fcntl_lock); - - /* SMB_VFS_GETLOCK should be used to query lock status. */ - SMB_ASSERT(op != SMB_F_GETLK); - result = fcntl_lock(fd, op, offset, count, type); END_PROFILE(syscall_fcntl_lock); return result; |