upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-03-05 23:00:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup more merge debris

Browse source 
Signed-off-by: Danijel Tasov <m@rbfh.de>
This commit is contained in:
Danijel Tasov 2023-09-27 09:52:34 +02:00
parent c67aa6d45f
commit e6d2b0b08b
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins-root/check_icmp.c
View file

@ -42,6 +42,7 @@ char *progname;
const char *copyright = "2005-2008";
const char *email = "devel@monitoring-plugins.org";
/* what does that do? */
#ifdef __sun
#define _XPG4_2
#endif
@ -761,11 +762,7 @@ main(int argc, char **argv)
}
host = list;
//<<<<<<< HEAD FIXME
table = (struct rta_host**)malloc(sizeof(struct rta_host **) * targets);
//=======
// table = malloc(sizeof(struct rta_host *) * targets);
//>>>>>>> jitter-orig
table = malloc(sizeof(struct rta_host *) * targets);
i = 0;
while(host) {
host->id = i*packets;
@ -1473,11 +1470,9 @@ finish(int sig)
while(host) {
if(debug) puts("");
if (rta_mode && host->pl<100) {
// FIXME printf("%srta=%0.3fms;%0.3f;%0.3f;0; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",(targets > 1) ? host->name : "", (float)host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000, (targets > 1) ? host->name : "", (float)host->rtmax / 1000, (targets > 1) ? host->name : "", (float)host->rtmin / 1000);
printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
printf("%srta=%0.3fms;%0.3f;%0.3f;0; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
(targets > 1) ? host->name : "",
host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
(targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl,
(targets > 1) ? host->name : "", (float)host->rtmax / 1000,
(targets > 1) ? host->name : "", (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0);
}