diff options
| author | Richard Sharpe <sharpe@samba.org> | 2001-01-05 13:11:29 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2001-01-05 13:11:29 +0000 |
| commit | dca808cbc4b52e38701f814f7aac043ddd1ca1c1 (patch) | |
| tree | e46027ede552d316c37c0a615915bb8553002526 /source3/utils | |
| parent | e70b103fff25f5bf4244a6ba2aed9593c99f749d (diff) | |
| download | samba-dca808cbc4b52e38701f814f7aac043ddd1ca1c1.tar.gz samba-dca808cbc4b52e38701f814f7aac043ddd1ca1c1.tar.bz2 samba-dca808cbc4b52e38701f814f7aac043ddd1ca1c1.zip | |
Needed a callback arg on cli_list ...
(This used to be commit d45e667a74fc2fcbf69c4819d480269c03dbfae4)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/masktest.c | 8 | ||||
| -rw-r--r-- | source3/utils/torture.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/utils/masktest.c b/source3/utils/masktest.c index 3fc7431519..981a508f0a 100644 --- a/source3/utils/masktest.c +++ b/source3/utils/masktest.c @@ -157,7 +157,7 @@ struct cli_state *connect_one(char *share) static char *resultp; static file_info *finfo; -void listfn(file_info *f, const char *s) +void listfn(file_info *f, const char *s, void *state) { if (strcmp(f->name,".") == 0) { resultp[0] = '+'; @@ -172,7 +172,7 @@ void listfn(file_info *f, const char *s) static void get_short_name(struct cli_state *cli, char *name, fstring short_name) { - cli_list(cli, name, aHIDDEN | aDIR, listfn); + cli_list(cli, name, aHIDDEN | aDIR, listfn, NULL); if (finfo) { fstrcpy(short_name, finfo->short_name); strlower(short_name); @@ -202,12 +202,12 @@ static void testpair(struct cli_state *cli, char *mask, char *file) fstrcpy(short_name, ""); finfo = NULL; if (old_list) { - cli_list_old(cli, mask, aHIDDEN | aDIR, listfn); + cli_list_old(cli, mask, aHIDDEN | aDIR, listfn, NULL); } else { get_short_name(cli, file, short_name); finfo = NULL; fstrcpy(res1, "---"); - cli_list(cli, mask, aHIDDEN | aDIR, listfn); + cli_list(cli, mask, aHIDDEN | aDIR, listfn, NULL); } res2 = reg_test(mask, file, short_name); diff --git a/source3/utils/torture.c b/source3/utils/torture.c index fc917702d3..40b4b123e9 100644 --- a/source3/utils/torture.c +++ b/source3/utils/torture.c @@ -2112,7 +2112,7 @@ static void run_opentest(int dummy) printf("finished open test 1\n"); } -static void list_fn(file_info *finfo, const char *name) +static void list_fn(file_info *finfo, const char *name, void *state) { } @@ -2149,9 +2149,9 @@ static void run_dirtest(int dummy) t1 = end_timer(); - printf("Matched %d\n", cli_list(&cli, "a*.*", 0, list_fn)); - printf("Matched %d\n", cli_list(&cli, "b*.*", 0, list_fn)); - printf("Matched %d\n", cli_list(&cli, "xyzabc", 0, list_fn)); + printf("Matched %d\n", cli_list(&cli, "a*.*", 0, list_fn, NULL)); + printf("Matched %d\n", cli_list(&cli, "b*.*", 0, list_fn, NULL)); + printf("Matched %d\n", cli_list(&cli, "xyzabc", 0, list_fn, NULL)); printf("dirtest core %g seconds\n", end_timer() - t1); |