src/daemon/common_test.c: Avoid nesting composite literals.

This crashed GCC 4.6 on Precise.

diff --git a/src/daemon/common_test.c b/src/daemon/common_test.c
index 44e198d..6143595 100644 (file)
--- a/src/daemon/common_test.c
+++ b/src/daemon/common_test.c
@@ -368,15 +368,19 @@ DEF_TEST(value_to_rate)
   };
 
   for (size_t i = 0; i < STATIC_ARRAY_SIZE (cases); i++) {
-    value_to_rate_state_t state = { cases[i].v0, TIME_T_TO_CDTIME_T (cases[i].t0) };
+    cdtime_t t0 = TIME_T_TO_CDTIME_T (cases[i].t0);
+    value_to_rate_state_t state = {
+      .last_value = cases[i].v0,
+      .last_time = t0,
+    };
     gauge_t got;
 
     if (cases[i].t0 == 0) {
-      OK(value_to_rate (&got, cases[i].v1, cases[i].ds_type, TIME_T_TO_CDTIME_T(cases[i].t1), &state) == EAGAIN);
+      EXPECT_EQ_INT(EAGAIN, value_to_rate (&got, cases[i].v1, cases[i].ds_type, TIME_T_TO_CDTIME_T(cases[i].t1), &state));
       continue;
     }
 
-    OK(value_to_rate (&got, cases[i].v1, cases[i].ds_type, TIME_T_TO_CDTIME_T(cases[i].t1), &state) == 0);
+    EXPECT_EQ_INT(0, value_to_rate (&got, cases[i].v1, cases[i].ds_type, TIME_T_TO_CDTIME_T(cases[i].t1), &state));
     EXPECT_EQ_DOUBLE(cases[i].want, got);
   }