libsmb: Remove clistr_pull_talloc()

This was just a 1:1 wrapper around pull_string_talloc()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 2da8fd109cf7ba679ebe62350ee8c45e3fa5747f..85d061b04d48fe9a7d951626a26f1fb0d4b1b7a8 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -2901,13 +2901,13 @@ NTSTATUS cli_smb2_get_fs_volume_info(struct cli_state *cli,
                goto fail;
        }
 
-       clistr_pull_talloc(mem_ctx,
-                       (const char *)outbuf.data,
-                       0,
-                       &volume_name,
-                       outbuf.data + 18,
-                       nlen,
-                       STR_UNICODE);
+       pull_string_talloc(mem_ctx,
+                          (const char *)outbuf.data,
+                          0,
+                          &volume_name,
+                          outbuf.data + 18,
+                          nlen,
+                          STR_UNICODE);
        if (volume_name == NULL) {
                status = map_nt_error_from_unix(errno);
                goto fail;

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 9d0296873ea6629ce17833f6fff3874d464ac93f..1fb1f0127b966d07c02e3c5b4bfe65679c699755 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -412,13 +412,13 @@ static NTSTATUS smb_bytes_talloc_string(TALLOC_CTX *mem_ctx,
                                        size_t srclen,
                                        ssize_t *destlen)
 {
-       *destlen = clistr_pull_talloc(mem_ctx,
-                               (const char *)hdr,
-                               SVAL(hdr, HDR_FLG2),
-                               dest,
-                               (char *)src,
-                               srclen,
-                               STR_TERMINATE);
+       *destlen = pull_string_talloc(mem_ctx,
+                                     (const char *)hdr,
+                                     SVAL(hdr, HDR_FLG2),
+                                     dest,
+                                     (char *)src,
+                                     srclen,
+                                     STR_TERMINATE);
        if (*destlen == -1) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -2164,13 +2164,13 @@ static void cli_tcon_andx_done(struct tevent_req *subreq)
        inhdr = in + NBT_HDR_SIZE;
 
        if (num_bytes) {
-               if (clistr_pull_talloc(cli,
-                               (const char *)inhdr,
-                               SVAL(inhdr, HDR_FLG2),
-                               &cli->dev,
-                               bytes,
-                               num_bytes,
-                               STR_TERMINATE|STR_ASCII) == -1) {
+               if (pull_string_talloc(cli,
+                                      (const char *)inhdr,
+                                      SVAL(inhdr, HDR_FLG2),
+                                      &cli->dev,
+                                      bytes,
+                                      num_bytes,
+                                      STR_TERMINATE|STR_ASCII) == -1) {
                        tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
                        return;
                }

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index ba0912431470de94185051e8deca04a09180d617..4495a0278309608e2e592b7d3d3cdf8ecf91908c 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -801,7 +801,7 @@ NTSTATUS cli_dfs_get_referral_ex(TALLOC_CTX *ctx,
                                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                                goto out;
                        }
-                       clistr_pull_talloc(referrals,
+                       pull_string_talloc(referrals,
                                           (const char *)rdata,
                                           recv_flags2,
                                           &referrals[i].dfspath,

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index cd7194585aea62d934d86a3b88374a66f2d31f65..b39a7968c57ffc1b65cc7a781591e634b2c6bfe9 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -6180,8 +6180,12 @@ static void cli_notify_done(struct tevent_req *subreq)
                }
 
                state->changes[i].action = IVAL(params, ofs+4);
-               ret = clistr_pull_talloc(state->changes, (char *)params, flags2,
-                                        &name, params+ofs+12, len,
+               ret = pull_string_talloc(state->changes,
+                                        (char *)params,
+                                        flags2,
+                                        &name,
+                                        params+ofs+12,
+                                        len,
                                         STR_TERMINATE|STR_UNICODE);
                if (ret == -1) {
                        TALLOC_FREE(params);

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 1c140ebbd59035611c22c2b1210cfe2bc8e7c36b..bcfe406e07b2bc5225323d38e44153d92b997b9d 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -414,7 +414,7 @@ NTSTATUS cli_get_fs_volume_info(struct cli_state *cli,
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
 
-       clistr_pull_talloc(mem_ctx,
+       pull_string_talloc(mem_ctx,
                           (const char *)rdata,
                           recv_flags2,
                           &volume_name,

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index f9444bc401c89ff6093600b046c8ec900cf6c7e8..3ed9e8292c2f0a21d6af4b24de732e93a30f36a7 100644 (file)
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -177,13 +177,13 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
                           important to cope with the differences
                           between win2000 and win9x for this call
                           (tridge) */
-                       ret = clistr_pull_talloc(ctx,
-                                               base_ptr,
-                                               recv_flags2,
-                                               &finfo->name,
-                                               p,
-                                               len+2,
-                                               STR_TERMINATE);
+                       ret = pull_string_talloc(ctx,
+                                                base_ptr,
+                                                recv_flags2,
+                                                &finfo->name,
+                                                p,
+                                                len+2,
+                                                STR_TERMINATE);
                        if (ret == (size_t)-1) {
                                return pdata_end - base;
                        }
@@ -218,13 +218,13 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
                        if (p + len + 1 > pdata_end) {
                                return pdata_end - base;
                        }
-                       ret = clistr_pull_talloc(ctx,
-                                               base_ptr,
-                                               recv_flags2,
-                                               &finfo->name,
-                                               p,
-                                               len,
-                                               STR_NOALIGN);
+                       ret = pull_string_talloc(ctx,
+                                                base_ptr,
+                                                recv_flags2,
+                                                &finfo->name,
+                                                p,
+                                                len,
+                                                STR_NOALIGN);
                        if (ret == (size_t)-1) {
                                return pdata_end - base;
                        }
@@ -268,13 +268,13 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
                                return pdata_end - base;
                        }
                        p += 2;
-                       ret = clistr_pull_talloc(ctx,
-                                               base_ptr,
-                                               recv_flags2,
-                                               &finfo->short_name,
-                                               p,
-                                               slen,
-                                               STR_UNICODE);
+                       ret = pull_string_talloc(ctx,
+                                                base_ptr,
+                                                recv_flags2,
+                                                &finfo->short_name,
+                                                p,
+                                                slen,
+                                                STR_UNICODE);
                        if (ret == (size_t)-1) {
                                return pdata_end - base;
                        }
@@ -282,13 +282,13 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
                        if (p + namelen < p || p + namelen > pdata_end) {
                                return pdata_end - base;
                        }
-                       ret = clistr_pull_talloc(ctx,
-                                               base_ptr,
-                                               recv_flags2,
-                                               &finfo->name,
-                                               p,
-                                               namelen,
-                                               0);
+                       ret = pull_string_talloc(ctx,
+                                                base_ptr,
+                                                recv_flags2,
+                                                &finfo->name,
+                                                p,
+                                                namelen,
+                                                0);
                        if (ret == (size_t)-1) {
                                return pdata_end - base;
                        }
@@ -335,13 +335,13 @@ static bool interpret_short_filename(TALLOC_CTX *ctx,
        finfo->mtime_ts.tv_sec = finfo->atime_ts.tv_sec = finfo->ctime_ts.tv_sec;
        finfo->mtime_ts.tv_nsec = finfo->atime_ts.tv_nsec = 0;
        finfo->size = IVAL(p,26);
-       ret = clistr_pull_talloc(ctx,
-                       NULL,
-                       0,
-                       &finfo->name,
-                       p+30,
-                       12,
-                       STR_ASCII);
+       ret = pull_string_talloc(ctx,
+                                NULL,
+                                0,
+                                &finfo->name,
+                                p+30,
+                                12,
+                                STR_ASCII);
        if (ret == (size_t)-1) {
                return false;
        }

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index e1f9cea43887b0f6ab0ea24bf561d7e9e5c9fc57..a60ab1ac81a85d3d07f439b288ed7c88769aa21f 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -1279,7 +1279,7 @@ NTSTATUS cli_qfilename(struct cli_state *cli, uint16_t fnum,
                return NT_STATUS_INVALID_NETWORK_RESPONSE;
        }
 
-       clistr_pull_talloc(mem_ctx,
+       pull_string_talloc(mem_ctx,
                           (const char *)rdata,
                           recv_flags2,
                           &name,

diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 034366cd0029ec217410e601829e8068eb0309cb..1e5641a03f2989f414ec70c3cb0b0d859c7001bc 100644 (file)
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -21,23 +21,6 @@
 #include "includes.h"
 #include "libsmb/proto.h"
 
-size_t clistr_pull_talloc(TALLOC_CTX *ctx,
-                         const char *base,
-                         uint16_t flags2,
-                         char **pp_dest,
-                         const void *src,
-                         int src_len,
-                         int flags)
-{
-       return pull_string_talloc(ctx,
-                                 base,
-                                 flags2,
-                                 pp_dest,
-                                 src,
-                                 src_len,
-                                 flags);
-}
-
 bool clistr_is_previous_version_path(const char *path,
                const char **startp,
                const char **endp,

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 19c38153a68671a4965850ff4b192dc0e2b61916..9334825210d63ddb5677fcb283a9214e486ec009 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -965,13 +965,6 @@ NTSTATUS cli_query_mxac(struct cli_state *cli,
 
 /* The following definitions come from libsmb/clistr.c  */
 
-size_t clistr_pull_talloc(TALLOC_CTX *ctx,
-                         const char *base,
-                         uint16_t flags2,
-                         char **pp_dest,
-                         const void *src,
-                         int src_len,
-                         int flags);
 bool clistr_is_previous_version_path(const char *path,
                        const char **startp,
                        const char **endp,