basic/escape: swap 'bad' and 'len' params for decescape()

To follow our usual coding style.

diff --git a/src/basic/escape.c b/src/basic/escape.c
index 81d15a67cdbf9512abbc7faedf18ee1f40cac53c..e1ded5598117b6d192fdf598af1dff2e86e63311 100644 (file)
--- a/src/basic/escape.c
+++ b/src/basic/escape.c
@@ -478,7 +478,7 @@ char* octescape(const char *s, size_t len) {
         return buf;
 }
 
-char* decescape(const char *s, const char *bad, size_t len) {
+char* decescape(const char *s, size_t len, const char *bad) {
         char *buf, *t;
 
         /* Escapes all chars in bad, in addition to \ and " chars, in \nnn decimal style escaping. */

diff --git a/src/basic/escape.h b/src/basic/escape.h
index e922b6693b317fae7684cb6485ea7678e7256c71..46ccaf78ec122f2e38f058a81f628673fa98c210 100644 (file)
--- a/src/basic/escape.h
+++ b/src/basic/escape.h
@@ -67,7 +67,7 @@ static inline char* xescape(const char *s, const char *bad) {
         return xescape_full(s, bad, SIZE_MAX, 0);
 }
 char* octescape(const char *s, size_t len);
-char* decescape(const char *s, const char *bad, size_t len);
+char* decescape(const char *s, size_t len, const char *bad);
 char* escape_non_printable_full(const char *str, size_t console_width, XEscapeFlags flags);
 
 char* shell_escape(const char *s, const char *bad);

diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index bbd0aef1c8015b9902ae4c2555e1b38fdf8a245b..7f0898af6b21a4e59e6e566e72da27e16c7594a2 100644 (file)
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -931,7 +931,7 @@ static char *format_svc_param_value(DnsSvcParam *i) {
                 return strv_join(values_strv, ",");
         }
         default: {
-                value = decescape((char *)&i->value, " ,", i->length);
+                value = decescape((char*) &i->value, i->length, " ,");
                 if (!value)
                         return NULL;
                 break;

diff --git a/src/test/test-escape.c b/src/test/test-escape.c
index 7021ff54d2b82d4aacc647521f95140149924d4e..e4dfe32c04d62b2623219d5f9f3c8435c07028c0 100644 (file)
--- a/src/test/test-escape.c
+++ b/src/test/test-escape.c
@@ -242,7 +242,7 @@ TEST(octescape) {
 static void test_decescape_one(const char *s, const char *bad, const char *expected) {
         _cleanup_free_ char *ret = NULL;
 
-        assert_se(ret = decescape(s, bad, strlen_ptr(s)));
+        assert_se(ret = decescape(s, s ? SIZE_MAX : 0, bad));
         log_debug("decescape(\"%s\") → \"%s\" (expected: \"%s\")", strnull(s), ret, expected);
         ASSERT_STREQ(ret, expected);
 }