Merge remote-tracking branch 'origin/terencehill/bot_waypoints'

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

diff --git a/qcsrc/lib/yenc.qh b/qcsrc/lib/yenc.qh
index 3e57d7f5d5401e563bc6f1f10caacba993fde558..dce6e9c9d82459022ec231eeb5ee03b3f5e41c0e 100644 (file)
--- a/qcsrc/lib/yenc.qh
+++ b/qcsrc/lib/yenc.qh
@@ -1,5 +1,4 @@
-#ifndef YENC_H
-#define YENC_H
+#pragma once
 
 #include "test.qh"
 
@@ -35,9 +34,7 @@
                if (conv <= 0) { \
                        ret = -1; \
                } else { \
-                       bool esc = false; \
                        if (conv == '=') { \
-                               esc = true; \
                                conv = STRING_ITERATOR_GET(stringiter); \
                                conv -= 64; \
                        } \
@@ -47,22 +44,20 @@
                } \
        } MACRO_END
 
-TEST(yEncDec)
+TEST(yEnc, EncodeDecode)
 {
        for (int i = 0; i <= 255; ++i)
        {
                int expect = i;
 
-               string fragment;
+               string fragment = string_null;
                yenc_single(expect, fragment);
 
-               int encdec;
+               int encdec = 0;
                STRING_ITERATOR(fragmentiterator, fragment, 0);
                ydec_single(fragmentiterator, encdec);
 
-               TEST_Check(encdec == expect);
+               EXPECT_EQ(expect, encdec);
        }
-       TEST_OK();
+       SUCCEED();
 }
-
-#endif