s3: Remove a pointless wrapper function

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2ab1cfdf45561a9ef492674f8135cb766c331d63..32340b3d661d5caab23d27f93de804ecc7ef4bb8 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2653,7 +2653,6 @@ size_t clistr_pull_talloc_fn(const char *function,
                                int src_len,
                                int flags);
 size_t clistr_align_out(struct cli_state *cli, const void *p, int flags);
-size_t clistr_align_in(struct cli_state *cli, const void *p, int flags);
 
 /* The following definitions come from libsmb/clitrans.c  */
 

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index d0583f4e104a550b33f46ac31e5472c12b679828..e3f050a822eb4cda6af5fa367a223fba612f2fb4 100644 (file)
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -82,7 +82,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
                        finfo->mode = CVAL(p,24);
                        len = CVAL(p, 26);
                        p += 27;
-                       p += clistr_align_in(cli, p, 0);
+                       p += align_string(cli->inbuf, p, 0);
 
                        /* We can safely use len here (which is required by OS/2)
                         * and the NAS-BASIC server instead of +2 or +1 as the

diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 00b9bb2483aa1fabdbd1657e3cb10d259fa01d31..aeb0bc64c8878601011628a8e7434f7760570461 100644 (file)
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -90,8 +90,3 @@ size_t clistr_align_out(struct cli_state *cli, const void *p, int flags)
 {
        return align_string(cli->outbuf, (const char *)p, flags);
 }
-
-size_t clistr_align_in(struct cli_state *cli, const void *p, int flags)
-{
-       return align_string(cli->inbuf, (const char *)p, flags);
-}