Merge lp:~stefan.goetz-deactivatedaccount/hipl/unittests into lp:hipl

[Stefan Götz]

Bug fix for compiler error at -O0

[lp:~stefan.goetz-deactivatedaccount/hipl/unittests]

5011. By Stefan Götz on 2010-10-24

Pulled lp:hipl trunk to avoid conflicts against trunk.

5012. By Stefan Götz on 2010-10-24

Removed unnecessary cast and dereference from unit test.

[Stefan Götz (stefan.goetz-deactivatedaccount)]

On 10/24/2010 07:30 PM, René Hummen wrote:
>> // write the HIT string into the middle of the buffer
>> - fail_unless(hip_convert_hit_to_str(&hit, suffix, buf + BEFORE_LEN) == 0, NULL);
>> + fail_unless(hip_convert_hit_to_str(&hit, suffix, (char *)&buf.hit) == 0, NULL);
>
> buf.hit is already a pointer to the char[]. There's no need to cast and to use it's address.

Fixed.

=== modified file 'test/lib/core/hit.c'
--- test/lib/core/hit.c	2010-10-19 12:01:36 +0000
+++ test/lib/core/hit.c	2010-10-24 21:02:04 +0000
@@ -70,26 +70,31 @@
     const unsigned int HIT_LEN = 39; // 16 bytes -> 32 hex chars + 7 ':'s
     const unsigned int SUFFIX_LEN = sizeof(suffix); // includes null char
     const unsigned int AFTER_LEN = 30;
-    char buf[BEFORE_LEN + HIT_LEN + SUFFIX_LEN + AFTER_LEN];
-    char ones[BEFORE_LEN + HIT_LEN + SUFFIX_LEN + AFTER_LEN];
+    struct {
+        char before[BEFORE_LEN];
+        char hit[HIT_LEN];
+        char suffix[SUFFIX_LEN];
+        char after[AFTER_LEN];
+    } buf;
+    char ones[sizeof(buf)];
     hip_hit_t hit;
 
-    memset(buf, '1', sizeof(buf));
-    memset(ones, '1', sizeof(ones));
+    memset(&buf, 1, sizeof(buf));
+    memset(ones, 1, sizeof(ones));
     memset(&hit.s6_addr, 0x22, sizeof(hit.s6_addr));
 
     // write the HIT string into the middle of the buffer
-    fail_unless(hip_convert_hit_to_str(&hit, suffix, buf + BEFORE_LEN) == 0, NULL);
+    fail_unless(hip_convert_hit_to_str(&hit, suffix, buf.hit) == 0, NULL);
     // is the buffer before the HIT untouched?
-    fail_unless(memcmp(buf, ones, BEFORE_LEN) == 0, NULL);
+    fail_unless(memcmp(&buf.before, ones, BEFORE_LEN) == 0, NULL);
     // is the first part of the HIT correct?
-    fail_unless(*(buf + BEFORE_LEN) == '2', NULL);
+    fail_unless(buf.hit[0] == '2', NULL);
     // is the last part of the HIT correct?
-    fail_unless(*(buf + BEFORE_LEN + HIT_LEN - 1) == '2', NULL);
+    fail_unless(buf.hit[HIT_LEN - 1] == '2', NULL);
     // is the suffix correct including the terminating null character?
-    fail_unless(memcmp(buf + BEFORE_LEN + HIT_LEN, suffix, SUFFIX_LEN) == 0, NULL);
+    fail_unless(memcmp(&buf.suffix, suffix, SUFFIX_LEN) == 0, NULL);
     // is the buffer after the suffix untouched?
-    fail_unless(memcmp(buf + BEFORE_LEN + HIT_LEN + SUFFIX_LEN, ones, AFTER_LEN) == 0, NULL);
+    fail_unless(memcmp(&buf.after, ones, AFTER_LEN) == 0, NULL);
 }
 END_TEST