diff options
| -rw-r--r-- | lib/util/string_wrappers.h | 6 | ||||
| -rw-r--r-- | source3/libsmb/clistr.c | 12 | ||||
| -rw-r--r-- | source3/libsmb/proto.h | 6 |
3 files changed, 0 insertions, 24 deletions
diff --git a/lib/util/string_wrappers.h b/lib/util/string_wrappers.h index 6f2d6e9122..31dc9140eb 100644 --- a/lib/util/string_wrappers.h +++ b/lib/util/string_wrappers.h @@ -78,11 +78,6 @@ size_t __unsafe_string_function_usage_here_size_t__(void); ? __unsafe_string_function_usage_here_size_t__() \ : clistr_push_fn(cli, dest, src, dest_len, flags)) -#define clistr_pull(inbuf, dest, src, dest_len, srclen, flags) \ - (CHECK_STRING_SIZE(dest, dest_len) \ - ? __unsafe_string_function_usage_here_size_t__() \ - : clistr_pull_fn(inbuf, dest, src, dest_len, srclen, flags)) - #define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) \ (CHECK_STRING_SIZE(dest, dest_len) \ ? __unsafe_string_function_usage_here_size_t__() \ @@ -103,7 +98,6 @@ size_t __unsafe_string_function_usage_here_size_t__(void); #define push_string_check push_string_check_fn #define clistr_push clistr_push_fn -#define clistr_pull clistr_pull_fn #define srvstr_push srvstr_push_fn #define checked_strlcpy strlcpy diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c index ff18ef6bcf..e66b546eab 100644 --- a/source3/libsmb/clistr.c +++ b/source3/libsmb/clistr.c @@ -47,18 +47,6 @@ size_t clistr_push_fn(struct cli_state *cli, dest, src, dest_len, flags); } -size_t clistr_pull_fn(const char *inbuf, - char *dest, - const void *src, - int dest_len, - int src_len, - int flags) -{ - return pull_string_fn(inbuf, - SVAL(inbuf, smb_flg2), dest, src, dest_len, - src_len, flags); -} - size_t clistr_pull_talloc(TALLOC_CTX *ctx, const char *base, uint16_t flags2, diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index ac0e031a62..f364621938 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -785,12 +785,6 @@ size_t clistr_push_fn(struct cli_state *cli, const char *src, int dest_len, int flags); -size_t clistr_pull_fn(const char *inbuf, - char *dest, - const void *src, - int dest_len, - int src_len, - int flags); size_t clistr_pull_talloc(TALLOC_CTX *ctx, const char *base, uint16_t flags2, |