Changed the creation of rounding.h to use a set of compile-time checks

[rsync/rsync.git] / mkrounding.c

diff --git a/mkrounding.c b/mkrounding.c
index d978d4b..9ad24f9 100644 (file)
--- a/mkrounding.c
+++ b/mkrounding.c
@@ -19,48 +19,20 @@
 
 #include "rsync.h"
 
-struct test1 {
-    union file_extras extras1[1];
-    struct {
-#      include "mkrounding.h"
-    } file;
-};
-
-struct test2 {
-    union file_extras extras2[2];
-    struct {
-#      include "mkrounding.h"
-    } file;
-};
+#define ARRAY_LEN (EXTRA_ROUNDING+1)
+#define SIZEOF(x) ((long int)sizeof (x))
 
-struct test4 {
-    union file_extras extras4[4];
-    struct {
-#      include "mkrounding.h"
-    } file;
+struct test {
+    union file_extras extras[ARRAY_LEN];
+    struct file_struct file;
 };
 
-#define SIZE_TEST(n) (sizeof (struct test ## n) == EXTRA_LEN * n + sizeof (struct file_struct))
+#define ACTUAL_SIZE    SIZEOF(struct test)
+#define EXPECTED_SIZE  (SIZEOF(union file_extras) * ARRAY_LEN + SIZEOF(struct file_struct))
 
  int main(UNUSED(int argc), UNUSED(char *argv[]))
 {
-    int cnt;
-    if (SIZE_TEST(1))
-       cnt = 0;
-    else if (SIZE_TEST(2))
-       cnt = 1;
-    else if (SIZE_TEST(4))
-       cnt = 3;
-    else {
-       fprintf(stderr, "Unable to determine required file_extras rounding!\n");
-       cnt = 3;
-    }
-    if (cnt)
-       fprintf(stderr, "Rounding file_extras in multiples of %d", cnt + 1);
-    else
-       fprintf(stderr, "No rounding needed for file_extras");
-    fprintf(stderr, " (EXTRA_LEN=%d, FILE_STRUCT_LEN=%d)\n",
-           (int)EXTRA_LEN, (int)FILE_STRUCT_LEN);
-    printf("#define EXTRA_ROUNDING %d\n", cnt);
+    static int test_array[1 - 2 * (ACTUAL_SIZE != EXPECTED_SIZE)];
+    test_array[0] = 0;
     return 0;
 }