diff options
| author | Volker Lendecke <vl@samba.org> | 2010-07-27 10:59:55 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-07-27 21:05:35 +0200 |
| commit | dace013898a450b50606740704c83ba25855e332 (patch) | |
| tree | 8597b10dc0c83a9a81e5853b62041764c443a374 /source3/libsmb | |
| parent | 9168713774c02ba2f71d89379cc239a900ebeafe (diff) | |
| download | samba-dace013898a450b50606740704c83ba25855e332.tar.gz samba-dace013898a450b50606740704c83ba25855e332.tar.bz2 samba-dace013898a450b50606740704c83ba25855e332.zip | |
s3: Remove a typedef (struct file_info)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clilist.c | 17 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_dir.c | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 93f67c7e63..3af1b0dcc0 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -48,7 +48,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx, int level, const char *p, const char *pdata_end, - file_info *finfo, + struct file_info *finfo, uint32 *p_resume_key, DATA_BLOB *p_last_name_raw) { @@ -221,7 +221,8 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx, ****************************************************************************/ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, - void (*fn)(const char *, file_info *, const char *, void *), void *state) + void (*fn)(const char *, struct file_info *, const char *, + void *), void *state) { #if 1 int max_matches = 1366; /* Match W2k - was 512. */ @@ -231,7 +232,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, int info_level; char *p, *p2, *rdata_end; char *mask = NULL; - file_info finfo; + struct file_info finfo; int i; char *dirlist = NULL; int dirlist_len = 0; @@ -502,7 +503,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, static bool interpret_short_filename(TALLOC_CTX *ctx, struct cli_state *cli, char *p, - file_info *finfo) + struct file_info *finfo) { size_t ret; ZERO_STRUCTP(finfo); @@ -541,7 +542,8 @@ static bool interpret_short_filename(TALLOC_CTX *ctx, ****************************************************************************/ int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, - void (*fn)(const char *, file_info *, const char *, void *), void *state) + void (*fn)(const char *, struct file_info *, const char *, + void *), void *state) { char *p; int received = 0; @@ -658,7 +660,7 @@ int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, frame = talloc_stackframe(); for (p=dirlist,i=0;i<num_received;i++) { - file_info finfo; + struct file_info finfo; if (!interpret_short_filename(frame, cli, p, &finfo)) { break; } @@ -678,7 +680,8 @@ int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute, ****************************************************************************/ int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, - void (*fn)(const char *, file_info *, const char *, void *), void *state) + void (*fn)(const char *, struct file_info *, const char *, + void *), void *state) { if (cli->protocol <= PROTOCOL_LANMAN1) return cli_list_old(cli, Mask, attribute, fn, state); diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index de637a80e8..1a1ca68a8a 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -235,7 +235,7 @@ list_fn(const char *name, static void dir_list_fn(const char *mnt, - file_info *finfo, + struct file_info *finfo, const char *mask, void *state) { @@ -1204,7 +1204,7 @@ SMBC_mkdir_ctx(SMBCCTX *context, static void rmdir_list_fn(const char *mnt, - file_info *finfo, + struct file_info *finfo, const char *mask, void *state) { |