1 files changed, 54 insertions, 6 deletions

diff --git a/apps/tagcache.c b/apps/tagcache.c
index 248e57237d..d09ddf486a 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -1209,7 +1209,7 @@ bool tagcache_check_clauses(struct tagcache_search *tcs,
     return check_clauses(tcs, &idx, clause, count);
 }
 
-static bool add_uniqbuf(struct tagcache_search *tcs, unsigned long id)
+static bool add_uniqbuf(struct tagcache_search *tcs, uint32_t id)
 {
     int i;
 
@@ -1220,11 +1220,53 @@ static bool add_uniqbuf(struct tagcache_search *tcs, unsigned long id)
         return true;
     }
 
-    for (i = 0; i < tcs->unique_list_count; i++)
+    if (id <= UINT16_MAX)
     {
-        /* Return false if entry is found. */
-        if (tcs->unique_list[i] == id)
-            return false;
+        /* place two 16-bit entries in a single 32-bit slot */
+        uint32_t idtmp;
+        union uentry{
+            uint16_t u16[2];
+            uint32_t u32;
+        } *entry;
+        id |= 1; /*odd - flag 16-bit entry */
+        for (i = 0; i < tcs->unique_list_count; i++)
+        {
+            entry = (union uentry *) &tcs->unique_list[i];
+            if ((entry->u32 & 1) == 0) /* contains a 32-bit entry */
+                continue;
+
+            /* Return false if entry is found. */
+            if (entry->u16[0] == id || entry->u16[1] == id)
+            {
+                logf("%d Exists (16) @ %d", id, i);
+                return false;
+            }
+  
+            if (entry->u16[1] == 0 && (entry->u16[0] & 1) == 1)
+            {
+                entry->u16[1] = id & UINT16_MAX;
+                return true; /*no more 16bit entries add to empty 16bit slot */
+            }
+
+        }
+        /* Not Found and no empty slot add a new entry */
+        entry = (union uentry *) &idtmp;
+        entry->u16[1] = 0;
+        entry->u16[0] = id & UINT16_MAX;
+        id = idtmp;
+    }
+    else
+    {
+        id &= ~1; /* even - flag 32-bit entry */
+        for (i = 0; i < tcs->unique_list_count; i++)
+        {
+            /* Return false if entry is found. */
+            if (tcs->unique_list[i] == id)
+            {
+                logf("%d Exists (32)@ %d", id, i);
+                return false;
+            }
+        }
     }
 
     if (tcs->unique_list_count < tcs->unique_list_capacity)
@@ -1470,9 +1512,10 @@ bool tagcache_search(struct tagcache_search *tcs, int tag)
 void tagcache_search_set_uniqbuf(struct tagcache_search *tcs,
                                  void *buffer, long length)
 {
-    tcs->unique_list = (unsigned long *)buffer;
+    tcs->unique_list = (uint32_t *)buffer;
     tcs->unique_list_capacity = length / sizeof(*tcs->unique_list);
     tcs->unique_list_count = 0;
+    memset(tcs->unique_list, 0, tcs->unique_list_capacity);
 }
 
 bool tagcache_search_add_filter(struct tagcache_search *tcs,
@@ -1702,6 +1745,11 @@ bool tagcache_get_next(struct tagcache_search *tcs)
             return true;
     }
 
+#ifdef LOGF_ENABLE
+    if (tcs->unique_list_count > 0)
+        logf(" uniqbuf: %d used / %d avail", tcs->unique_list_count, tcs->unique_list_capacity);
+#endif
+
     return false;
 }