git.samba.org
/
metze
/
samba
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Decouple clistr_pull from struct cli_state->inbuf
[metze/samba/wip.git]
/
source3
/
libsmb
/
clistr.c
diff --git
a/source3/libsmb/clistr.c
b/source3/libsmb/clistr.c
index 5d20d632aad002b4d15a7fdcd1d9788f27896787..86857814043338df630c326d6a3b2007bf067338 100644
(file)
--- 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,
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)
{
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,
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,
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,
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,
pp_dest,
src,
src_len,