X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/059ec3d9952740285fb1ebf47961b8aca2eb1b4a..1415d1a6c91e66922036079b3e3b481e579cdb00:/src/exim_monitor/em_strip.c?ds=inline diff --git a/src/exim_monitor/em_strip.c b/src/exim_monitor/em_strip.c index a16179cbf..03864d290 100644 --- a/src/exim_monitor/em_strip.c +++ b/src/exim_monitor/em_strip.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/exim_monitor/em_strip.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */ - /************************************************* * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -23,7 +21,7 @@ static int size_first_time = 1; /* and another */ static int stripchart_count = 0; /* count stripcharts created */ static int *stripchart_delay; /* vector of delay counts */ static Widget *stripchart_label; /* vector of label widgets */ -static int *stripchart_last_total; /* vector of prevous values */ +static int *stripchart_last_total; /* vector of previous values */ static int *stripchart_max; /* vector of maxima */ static int *stripchart_middelay; /* vector of */ static int *stripchart_midmax; /* vector of */ @@ -60,12 +58,13 @@ a little game in order to ensure that the double value is correctly passed back via the value pointer without the compiler doing an unwanted cast. */ -static void stripchartAction(Widget w, XtPointer client_data, XtPointer value) +static void +stripchartAction(Widget w, XtPointer client_data, XtPointer value) { -double *ptr = (double *)value; +double * ptr = (double *)value; static int thresholds[] = {10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 0}; -int num = (int)client_data; +int num = (long)client_data; int oldmax = 0; int newmax = 0; int newvalue = 0; @@ -142,7 +141,7 @@ while (thresholds[i] > 0) thresh : stripchart_midmax[num]; if (newmax == 10) sprintf(CS buffer, "%s", stripchart_name[num]); else sprintf(CS buffer, "%s x%d", stripchart_name[num], newmax/10); - if (size_stripchart != NULL && num == 1) Ustrcat(buffer, "%"); + if (size_stripchart != NULL && num == 1) Ustrcat(buffer, US"%"); xs_SetValues(stripchart_label[num], 1, "label", buffer); oldmax = stripchart_max[num]; stripchart_max[num] = newmax; @@ -215,7 +214,8 @@ and for the second if it is a partition size display; its update time is initially set to 1 second so that it gives an immediate display of the queue. The first time its callback function is obeyed, the update time gets reset. */ -void create_stripchart(Widget parent, uschar *title) +void +create_stripchart(Widget parent, uschar *title) { Widget chart; @@ -251,7 +251,7 @@ xs_SetValues(chart, 11, XtNfromVert, label); XtAddCallback(chart, "getValue", stripchartAction, - (XtPointer)stripchart_count); + (XtPointer)(long)stripchart_count); stripchart_last_total[stripchart_count] = 0; stripchart_max[stripchart_count] = 10;