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/raw/search.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/raw/search.c')
| -rw-r--r-- | source4/torture/raw/search.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index 2a6aef20b5..8a3168dcc4 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -31,9 +31,9 @@ /* callback function for single_search */ -static bool single_search_callback(void *private, const union smb_search_data *file) +static bool single_search_callback(void *private_data, const union smb_search_data *file) { - union smb_search_data *data = (union smb_search_data *)private; + union smb_search_data *data = (union smb_search_data *)private_data; *data = *file; @@ -510,9 +510,9 @@ struct multiple_result { /* callback function for multiple_search */ -static bool multiple_search_callback(void *private, const union smb_search_data *file) +static bool multiple_search_callback(void *private_data, const union smb_search_data *file) { - struct multiple_result *data = (struct multiple_result *)private; + struct multiple_result *data = (struct multiple_result *)private_data; data->count++; |