Changeset 740 for vendor/current/lib/compression/lzxpress.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/compression/lzxpress.c (modified) (8 diffs)

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);
         }