sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:libsmb: remove unused clistr_push_fn()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2011-07-07 17:24:32 +02:00
parent 30574a73d8
commit 0f006751ec
3 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util/string_wrappers.h
View File

@ -73,11 +73,6 @@ size_t __unsafe_string_function_usage_here_size_t__(void);
? __unsafe_string_function_usage_here_size_t__() \ ? __unsafe_string_function_usage_here_size_t__() \
: push_string_check_fn(dest, src, dest_len, flags)) : push_string_check_fn(dest, src, dest_len, flags))
#define clistr_push(cli, dest, src, dest_len, flags) \
(CHECK_STRING_SIZE(dest, dest_len) \
? __unsafe_string_function_usage_here_size_t__() \
: clistr_push_fn(cli, dest, src, dest_len, flags))
#define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) \ #define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) \
(CHECK_STRING_SIZE(dest, dest_len) \ (CHECK_STRING_SIZE(dest, dest_len) \
? __unsafe_string_function_usage_here_size_t__() \ ? __unsafe_string_function_usage_here_size_t__() \
@ -97,7 +92,6 @@ size_t __unsafe_string_function_usage_here_size_t__(void);
#else #else
#define push_string_check push_string_check_fn #define push_string_check push_string_check_fn
#define clistr_push clistr_push_fn
#define srvstr_push srvstr_push_fn #define srvstr_push srvstr_push_fn
#define checked_strlcpy strlcpy #define checked_strlcpy strlcpy

26
source3/libsmb/clistr.c
View File

@ -21,32 +21,6 @@
#include "includes.h" #include "includes.h"
#include "libsmb/libsmb.h" #include "libsmb/libsmb.h"
size_t clistr_push_fn(struct cli_state *cli,
void *dest,
const char *src,
int dest_len,
int flags)
{
size_t buf_used = PTR_DIFF(dest, cli->outbuf);
if (dest_len == -1) {
if (((ptrdiff_t)dest < (ptrdiff_t)cli->outbuf) || (buf_used > cli->bufsize)) {
DEBUG(0, ("Pushing string of 'unlimited' length into non-SMB buffer!\n"));
return push_string_base(cli->outbuf,
(uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0),
dest, src, -1, flags);
}
return push_string_base(cli->outbuf,
(uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0),
dest, src, cli->bufsize - buf_used,
flags);
}
/* 'normal' push into size-specified buffer */
return push_string_base(cli->outbuf,
(uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0),
dest, src, dest_len, flags);
}
size_t clistr_pull_talloc(TALLOC_CTX *ctx, size_t clistr_pull_talloc(TALLOC_CTX *ctx,
const char *base, const char *base,
uint16_t flags2, uint16_t flags2,

5
source3/libsmb/proto.h
View File

@ -780,11 +780,6 @@ NTSTATUS cli_set_secdesc(struct cli_state *cli, uint16_t fnum,
/* The following definitions come from libsmb/clistr.c */ /* The following definitions come from libsmb/clistr.c */
size_t clistr_push_fn(struct cli_state *cli,
void *dest,
const char *src,
int dest_len,
int flags);
size_t clistr_pull_talloc(TALLOC_CTX *ctx, size_t clistr_pull_talloc(TALLOC_CTX *ctx,
const char *base, const char *base,
uint16_t flags2, uint16_t flags2,