From: Jeremy Harris Date: Fri, 29 Mar 2024 20:42:47 +0000 (+0000) Subject: inlining X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/ad64ad24d66f32af7af302b625f7a7be0ac6b988 inlining --- diff --git a/src/src/functions.h b/src/src/functions.h index d811c62a3..b2f948650 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -567,7 +567,6 @@ extern gstring *string_append_listele_n(gstring *, uschar, const uschar *, unsig extern gstring *string_append2_listele_n(gstring *, const uschar *, const uschar *, unsigned) WARN_UNUSED_RESULT; extern uschar *string_base62_32(unsigned long int); extern uschar *string_base62_64(unsigned long int); -extern gstring *string_cat (gstring *, const uschar * ) WARN_UNUSED_RESULT; extern gstring *string_catn(gstring *, const uschar *, int) WARN_UNUSED_RESULT; extern int string_compare_by_pointer(const void *, const void *); extern uschar *string_copy_dnsdomain(uschar *); @@ -1050,6 +1049,18 @@ if (g) store_release_above_3(g->s + (g->size = g->ptr + 1), file, line); } +/* plain string append to a growable-string */ + +static inline gstring * string_cat(gstring * g, const uschar * s) + WARN_UNUSED_RESULT; + +static inline gstring * +string_cat(gstring * g, const uschar * s) +{ +return string_catn(g, s, Ustrlen(s)); +} + + /* sprintf-append to a growable-string */ #define string_fmt_append(g, fmt, ...) \ @@ -1085,6 +1096,7 @@ g->s = s; } /* Append one gstring to another */ + static inline gstring * gstring_append(gstring * dest, gstring * item) { diff --git a/src/src/string.c b/src/src/string.c index baa19f426..cd76e1f1c 100644 --- a/src/src/string.c +++ b/src/src/string.c @@ -1234,13 +1234,6 @@ return g; } -gstring * -string_cat(gstring * g, const uschar * s) -{ -return string_catn(g, s, Ustrlen(s)); -} - - /************************************************* * Append strings to another string *