Unix socket struct naming: avoid "sun" due to conflict on Solaris

[users/heiko/exim.git] / src / exim_monitor / em_init.c

diff --git a/src/exim_monitor/em_init.c b/src/exim_monitor/em_init.c
index b05e855b6636c552a1f5994574329e3531ac98e2..b834d9a2b3c98d560bea77df08486f7734a9e0ed 100644 (file)
--- a/src/exim_monitor/em_init.c
+++ b/src/exim_monitor/em_init.c
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/exim_monitor/em_init.c,v 1.5 2009/11/16 19:50:36 nm4 Exp $ */
-

 /*************************************************
 *                  Exim monitor                  *
 *************************************************/
 /*************************************************
 *                  Exim monitor                  *
 *************************************************/


@@ -72,9 +70,8 @@ for (i = 0; i <= 1; i++)
         {
         int offset;
         const uschar *error;
         {
         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);
           {
           printf("regular expression error: %s at offset %d "
             "while compiling %s\n", error, offset, buffer);


@@ -233,7 +230,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,
 /* 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 */
 }
 
 /* End of em_init.c */