data: Ensure a stable ordering in cmp() in case of type-mismatches.

So far, this doesn't make a difference but it's better style anyway.

diff --git a/src/core/data.c b/src/core/data.c
index 968e99de5003b4ff1e7b061de6922928f950b655..1188b4030ba4215304c4f7a47ae25e68a5feb49f 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
@@ -293,7 +293,7 @@ sdb_data_cmp(const sdb_data_t *d1, const sdb_data_t *d2)
        CMP_NULL(d1, d2);
 
        if (d1->type != d2->type)
-               return -1;
+               return SDB_CMP(d1->type, d2->type);
 
        switch (d1->type) {
                case SDB_TYPE_INTEGER:

diff --git a/src/include/core/data.h b/src/include/core/data.h
index 6e4d3174e4c45bb42397345a58719c2b888ac27f..02f99c5313ebc33ce18a6826cd33740ec364802a 100644 (file)
--- a/src/include/core/data.h
+++ b/src/include/core/data.h
@@ -105,7 +105,7 @@ sdb_data_free_datum(sdb_data_t *datum);
 /*
  * sdb_data_cmp:
  * Compare two data points. A NULL datum is considered less than any non-NULL
- * datum. On data-type mismatch, the function always returns a negative value.
+ * datum. On data-type mismatch, the function always returns a non-zero value.
  *
  * Returns:
  *  - a value less than zero if d1 compares less than d2