r19404: fixed the LOCAL-ICONV test
authorAndrew Tridgell <tridge@samba.org>
Wed, 18 Oct 2006 23:27:48 +0000 (23:27 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:21:26 +0000 (14:21 -0500)
(This used to be commit 0b3e83814bdf015064d7dd1f26cf9ec3ddadc7f4)

source4/torture/local/iconv.c

index e41e40dc8df00f64093c7e5ecbb9f1c5c72fcbfd..8d66f4fd58230364b41f04088b07bfb3d357ea0a 100644 (file)
@@ -264,7 +264,11 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint)
        codepoint_t c;
 
        size = push_codepoint((char *)buf, codepoint);
-       torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), "Invalid Codepoint range");
+       torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), 
+                      "Invalid Codepoint range");
+
+       if (size == -1) return true;
+
        buf[size] = random();
        buf[size+1] = random();
        buf[size+2] = random();
@@ -272,8 +276,9 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint)
 
        c = next_codepoint((char *)buf, &size2);
 
-       torture_assert(tctx, c == codepoint, talloc_asprintf(tctx, 
-                                       "next_codepoint(%u) failed - gave %u", codepoint, c));
+       torture_assert(tctx, c == codepoint, 
+                      talloc_asprintf(tctx, 
+                                      "next_codepoint(%u) failed - gave %u", codepoint, c));
 
        torture_assert(tctx, size2 == size, 
                        talloc_asprintf(tctx, "next_codepoint(%u) gave wrong size %d (should be %d)\n",