diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-05 14:02:56 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-05 14:53:54 +0200 |
| commit | 869a19f06c0ef7b106dfbbc3db1ed1091a1a4259 (patch) | |
| tree | 3bcf7e5b895573519d4df146cfefea797c06d007 | |
| parent | 61fb8a4fd1a8b30fffdf941a9ff843825bf966e3 (diff) | |
| download | samba-869a19f06c0ef7b106dfbbc3db1ed1091a1a4259.tar.gz samba-869a19f06c0ef7b106dfbbc3db1ed1091a1a4259.tar.bz2 samba-869a19f06c0ef7b106dfbbc3db1ed1091a1a4259.zip | |
s3: Remove a pointless wrapper function
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/libsmb/clilist.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clistr.c | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 2ab1cfdf45..32340b3d66 100644 --- 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 d0583f4e10..e3f050a822 100644 --- 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 00b9bb2483..aeb0bc64c8 100644 --- 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); -} |