[exim-cvs] Build: workaround inlining problems on Solaris

Gitweb: https://git.exim.org/exim.git/commitdiff/65766f1b723ea2e16d7ebebeeb6367147098bd18

Commit:     65766f1b723ea2e16d7ebebeeb6367147098bd18
Parent:     00f1386065b4ab2aed12facd883ebd324c8c66d5
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Aug 3 14:18:38 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Aug 3 14:18:38 2019 +0100

    Build: workaround inlining problems on Solaris
    Also fix for difference in syscall types for munmap()
---
 src/src/exim_dbutil.c |  8 ++++++++
 src/src/store.c       | 43 +++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 8b71a41..ff4a2ef 100644
--- a/src/src/exim_dbutil.c
+++ b/src/src/exim_dbutil.c
@@ -44,6 +44,14 @@ whose inclusion is controlled by -D on the compilation command. */
uschar *spool_directory;

+/******************************************************************************/
+      /* dummies needed by Solaris build */
+gstring *
+string_vformat_trc(gstring * g, const uschar * func, unsigned line,
+  unsigned size_limit, unsigned flags, const char *format, va_list ap)
+{ return NULL; }
+/******************************************************************************/
+

 /*************************************************
 *         Berkeley DB error callback             *
diff --git a/src/src/store.c b/src/src/store.c
index 9b1a297..049c988 100644
--- a/src/src/store.c
+++ b/src/src/store.c
@@ -157,7 +157,8 @@ static const uschar * poolclass[NPOOLS] = {

static void * store_mmap(int, const char *, int);
static void * internal_store_malloc(int, const char *, int);
-static void internal_store_free(void *, const char *, int linenumber);
+static void internal_untainted_free(void *, const char *, int linenumber);
+static void internal_tainted_free(storeblock *, const char *, int linenumber);

/******************************************************************************/

@@ -248,15 +249,9 @@ if (size > yield_length[pool])
     /* Give up on this block, because it's too small */
     nblocks[pool]--;
     if (pool < POOL_TAINT_BASE)
-      internal_store_free(newblock, func, linenumber);
+      internal_untainted_free(newblock, func, linenumber);
     else
-      {
-#ifndef COMPILE_UTILITY
-      DEBUG(D_memory)
-    debug_printf("---Unmap %6p %-20s %4d\n", newblock, func, linenumber);
-#endif
-      munmap(newblock, newblock->length + ALIGNED_SIZEOF_STOREBLOCK);
-      }
+      internal_tainted_free(newblock, func, linenumber);
     newblock = NULL;
     }

@@ -515,15 +510,9 @@ while ((b = bb))
   pool_malloc -= siz;
   nblocks[pool]--;
   if (pool < POOL_TAINT_BASE)
-    internal_store_free(b, func, linenumber);
+    internal_untainted_free(b, func, linenumber);
   else
-    {
-#ifndef COMPILE_UTILITY
-    DEBUG(D_memory)
-      debug_printf("---Unmap %6p %-20s %4d\n", b, func, linenumber);
-#endif
-    munmap(b, b->length + ALIGNED_SIZEOF_STOREBLOCK);
-    }
+    internal_tainted_free(b, func, linenumber);
   }

 /* Cut out the debugging stuff for utilities, but stop picky compilers from
@@ -858,7 +847,7 @@ Returns:      nothing
 */

static void
-internal_store_free(void *block, const char *func, int linenumber)
+internal_untainted_free(void * block, const char * func, int linenumber)
{
#ifdef COMPILE_UTILITY
func = func;
@@ -871,10 +860,24 @@ free(block);
}

void
-store_free_3(void *block, const char *func, int linenumber)
+store_free_3(void * block, const char * func, int linenumber)
{
n_nonpool_blocks--;
-internal_store_free(block, func, linenumber);
+internal_untainted_free(block, func, linenumber);
+}
+
+/******************************************************************************/
+static void
+internal_tainted_free(storeblock * block, const char * func, int linenumber)
+{
+#ifdef COMPILE_UTILITY
+func = func;
+linenumber = linenumber;
+#else
+DEBUG(D_memory)
+ debug_printf("---Unmap %6p %-20s %4d\n", block, func, linenumber);
+#endif
+munmap((void *)block, block->length + ALIGNED_SIZEOF_STOREBLOCK);
}

/******************************************************************************/