r17786: remove unused macros, fix compiler warnings

metze

diff --git a/source/torture/smb2/find.c b/source/torture/smb2/find.c
index 2edcdc427c853f1b443180c2809749626b7ee7a9..762d2493d69b23a3038c5878746f2c5cbc5ec9bc 100644 (file)
--- a/source/torture/smb2/find.c
+++ b/source/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/source/torture/smb2/setinfo.c b/source/torture/smb2/setinfo.c
index 00b4fb47d03b833e3b8d311d82442001176faa85..08cce7693af30f14f49a667745605ff1e625554a 100644 (file)
--- a/source/torture/smb2/setinfo.c
+++ b/source/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", \