diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-26 18:14:41 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-26 18:14:41 +0100 |
| commit | cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9 (patch) | |
| tree | 62f598c7a01e072cc52d166364bc3d2a94e85242 /source3/libsmb/clistr.c | |
| parent | d30b6af9532c0ea4e9610b30d13e7a4d9b763834 (diff) | |
| parent | d8f15e4efc00b9d509ff5761e9ca8ff5c6f443f7 (diff) | |
| download | samba-cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9.tar.gz samba-cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9.tar.bz2 samba-cce04c606e7a91fcaf75c8efd7ca0cd4aa15ece9.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/libsmb/clistr.c')
| -rw-r--r-- | source3/libsmb/clistr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c index 5d20d632aa..8685781404 100644 --- a/source3/libsmb/clistr.c +++ b/source3/libsmb/clistr.c @@ -51,22 +51,22 @@ size_t clistr_push_fn(const char *function, size_t clistr_pull_fn(const char *function, unsigned int line, - struct cli_state *cli, + const char *inbuf, char *dest, const void *src, int dest_len, int src_len, int flags) { - return pull_string_fn(function, line, cli->inbuf, - SVAL(cli->inbuf, smb_flg2), dest, src, dest_len, + return pull_string_fn(function, line, inbuf, + SVAL(inbuf, smb_flg2), dest, src, dest_len, src_len, flags); } size_t clistr_pull_talloc_fn(const char *function, unsigned int line, TALLOC_CTX *ctx, - struct cli_state *cli, + const char *inbuf, char **pp_dest, const void *src, int src_len, @@ -75,8 +75,8 @@ size_t clistr_pull_talloc_fn(const char *function, return pull_string_talloc_fn(function, line, ctx, - cli->inbuf, - SVAL(cli->inbuf, smb_flg2), + inbuf, + SVAL(inbuf, smb_flg2), pp_dest, src, src_len, |