summaryrefslogtreecommitdiffstats
path: root/plugins-root
diff options
context:
space:
mode:
authorDanijel Tasov <m@rbfh.de>2023-09-27 09:52:34 +0200
committerDanijel Tasov <m@rbfh.de>2023-09-27 11:14:18 +0200
commite6d2b0b08b72eaad11de8d85d13ea995ebcb9561 (patch)
treea0db233605c5b66cd3a4e8deb413cfc2cb34a626 /plugins-root
parentc67aa6d45ff6abc8ca78469cf2a2e432df6f2646 (diff)
downloadmonitoring-plugins-e6d2b0b08b72eaad11de8d85d13ea995ebcb9561.tar.gz
cleanup more merge debris
Signed-off-by: Danijel Tasov <m@rbfh.de>
Diffstat (limited to 'plugins-root')
-rw-r--r--plugins-root/check_icmp.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index a537c9c0..bb6f85b9 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -42,6 +42,7 @@ char *progname;
42const char *copyright = "2005-2008"; 42const char *copyright = "2005-2008";
43const char *email = "devel@monitoring-plugins.org"; 43const char *email = "devel@monitoring-plugins.org";
44 44
45/* what does that do? */
45#ifdef __sun 46#ifdef __sun
46#define _XPG4_2 47#define _XPG4_2
47#endif 48#endif
@@ -761,11 +762,7 @@ main(int argc, char **argv)
761 } 762 }
762 763
763 host = list; 764 host = list;
764//<<<<<<< HEAD FIXME 765 table = malloc(sizeof(struct rta_host *) * targets);
765 table = (struct rta_host**)malloc(sizeof(struct rta_host **) * targets);
766//=======
767// table = malloc(sizeof(struct rta_host *) * targets);
768//>>>>>>> jitter-orig
769 i = 0; 766 i = 0;
770 while(host) { 767 while(host) {
771 host->id = i*packets; 768 host->id = i*packets;
@@ -1473,11 +1470,9 @@ finish(int sig)
1473 while(host) { 1470 while(host) {
1474 if(debug) puts(""); 1471 if(debug) puts("");
1475 if (rta_mode && host->pl<100) { 1472 if (rta_mode && host->pl<100) {
1476 // 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); 1473 printf("%srta=%0.3fms;%0.3f;%0.3f;0; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
1477 printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
1478 (targets > 1) ? host->name : "", 1474 (targets > 1) ? host->name : "",
1479 host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000, 1475 host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
1480 (targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl,
1481 (targets > 1) ? host->name : "", (float)host->rtmax / 1000, 1476 (targets > 1) ? host->name : "", (float)host->rtmax / 1000,
1482 (targets > 1) ? host->name : "", (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0); 1477 (targets > 1) ? host->name : "", (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0);
1483 } 1478 }