summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-24 09:53:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:42 -0500
commit5645acdb67ec077db4c0d4eae45cb7374e5b760f (patch)
treee0cd53b8a67ed69917ed739bd7210b9dd9058722
parent46cdf9250b7dcd3551ffe845ddaf03514ff9a204 (diff)
downloadsamba-5645acdb67ec077db4c0d4eae45cb7374e5b760f.tar.gz
samba-5645acdb67ec077db4c0d4eae45cb7374e5b760f.tar.bz2
samba-5645acdb67ec077db4c0d4eae45cb7374e5b760f.zip
r17786: remove unused macros, fix compiler warnings
metze (This used to be commit 7670e224d4be7035bb07fdaa0d156c5f109f20cc)
-rw-r--r--source4/torture/smb2/find.c9
-rw-r--r--source4/torture/smb2/setinfo.c12
2 files changed, 0 insertions, 21 deletions
diff --git a/source4/torture/smb2/find.c b/source4/torture/smb2/find.c
index 2edcdc427c..762d2493d6 100644
--- a/source4/torture/smb2/find.c
+++ b/source4/torture/smb2/find.c
@@ -53,15 +53,6 @@ static struct {
ret = False; \
}} while (0)
-#define CHECK_STRING(call_name, stype, field1, field2) do { \
- union smb_search_data *d = find_level("SMB2_FIND_" #call_name); \
- if (strcmp(io.all_info2.out.field2.s, d->stype.field1.s) != 0) { \
- printf("(%s) %s/%s should be '%s' - '%s'\n", __location__, \
- #call_name, #field2, \
- io.all_info2.out.field2.s, d->stype.field1.s); \
- ret = False; \
- }} while (0)
-
#define CHECK_CONST_STRING(call_name, stype, field, str) do { \
union smb_search_data *d = find_level("SMB2_FIND_" #call_name); \
if (strcmp(str, d->stype.field.s) != 0) { \
diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c
index 00b4fb47d0..08cce7693a 100644
--- a/source4/torture/smb2/setinfo.c
+++ b/source4/torture/smb2/setinfo.c
@@ -130,18 +130,6 @@ BOOL torture_smb2_setinfo(struct torture_context *torture)
goto done; \
}} while (0)
-#define CHECK_STR(call, stype, field, value) do { \
- CHECK1(call); \
- if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && strcmp(finfo2.stype.out.field, value) != 0) { \
- printf("(%s) %s - %s/%s should be '%s' - '%s'\n", __location__, \
- call_name, #stype, #field, \
- value, \
- finfo2.stype.out.field); \
- torture_smb2_all_info(tree, handle); \
- ret = False; \
- goto done; \
- }} while (0)
-
#define CHECK_STATUS(status, correct) do { \
if (!NT_STATUS_EQUAL(status, correct)) { \
printf("(%s) Incorrect status %s - should be %s\n", \