From: Phil Pennock <phil+git@pennock-tech.com>
Date: Mon, 2 Nov 2020 07:23:14 +0000 (-0500)
Subject: Inline four often-called new functions
X-Git-Tag: exim-4.95-RC0~51^2~37
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/72ff77a3736576a7695f918baf37e5e8d0b48572

Inline four often-called new functions

The BDAT state switchers should happen so often during SMTP reception that a
compiler hint to inline seems wise.

The length filter checks happen on every start-up, which for Exim is often
enough that I think an inline these is warranted too.

(cherry picked from commit 6e3d0e3f1c8228ef19a3d1ba61f131cef3172ceb)
(cherry picked from commit 6ca5fcba34070f4495a0188f16eb2e4d78f3430a)
---

diff --git a/src/src/exim.c b/src/src/exim.c
index d6f0c08f7..abb3ba7c0 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -761,7 +761,7 @@ exit(EXIT_FAILURE);
 }
 
 /* fail if a length is too long */
-static void
+static inline void
 exim_len_fail_toolong(int itemlen, int maxlen, const char *description)
 {
 if (itemlen <= maxlen)
@@ -772,7 +772,7 @@ exit(EXIT_FAILURE);
 }
 
 /* only pass through the string item back to the caller if it's short enough */
-static const uschar *
+static inline const uschar *
 exim_str_fail_toolong(const uschar *item, int maxlen, const char *description)
 {
 exim_len_fail_toolong(Ustrlen(item), maxlen, description);
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 9ffc24618..93d5cece3 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -594,8 +594,8 @@ if (n > 0)
 
 
 /* Forward declarations */
-static void bdat_push_receive_functions(void);
-static void bdat_pop_receive_functions(void);
+static inline void bdat_push_receive_functions(void);
+static inline void bdat_pop_receive_functions(void);
 
 
 /* Get a byte from the smtp input, in CHUNKING mode.  Handle ack of the
@@ -776,7 +776,7 @@ if (chunking_state != CHUNKING_LAST)
 }
 
 
-static void
+static inline void
 bdat_push_receive_functions(void)
 {
 /* push the current receive_* function on the "stack", and
@@ -797,7 +797,7 @@ receive_getc = bdat_getc;
 receive_ungetc = bdat_ungetc;
 }
 
-static void
+static inline void
 bdat_pop_receive_functions(void)
 {
 receive_getc = lwr_receive_getc;