From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 12 Jun 2024 15:17:20 +0000 (+0900)
Subject: strbuf: use CMP() macro
X-Git-Tag: v257-rc1~1122^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b12b86450e684bec37c3c9c822b6101621c16b9;p=thirdparty%2Fsystemd.git

strbuf: use CMP() macro

strbuf_child_entry.c is uint8_t, so using CMP() is safer.

This also adds missing assertions.
---

diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c
index 226893842bb..c08aa82e54f 100644
--- a/src/basic/strbuf.c
+++ b/src/basic/strbuf.c
@@ -74,9 +74,11 @@ struct strbuf* strbuf_free(struct strbuf *str) {
         return mfree(str);
 }
 
-static int strbuf_children_cmp(const struct strbuf_child_entry *n1,
-                               const struct strbuf_child_entry *n2) {
-        return n1->c - n2->c;
+static int strbuf_children_cmp(const struct strbuf_child_entry *n1, const struct strbuf_child_entry *n2) {
+        assert(n1);
+        assert(n2);
+
+        return CMP(n1->c, n2->c);
 }
 
 static void bubbleinsert(struct strbuf_node *node,