X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f3ebb786e451da973560f1c9d8cdb151d25108b5..6d2c02560e5c0aa7cef83d02b26f193135b93e21:/src/exim_monitor/em_main.c diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c index 9c7f442e5..69de8dc4d 100644 --- a/src/exim_monitor/em_main.c +++ b/src/exim_monitor/em_main.c @@ -3,6 +3,7 @@ *************************************************/ /* Copyright (c) University of Cambridge 1995 - 2018 */ +/* Copyright (c) The Exim Maintainers 2021 - 2022 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -173,8 +174,6 @@ va_start(ap, format); vfprintf(stderr, format, ap); fprintf(stderr, "\n"); va_end(ap); -selector = selector; /* Keep picky compilers happy */ -flags = flags; } @@ -240,9 +239,6 @@ if (action_queue_update) tick_queue_accumulator = 999999; void updateAction(Widget w, XtPointer client_data, XtPointer call_data) { -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; scan_spool_input(TRUE); queue_display(); tick_queue_accumulator = 0; @@ -250,9 +246,6 @@ tick_queue_accumulator = 0; void hideAction(Widget w, XtPointer client_data, XtPointer call_data) { -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; actioned_message[0] = 0; dialog_ref_widget = w; dialog_action = da_hide; @@ -263,11 +256,7 @@ void unhideAction(Widget w, XtPointer client_data, XtPointer call_data) { skip_item *sk = queue_skip; -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; - -while (sk != NULL) +while (sk) { skip_item *next = sk->next; store_free(sk); @@ -285,9 +274,6 @@ tick_queue_accumulator = 0; void quitAction(Widget w, XtPointer client_data, XtPointer call_data) { -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; exit(0); } @@ -318,10 +304,6 @@ Dimension width, height; XWindowAttributes a; Window w = XtWindow(toplevel_widget); -button = button; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; - /* Get the position and size of the top level widget. */ sizepos_args[0].value = (XtArgVal)(&width); @@ -473,9 +455,6 @@ tick_queue_accumulator += tick_interval; tick_stripchart_accumulator += tick_interval; read_log(); -pt = pt; /* Keep picky compilers happy */ -i = i; - /* If we have passed the queue update time, we must do a full scan of the queue, checking for new arrivals, etc. This will as a by-product set the count of items for use by the stripchart @@ -592,7 +571,8 @@ return ret; * Initialize * *************************************************/ -int main(int argc, char **argv) +int +main(int argc, char **argv) { int i; struct stat statdata; @@ -613,7 +593,8 @@ message_subdir[1] = 0; constructing file names and things. This call will initialize the store_get() function. */ -big_buffer = store_get(big_buffer_size, FALSE); +store_init(); +big_buffer = store_get(big_buffer_size, GET_UNTAINTED); /* Set up the version string and date and output them */