Corrected Issue 34 (restrict)

minor macro renaming (fuzzer.c)

git-svn-id: https://lz4.googlecode.com/svn/trunk@80 650e7d94-2a16-8b24-b05c-7c0b3f6821cd

diff --git a/fuzzer.c b/fuzzer.c
index 2f75923..9fea8fd 100644 (file)
--- a/fuzzer.c
+++ b/fuzzer.c
@@ -97,11 +97,10 @@ int main() {
         unsigned long long bytes = 0;\r
         unsigned long long cbytes = 0;\r
         unsigned char buf[LEN];\r
-#       undef  max\r
-#       define max   LZ4_compressBound(LEN)\r
-#       define avail ROUND_PAGE(max)\r
-        const int off_full = avail - max;\r
-        unsigned char cbuf[avail + PAGE_SIZE];\r
+#       define FUZ_max   LZ4_compressBound(LEN)\r
+#       define FUZ_avail ROUND_PAGE(FUZ_max)\r
+        const int off_full = FUZ_avail - FUZ_max;\r
+        unsigned char cbuf[FUZ_avail + PAGE_SIZE];\r
                unsigned int seed, cur_seq, seeds[NUM_SEQ], timestamp=FUZ_GetMilliStart();\r
         int i, j, k, ret, len;\r
                char userInput[30] = {0};\r
@@ -117,7 +116,7 @@ int main() {
                printf("Seed = %u\n", seed);\r
 \r
         for (i = 0; i < 2048; i++)\r
-                cbuf[avail + i] = cbuf[avail + 2048 + i] = FUZ_rand(&seed) >> 16;\r
+                cbuf[FUZ_avail + i] = cbuf[FUZ_avail + 2048 + i] = FUZ_rand(&seed) >> 16;\r
 \r
         for (i = 0; i < NB_ATTEMPTS; i++) {\r
                        printf("\r%7i /%7i\r", i, NB_ATTEMPTS);\r
@@ -137,24 +136,18 @@ int main() {
                     }\r
                     buf[j] = FUZ_rand(&cur_seq) >> 16;\r
             }\r
-            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[off_full], LEN, max);\r
+            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[off_full], LEN, FUZ_max);\r
             len = ret;\r
 \r
                        // Test compression with output size being exactly what's necessary\r
-            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[avail-len], LEN, len);\r
-            if (!test_canary(&cbuf[avail])) { printf("compression overran output buffer: seed %u, len %d, olen %d\n", seed, LEN, len); return 1; }\r
+            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[FUZ_avail-len], LEN, len);\r
+            if (!test_canary(&cbuf[FUZ_avail])) { printf("compression overran output buffer: seed %u, len %d, olen %d\n", seed, LEN, len); return 1; }\r
             if (ret == 0) { printf("compression failed despite sufficient space: seed %u, len %d\n", seed, LEN); return 1; }\r
 \r
-                       // Test compression with just one missing byte into output buffer => should fail\r
-            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[avail-(len-1)], LEN, len-1);\r
+                       // Test compression with just one missing byte into output buffer => must fail\r
+            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[FUZ_avail-(len-1)], LEN, len-1);\r
             if (ret) { printf("compression overran output buffer: seed %u, len %d, olen %d => ret %d", seed, LEN, len-1, ret); return 1; }\r
-            if (!test_canary(&cbuf[avail])) { printf("compression overran output buffer: seed %u, len %d, olen %d", seed, LEN, len-1); return 1; }\r
-\r
-                       /* No longer useful\r
-                       // Test compression with not enough output size\r
-            ret = LZ4_compress_limitedOutput((const char*)buf, (char*)&cbuf[avail-len/2], LEN, len/2);\r
-            if (!test_canary(&cbuf[avail])) { printf("compression overran output buffer: seed %u, len %d, olen %d", seed, LEN, len/2); return 1; }\r
-                       */\r
+            if (!test_canary(&cbuf[FUZ_avail])) { printf("compression overran output buffer: seed %u, len %d, olen %d", seed, LEN, len-1); return 1; }\r
 \r
                        bytes += LEN;\r
             cbytes += len;\r

diff --git a/lz4.c b/lz4.c
index 17c4a04..18c4604 100644 (file)
--- a/lz4.c
+++ b/lz4.c
@@ -696,9 +696,9 @@ int LZ4_uncompress(const char* source,
 {\r
     // Local Variables\r
     const BYTE* restrict ip = (const BYTE*) source;\r
-    const BYTE* restrict ref;\r
+    const BYTE* ref;\r
 \r
-    BYTE* restrict op = (BYTE*) dest;\r
+    BYTE* op = (BYTE*) dest;\r
     BYTE* const oend = op + osize;\r
     BYTE* cpy;\r
 \r
@@ -782,9 +782,9 @@ int LZ4_uncompress_unknownOutputSize(
     // Local Variables\r
     const BYTE* restrict ip = (const BYTE*) source;\r
     const BYTE* const iend = ip + isize;\r
-    const BYTE* restrict ref;\r
+    const BYTE* ref;\r
 \r
-    BYTE* restrict op = (BYTE*) dest;\r
+    BYTE* op = (BYTE*) dest;\r
     BYTE* const oend = op + maxOutputSize;\r
     BYTE* cpy;\r
 \r