Author: metze Date: 2006-08-24 09:51:41 +0000 (Thu, 24 Aug 2006) New Revision: 17785
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17785 Log: fix compiler warnings metze Modified: branches/SAMBA_4_0/source/torture/locktest.c branches/SAMBA_4_0/source/torture/nbench/nbio.c branches/SAMBA_4_0/source/torture/raw/lock.c branches/SAMBA_4_0/source/torture/raw/qfileinfo.c Changeset: Modified: branches/SAMBA_4_0/source/torture/locktest.c =================================================================== --- branches/SAMBA_4_0/source/torture/locktest.c 2006-08-24 09:49:58 UTC (rev 17784) +++ branches/SAMBA_4_0/source/torture/locktest.c 2006-08-24 09:51:41 UTC (rev 17785) @@ -47,8 +47,6 @@ #define NFILES 2 #define LOCK_TIMEOUT 0 -#define NASTY_POSIX_LOCK_HACK 0 - static struct cli_credentials *servers[NSERVERS]; enum lock_op {OP_LOCK, OP_UNLOCK, OP_REOPEN}; Modified: branches/SAMBA_4_0/source/torture/nbench/nbio.c =================================================================== --- branches/SAMBA_4_0/source/torture/nbench/nbio.c 2006-08-24 09:49:58 UTC (rev 17784) +++ branches/SAMBA_4_0/source/torture/nbench/nbio.c 2006-08-24 09:51:41 UTC (rev 17785) @@ -1,5 +1,3 @@ -#define NBDEBUG 0 - /* Unix SMB/CIFS implementation. SMB torture tester @@ -30,8 +28,6 @@ #include "libcli/libcli.h" #include "torture/util.h" -#define MAX_FILES 100 - extern int nbench_line_count; static int nbio_id = -1; static int nprocs; Modified: branches/SAMBA_4_0/source/torture/raw/lock.c =================================================================== --- branches/SAMBA_4_0/source/torture/raw/lock.c 2006-08-24 09:49:58 UTC (rev 17784) +++ branches/SAMBA_4_0/source/torture/raw/lock.c 2006-08-24 09:51:41 UTC (rev 17785) @@ -37,14 +37,6 @@ goto done; \ }} while (0) -#define CHECK_VALUE(v, correct) do { \ - if ((v) != (correct)) { \ - printf("(%s) Incorrect value %s=%d - should be %d\n", \ - __location__, #v, v, correct); \ - ret = False; \ - goto done; \ - }} while (0) - #define BASEDIR "\\testlock" Modified: branches/SAMBA_4_0/source/torture/raw/qfileinfo.c =================================================================== --- branches/SAMBA_4_0/source/torture/raw/qfileinfo.c 2006-08-24 09:49:58 UTC (rev 17784) +++ branches/SAMBA_4_0/source/torture/raw/qfileinfo.c 2006-08-24 09:51:41 UTC (rev 17785) @@ -138,6 +138,7 @@ /* used to find hints on unknown values - and to make sure we zero-fill */ +#if 0 /* unused */ #define VAL_UNKNOWN(n1, v1) do {if (s1->n1.out.v1 != 0) { \ printf("%s/%s non-zero unknown - %u (0x%x) at %s(%d)\n", \ #n1, #v1, \ @@ -146,6 +147,7 @@ __FILE__, __LINE__); \ ret = False; \ }} while(0) +#endif /* basic testing of all RAW_FILEINFO_* calls for each call we test that it succeeds, and where possible test @@ -352,6 +354,7 @@ ret = False; \ }} while (0) +#if 0 /* unused */ #define TIME_CHECK_UNX(sname, stype, tfield) do { \ s1 = fnum_find(sname); \ if (s1 && unx_nt_time_cmp(s1->stype.out.tfield, correct_time) != 0) { \ @@ -367,6 +370,7 @@ nt_time_string(mem_ctx, correct_time)); \ ret = False; \ }} while (0) +#endif /* now check that all the times that are supposed to be equal are correct */ s1 = fnum_find("BASIC_INFO"); @@ -688,6 +692,7 @@ NAME_PATH_CHECK("ACCESS_INFORMATION", access_information, access_flags); #endif +#if 0 /* unused */ #define UNKNOWN_CHECK(sname, stype, tfield) do { \ s1 = fnum_find(sname); \ if (s1 && s1->stype.out.tfield != 0) { \ @@ -701,7 +706,7 @@ #stype, #tfield, \ (uint_t)s1->stype.out.tfield); \ }} while (0) - +#endif /* now get a bit fancier .... */ /* when we set the delete disposition then the link count should drop