data: Free binary and regex array values as well.

[sysdb.git] / src / core / data.c

diff --git a/src/core/data.c b/src/core/data.c
index 503db29a36c500ce34a093f465c7ca252348a8c5..8c54c9390842f0014df803009af11358fe6fbc76 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
@@ -166,6 +166,34 @@ free_array_values(sdb_data_t *datum)
                        v[i] = NULL;
                }
        }
+       else if (type == SDB_TYPE_BINARY) {
+               struct {
+                       size_t length;
+                       unsigned char *datum;
+               } *v = datum->data.array.values;
+               size_t i;
+
+               for (i = 0; i < datum->data.array.length; ++i) {
+                       if (v[i].datum)
+                               free(v[i].datum);
+                       v[i].datum = NULL;
+               }
+       }
+       else if (type == SDB_TYPE_REGEX) {
+               struct {
+                       char *raw;
+                       regex_t regex;
+               } *v = datum->data.array.values;
+               size_t i;
+
+               for (i = 0; i < datum->data.array.length; ++i) {
+                       if (v[i].raw) {
+                               free(v[i].raw);
+                               regfree(&v[i].regex);
+                       }
+                       v[i].raw = NULL;
+               }
+       }
 } /* free_array_values */
 
 /* compare two arrays element-by-element returning how the first non-equal
@@ -206,9 +234,61 @@ array_cmp(const sdb_data_t *a1, const sdb_data_t *a2)
                                return diff;
                }
        }
+       else if (type == SDB_TYPE_DATETIME) {
+               sdb_time_t *v1 = a1->data.array.values;
+               sdb_time_t *v2 = a2->data.array.values;
+
+               for (i = 0; i < len; ++i)
+                       if (v1[i] != v2[i])
+                               return SDB_CMP(v1[i], v2[i]);
+       }
+       else if (type == SDB_TYPE_BINARY) {
+               struct {
+                       size_t length;
+                       unsigned char *datum;
+               } *v1 = a1->data.array.values;
+               struct {
+                       size_t length;
+                       unsigned char *datum;
+               } *v2 = a2->data.array.values;
+
+               for (i = 0; i < len; ++i) {
+                       int diff;
+
+                       /* on a common prefix, the shorter datum sorts less */
+                       if (v1[i].length < v2[i].length) {
+                               diff = memcmp(v1[i].datum, v2[i].datum, v1[i].length);
+                               diff = diff ? diff : -1;
+                       }
+                       else if (v1[i].length > v2[i].length) {
+                               diff = memcmp(v1[i].datum, v2[i].datum, v2[i].length);
+                               diff = diff ? diff : 1;
+                       }
+                       else
+                               diff = memcmp(v1[i].datum, v2[i].datum, v1[i].length);
+
+                       if (diff)
+                               return diff;
+               }
+       }
+       else if (type == SDB_TYPE_REGEX) {
+               struct {
+                       char *raw;
+                       regex_t regex;
+               } *v1 = a1->data.array.values;
+               struct {
+                       char *raw;
+                       regex_t regex;
+               } *v2 = a2->data.array.values;
+
+               for (i = 0; i < len; ++i) {
+                       int diff = strcasecmp(v1[i].raw, v2[i].raw);
+                       if (diff)
+                               return diff;
+               }
+       }
        else {
-               /* TODO */
-               errno = ENOTSUP;
+               errno = EINVAL;
                /* but fall through to ensure stable sorting: */
        }
        return SDB_CMP(a1->data.array.length, a2->data.array.length);