Testsuite: debug output changes resulting

[exim.git] / src / exim_monitor / em_globals.c

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index 925e88e053133bf52966502eeda64a8458e059a4..b23accc6585f5c8be0fc1497585f68209c2981e8 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -2,8 +2,10 @@
 *                Exim Monitor                    *
 *************************************************/
 
 *                Exim Monitor                    *
 *************************************************/
 

+/* Copyright (c) The Exim Maintainers 2021 - 2024 */

 /* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */

+/* SPDX-License-Identifier: GPL-2.0-or-later */

 
 
 #include "em_hdr.h"
 
 
 #include "em_hdr.h"


@@ -81,7 +83,7 @@ uschar *queue_stripchart_name = NULL;
 int     queue_update = 60;
 int     queue_width = 600;
 
 int     queue_update = 60;
 int     queue_width = 600;
 

-pcre   *yyyymmdd_regex;
+pcre2_code   *yyyymmdd_regex;

 
 uschar *size_stripchart = NULL;
 uschar *size_stripchart_name = NULL;
 
 uschar *size_stripchart = NULL;
 uschar *size_stripchart_name = NULL;


@@ -89,7 +91,7 @@ int     spool_is_split = FALSE;
 int     start_small = FALSE;
 int     stripchart_height = 90;
 int     stripchart_number = 1;
 int     start_small = FALSE;
 int     stripchart_height = 90;
 int     stripchart_number = 1;

-pcre  **stripchart_regex;
+pcre2_code  **stripchart_regex;

 uschar **stripchart_title;
 int    *stripchart_total;
 int     stripchart_update = 60;
 uschar **stripchart_title;
 int    *stripchart_total;
 int     stripchart_update = 60;


@@ -196,15 +198,17 @@ uschar *queue_name             = US"";
 int     received_count         = 0;
 uschar *received_protocol      = NULL;
 struct timeval received_time   = { 0, 0 };
 int     received_count         = 0;
 uschar *received_protocol      = NULL;
 struct timeval received_time   = { 0, 0 };

+struct timeval received_time_complete = { 0, 0 };

 int     recipients_count       = 0;
 recipient_item *recipients_list = NULL;
 int     recipients_list_max    = 0;
 BOOL    running_in_test_harness=FALSE;
 
 int     recipients_count       = 0;
 recipient_item *recipients_list = NULL;
 int     recipients_list_max    = 0;
 BOOL    running_in_test_harness=FALSE;
 

-uschar *sender_address         = NULL;
+const uschar *sender_address    = NULL;

 uschar *sender_fullhost        = NULL;
 uschar *sender_helo_name       = NULL;
 uschar *sender_host_address    = NULL;
 uschar *sender_fullhost        = NULL;
 uschar *sender_helo_name       = NULL;
 uschar *sender_host_address    = NULL;

+uschar *sender_host_auth_pubname = NULL;

 uschar *sender_host_authenticated = NULL;
 uschar *sender_host_name       = NULL;
 int     sender_host_port       = 0;
 uschar *sender_host_authenticated = NULL;
 uschar *sender_host_name       = NULL;
 int     sender_host_port       = 0;