Simplify vdist macro and remove a redundant vec2 call

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / yenc.qh

diff --git a/qcsrc/lib/yenc.qh b/qcsrc/lib/yenc.qh
index c91db98f68143986a94fdb145cfa745cbcf945fa..e71c68ef63683aa0caeb762f79971c32c83fb577 100644 (file)
--- a/qcsrc/lib/yenc.qh
+++ b/qcsrc/lib/yenc.qh
@@ -3,7 +3,7 @@
 #include "test.qh"
 
 #define yenc_single(c, ret) \
-       MACRO_BEGIN { \
+       MACRO_BEGIN \
                int conv = c; \
                conv += 42; \
                if (conv >= 256) conv -= 256; \
@@ -26,17 +26,15 @@
                                break; \
                        } \
                } \
-       } MACRO_END
+       MACRO_END
 
 #define ydec_single(stringiter, ret) \
-       MACRO_BEGIN { \
+       MACRO_BEGIN \
                int conv = STRING_ITERATOR_GET(stringiter); \
                if (conv <= 0) { \
                        ret = -1; \
                } else { \
-                       bool esc = false; \
                        if (conv == '=') { \
-                               esc = true; \
                                conv = STRING_ITERATOR_GET(stringiter); \
                                conv -= 64; \
                        } \
@@ -44,9 +42,9 @@
                        conv -= 42; \
                        ret = conv; \
                } \
-       } MACRO_END
+       MACRO_END
 
-TEST(yEncDec)
+TEST(yEnc, EncodeDecode)
 {
        for (int i = 0; i <= 255; ++i)
        {
@@ -59,7 +57,7 @@ TEST(yEncDec)
                STRING_ITERATOR(fragmentiterator, fragment, 0);
                ydec_single(fragmentiterator, encdec);
 
-               TEST_Check(encdec == expect);
+               EXPECT_EQ(expect, encdec);
        }
-       TEST_OK();
+       SUCCEED();
 }