Changeset 6668

Timestamp:

01/02/11 19:16:54 (2 years ago)

Author:

jow

Message:

libs/lmo: skip all entries with identical key and value when generating lmo archives

Files:

• luci/trunk/libs/lmo/src/lmo_po2lmo.c (modified) (4 diffs)

luci/trunk/libs/lmo/src/lmo_po2lmo.c

@@ -2 +2 @@
  * lmo - Lua Machine Objects - PO to LMO conversion tool
  *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2009-2011 Jo-Philipp Wich <xm@subsignal.org>
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -60 +60 @@
                 off++;
                 esc = 1;
-                
             }
             else if( src[pos] != '"' )
@@ -86 +85 @@
     int offset = 0;
     int length = 0;
+    uint32_t key_id, val_id;
 
     FILE *in;
@@ -156 +156 @@
             if( strlen(key) > 0 && strlen(val) > 0 )
             {
-                if( (entry = (lmo_entry_t *) malloc(sizeof(lmo_entry_t))) != NULL )
+                key_id = sfh_hash(key, strlen(key));
+                val_id = sfh_hash(val, strlen(val));
+
+                if( key_id != val_id )
                 {
-                    memset(entry, 0, sizeof(entry));
-                    length = strlen(val) + ((4 - (strlen(val) % 4)) % 4);
-
-                    entry->key_id = htonl(sfh_hash(key, strlen(key)));
-                    entry->val_id = htonl(sfh_hash(val, strlen(val)));
-                    entry->offset = htonl(offset);
-                    entry->length = htonl(strlen(val));
-
-                    print(val, length, 1, out);
-                    offset += length;
-
-                    entry->next = head;
-                    head = entry;
-                }
-                else
-                {
-                    die("Out of memory");
+                    if( (entry = (lmo_entry_t *) malloc(sizeof(lmo_entry_t))) != NULL )
+                    {
+                        memset(entry, 0, sizeof(entry));
+                        length = strlen(val) + ((4 - (strlen(val) % 4)) % 4);
+
+                        entry->key_id = htonl(key_id);
+                        entry->val_id = htonl(val_id);
+                        entry->offset = htonl(offset);
+                        entry->length = htonl(strlen(val));
+
+                        print(val, length, 1, out);
+                        offset += length;
+
+                        entry->next = head;
+                        head = entry;
+                    }
+                    else
+                    {
+                        die("Out of memory");
+                    }
                 }
             }