X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c988f1f4faa9f679f79beddf3c14676c5dcb8e28..1e1ddfac79fbcd052f199500a6493c7f79cb8462:/src/exim_monitor/em_init.c diff --git a/src/exim_monitor/em_init.c b/src/exim_monitor/em_init.c index 89426ee67..56cb29886 100644 --- a/src/exim_monitor/em_init.c +++ b/src/exim_monitor/em_init.c @@ -1,10 +1,9 @@ -/* $Cambridge: exim/src/exim_monitor/em_init.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */ - /************************************************* * Exim monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) The Exim Maintainers 2020 */ /* See the file NOTICE for conditions of use and distribution. */ /* This module contains code to initialize things from the @@ -72,9 +71,8 @@ for (i = 0; i <= 1; i++) { int offset; const uschar *error; - stripchart_regex[indx] = pcre_compile(CS buffer, PCRE_COPT, - (const char **)&error, &offset, NULL); - if (stripchart_regex[indx] == NULL) + if (!(stripchart_regex[indx] = pcre_compile(CS buffer, PCRE_COPT, + CCSS &error, &offset, NULL))) { printf("regular expression error: %s at offset %d " "while compiling %s\n", error, offset, buffer); @@ -233,7 +231,7 @@ queue_stripchart_name = (s != NULL)? string_copy(s) : US"queue"; /* Compile the regex for matching yyyy-mm-dd at the start of a string. */ yyyymmdd_regex = pcre_compile("^\\d{4}-\\d\\d-\\d\\d\\s", PCRE_COPT, - (const char **)&error, &erroroffset, NULL); + CCSS &error, &erroroffset, NULL); } /* End of em_init.c */