diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/torture/unix/unix_info2.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/torture/unix/unix_info2.c')
| -rw-r--r-- | source4/torture/unix/unix_info2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index d0a2c3d041..30fe912234 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -201,9 +201,9 @@ static bool query_path_info2(void *mem_ctx, -1, fname, info2); } -static bool search_callback(void *private, const union smb_search_data *fdata) +static bool search_callback(void *private_data, const union smb_search_data *fdata) { - struct unix_info2 *info2 = (struct unix_info2 *)private; + struct unix_info2 *info2 = (struct unix_info2 *)private_data; info2->end_of_file = fdata->unix_info2.end_of_file; info2->num_bytes = fdata->unix_info2.num_bytes; |