Changeset 740 for vendor/current/lib/compression

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/lib/compression

Files:

• lzxpress.c (modified) (8 diffs)
• testsuite.c (modified) (1 diff)
• wscript_build (added)

vendor/current/lib/compression/lzxpress.c

@@ -35 +35 @@
 #include "replace.h"
 #include "lzxpress.h"
+#include "../lib/util/byteorder.h"
 
 
@@ -81 +82 @@
         uncompressed_pos = 0;
         indic = 0;
+        *(uint32_t *)compressed = 0;
         compressed_pos = sizeof(uint32_t);
         indic_pos = &compressed[0];
@@ -130 +132 @@
                                 /* Classical meta-data */
                                 metadata = (uint16_t)(((best_offset - 1) << 3) | (best_len - 3));
-                                dest[metadata_size / sizeof(uint16_t)] = metadata;
+                                SSVAL(dest, metadata_size / sizeof(uint16_t), metadata);
                                 metadata_size += sizeof(uint16_t);
                         } else {
                                 metadata = (uint16_t)(((best_offset - 1) << 3) | 7);
-                                dest[metadata_size / sizeof(uint16_t)] = metadata;
+                                SSVAL(dest, metadata_size / sizeof(uint16_t), metadata);
                                 metadata_size = sizeof(uint16_t);
 
@@ -156 +158 @@
                                         }
 
-                                        /* Additionnal best_len */
+                                        /* Additional best_len */
                                         compressed[compressed_pos + metadata_size] = (best_len - (3 + 7 + 15)) & 0xFF;
                                         metadata_size += sizeof(uint8_t);
@@ -168 +170 @@
                                         }
 
-                                        /* Additionnal best_len */
+                                        /* Additional best_len */
                                         compressed[compressed_pos + metadata_size] = 255;
 
@@ -199 +201 @@
 
                 if ((indic_bit - 1) % 32 > (indic_bit % 32)) {
-                        *(uint32_t *)indic_pos = indic;
+                        SIVAL(indic_pos, 0, indic);
                         indic = 0;
                         indic_pos = &compressed[compressed_pos];
@@ -213 +215 @@
                 compressed_pos++;
                 if (((indic_bit - 1) % 32) > (indic_bit % 32)){
-                        *(uint32_t *)indic_pos = indic;
+                        SIVAL(indic_pos, 0, indic);
                         indic = 0;
                         indic_pos = &compressed[compressed_pos];
@@ -224 +226 @@
                         indic |= 0 << (32 - ((indic_bit % 32) + 1));
 
-                *(uint32_t *)indic_pos = indic;
+                *(uint32_t *)&compressed[compressed_pos] = 0;
+                SIVAL(indic_pos, 0, indic);
                 compressed_pos += sizeof(uint32_t);
         }

vendor/current/lib/compression/testsuite.c

@@ -21 +21 @@
 #include "includes.h"
 #include "torture/torture.h"
-#include "../compression/mszip.h"
+#include "talloc.h"
+#include "mszip.h"
+#include "lzxpress.h"
+
+/*
+  test lzxpress
+ */
+static bool test_lzxpress(struct torture_context *test)
+{
+        TALLOC_CTX *tmp_ctx = talloc_new(test);
+        uint8_t *data;
+        const char *fixed_data = "this is a test. and this is a test too";
+        const uint8_t fixed_out[] = { 0x00, 0x20, 0x00, 0x04, 0x74, 0x68, 0x69, 0x73,
+                                      0x20, 0x10, 0x00, 0x61, 0x20, 0x74, 0x65, 0x73,
+                                      0x74, 0x2E, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x9F,
+                                      0x00, 0x04, 0x20, 0x74, 0x6F, 0x6F, 0x00, 0x00,
+                                      0x00, 0x00 };
+        ssize_t c_size;
+        uint8_t *out, *out2;
+
+        data = talloc_size(tmp_ctx, 1023);
+        out  = talloc_size(tmp_ctx, 2048);
+        memset(out, 0x42, talloc_get_size(out));
+
+        torture_comment(test, "lzxpress fixed compression\n");
+        c_size = lzxpress_compress((const uint8_t *)fixed_data,
+                                   strlen(fixed_data),
+                                   out,
+                                   talloc_get_size(out));
+
+        torture_assert_int_equal(test, c_size, sizeof(fixed_out), "fixed lzxpress_compress size");
+        torture_assert_mem_equal(test, out, fixed_out, c_size, "fixed lzxpress_compress data");
+
+        torture_comment(test, "lzxpress fixed decompression\n");
+        out2  = talloc_size(tmp_ctx, strlen(fixed_data));
+        c_size = lzxpress_decompress(out,
+                                     sizeof(fixed_out),
+                                     out2,
+                                     talloc_get_size(out2));
+
+        torture_assert_int_equal(test, c_size, strlen(fixed_data), "fixed lzxpress_decompress size");
+        torture_assert_mem_equal(test, out2, fixed_data, c_size, "fixed lzxpress_decompress data");
+
+        return true;
+}
+
 
 struct torture_suite *torture_local_compression(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "COMPRESSION");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "compression");
+
+        torture_suite_add_simple_test(suite, "lzxpress", test_lzxpress);
 
         return suite;