From a46b63fd98399700183cddb773c85521987ff132 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 24 Nov 2009 11:43:56 +0100 Subject: s3:fix the merged build of bin/smbtorture4 Michael --- source3/torture/denytest.c | 2 +- source3/torture/mangle_test.c | 2 +- source3/torture/nbio.c | 2 +- source3/torture/proto.h | 81 +++++++++++++++++++++++++++++++++++++++++++ source3/torture/scanner.c | 2 +- source3/torture/torture.c | 2 +- source3/torture/torture.h | 81 ------------------------------------------- source3/torture/utable.c | 2 +- 8 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 source3/torture/proto.h delete mode 100644 source3/torture/torture.h (limited to 'source3/torture') diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c index bf491bc22e..4762bf7d0e 100644 --- a/source3/torture/denytest.c +++ b/source3/torture/denytest.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "torture.h" +#include "torture/proto.h" extern bool torture_showall; diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c index e5f69479a5..594caba604 100644 --- a/source3/torture/mangle_test.c +++ b/source3/torture/mangle_test.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "torture.h" +#include "torture/proto.h" extern int torture_numops; diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 5e7a458025..063df1693f 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "torture.h" +#include "torture/proto.h" #define MAX_FILES 1000 diff --git a/source3/torture/proto.h b/source3/torture/proto.h new file mode 100644 index 0000000000..353b98cff3 --- /dev/null +++ b/source3/torture/proto.h @@ -0,0 +1,81 @@ +/* + Unix SMB/CIFS implementation. + + SMB torture tester - header file + + Copyright (C) Andrew Tridgell 1997-1998 + Copyright (C) Jeremy Allison 2009 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __TORTURE_H__ +#define __TORTURE_H__ + +/* The following definitions come from torture/denytest.c */ + +bool torture_denytest1(int dummy); +bool torture_denytest2(int dummy); + +/* The following definitions come from torture/mangle_test.c */ + +bool torture_mangle(int dummy); + +/* The following definitions come from torture/nbio.c */ + +double nbio_total(void); +void nb_alarm(int ignore); +void nbio_shmem(int n); +void nb_setup(struct cli_state *cli); +void nb_unlink(const char *fname); +void nb_createx(const char *fname, + unsigned create_options, unsigned create_disposition, int handle); +void nb_writex(int handle, int offset, int size, int ret_size); +void nb_readx(int handle, int offset, int size, int ret_size); +void nb_close(int handle); +void nb_rmdir(const char *fname); +void nb_rename(const char *oldname, const char *newname); +void nb_qpathinfo(const char *fname); +void nb_qfileinfo(int fnum); +void nb_qfsinfo(int level); +void nb_findfirst(const char *mask); +void nb_flush(int fnum); +void nb_deltree(const char *dname); +void nb_cleanup(void); + +/* The following definitions come from torture/scanner.c */ + +bool torture_trans2_scan(int dummy); +bool torture_nttrans_scan(int dummy); + +/* The following definitions come from torture/torture.c */ + +void start_timer(void); +double end_timer(void); +void *shm_setup(int size); +bool smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx, + char **hostname, char **sharename); +void torture_open_connection_free_unclist(char **unc_list); +bool torture_open_connection(struct cli_state **c, int conn_index); +bool torture_cli_session_setup2(struct cli_state *cli, uint16 *new_vuid); +bool torture_close_connection(struct cli_state *c); +bool torture_ioctl_test(int dummy); +bool torture_chkpath_test(int dummy); + +/* The following definitions come from torture/utable.c */ + +bool torture_utable(int dummy); +bool torture_casetable(int dummy); + +#endif /* __TORTURE_H__ */ diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c index 4d9ee286e8..d7f4d2eabf 100644 --- a/source3/torture/scanner.c +++ b/source3/torture/scanner.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "torture.h" +#include "torture/proto.h" #define VERBOSE 0 #define OP_MIN 0 diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 19103dfbef..5407f3c20e 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -20,7 +20,7 @@ #include "includes.h" #include "nsswitch/libwbclient/wbc_async.h" -#include "torture.h" +#include "torture/proto.h" extern char *optarg; extern int optind; diff --git a/source3/torture/torture.h b/source3/torture/torture.h deleted file mode 100644 index 353b98cff3..0000000000 --- a/source3/torture/torture.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - SMB torture tester - header file - - Copyright (C) Andrew Tridgell 1997-1998 - Copyright (C) Jeremy Allison 2009 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef __TORTURE_H__ -#define __TORTURE_H__ - -/* The following definitions come from torture/denytest.c */ - -bool torture_denytest1(int dummy); -bool torture_denytest2(int dummy); - -/* The following definitions come from torture/mangle_test.c */ - -bool torture_mangle(int dummy); - -/* The following definitions come from torture/nbio.c */ - -double nbio_total(void); -void nb_alarm(int ignore); -void nbio_shmem(int n); -void nb_setup(struct cli_state *cli); -void nb_unlink(const char *fname); -void nb_createx(const char *fname, - unsigned create_options, unsigned create_disposition, int handle); -void nb_writex(int handle, int offset, int size, int ret_size); -void nb_readx(int handle, int offset, int size, int ret_size); -void nb_close(int handle); -void nb_rmdir(const char *fname); -void nb_rename(const char *oldname, const char *newname); -void nb_qpathinfo(const char *fname); -void nb_qfileinfo(int fnum); -void nb_qfsinfo(int level); -void nb_findfirst(const char *mask); -void nb_flush(int fnum); -void nb_deltree(const char *dname); -void nb_cleanup(void); - -/* The following definitions come from torture/scanner.c */ - -bool torture_trans2_scan(int dummy); -bool torture_nttrans_scan(int dummy); - -/* The following definitions come from torture/torture.c */ - -void start_timer(void); -double end_timer(void); -void *shm_setup(int size); -bool smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx, - char **hostname, char **sharename); -void torture_open_connection_free_unclist(char **unc_list); -bool torture_open_connection(struct cli_state **c, int conn_index); -bool torture_cli_session_setup2(struct cli_state *cli, uint16 *new_vuid); -bool torture_close_connection(struct cli_state *c); -bool torture_ioctl_test(int dummy); -bool torture_chkpath_test(int dummy); - -/* The following definitions come from torture/utable.c */ - -bool torture_utable(int dummy); -bool torture_casetable(int dummy); - -#endif /* __TORTURE_H__ */ diff --git a/source3/torture/utable.c b/source3/torture/utable.c index 247642b044..f5afeb7adc 100644 --- a/source3/torture/utable.c +++ b/source3/torture/utable.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "torture.h" +#include "torture/proto.h" bool torture_utable(int dummy) { -- cgit