#define ESI_HONOR_DOLLAR BIT(1) /* $ is meaningfull */
#define ESI_SKIPPING BIT(2) /* value will not be needed */
+#ifdef STAND_ALONE
+# ifndef SUPPORT_CRYPTEQ
+# define SUPPORT_CRYPTEQ
+# endif
+#else
+
/* Recursively called function */
static uschar *expand_string_internal(const uschar *, esi_flags, const uschar **, BOOL *, BOOL *);
static int_eximarith_t expanded_string_integer(const uschar *, BOOL);
-#ifdef STAND_ALONE
-# ifndef SUPPORT_CRYPTEQ
-# define SUPPORT_CRYPTEQ
-# endif
-#endif
+#endif /*!STAND_ALONE*/
#ifdef LOOKUP_LDAP
# include "lookups/ldap.h"
{ "warnmsg_recipients", vtype_stringptr, &warnmsg_recipients }
};
-static int var_table_size = nelem(var_table);
-
#ifdef MACRO_PREDEF
/* dummies */
find_var_ent(uschar * name)
{
int first = 0;
-int last = var_table_size;
+int last = nelem(var_table);
while (last > first)
{
#endif
/* check known-name variables */
-for (var_entry * v = var_table; v < var_table + var_table_size; v++)
+for (var_entry * v = var_table; v < var_table + nelem(var_table); v++)
if (v->type == vtype_stringptr)
assert_variable_notin(US v->name, *(USS v->value), &e);
{
// if (toplevel) *saveptr = 0;
// else
- if (!toplevel)
- *error_pointer = string_sprintf("missing \")\" at end of "
+ if (!toplevel)
+ *error_pointer = string_sprintf("missing \")\" at end of "
"condition near line %d of filter file", line_number);
break;
}
-/* Copyright (c) The Exim Maintainers 2022 *
+/* Copyright (c) The Exim Maintainers 2022 */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "exim.h"
{
const re_req * req = (const re_req *)reqbuf;
uschar * errstr;
-const pcre2_code * cre;
+const pcre2_code * cre = NULL;
if (regex_cachesize >= REGEX_CACHESIZE_LIMIT)
errstr = US"regex cache size limit reached";
if (*var == '(') /* marker for quoted value */
{
uschar * s;
- int idx;
for (s = ++var; *s != ')'; ) s++;
#ifndef COMPILE_UTILITY
- if ((idx = search_findtype(var, s - var)) < 0)
{
- DEBUG(D_any) debug_printf("Unrecognised quoter %.*s\n", (int)(s - var), var+1);
- goto SPOOL_FORMAT_ERROR;
+ int idx;
+ if ((idx = search_findtype(var, s - var)) < 0)
+ {
+ DEBUG(D_any)
+ debug_printf("Unrecognised quoter %.*s\n", (int)(s - var), var+1);
+ goto SPOOL_FORMAT_ERROR;
+ }
+ proto_mem = store_get_quoted(1, GET_TAINTED, idx);
}
- proto_mem = store_get_quoted(1, GET_TAINTED, idx);
#endif /* COMPILE_UTILITY */
var = s + 1;
}
#endif
-/* Forward decl. */
-static void tls_client_resmption_key(tls_support *, smtp_connect_args *,
- smtp_transport_options_block *);
-
-
#if defined(MACRO_PREDEF) && !defined(DISABLE_TLS)
# include "macro_predef.h"
# ifdef USE_GNUTLS
/*************************************************
* Many functions are package-specific *
*************************************************/
+/* Forward decl. */
+static void tls_client_resmption_key(tls_support *, smtp_connect_args *,
+ smtp_transport_options_block *);
+
#ifdef USE_GNUTLS
# include "tls-gnu.c"