mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
basic/escape: swap 'bad' and 'len' params for decescape()
To follow our usual coding style.
This commit is contained in:
@@ -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. */
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user