From: R.E. Wolff <R.E.Wolff@BitWizard.nl>
Date: Wed, 23 Sep 2020 15:28:49 +0000 (+0200)
Subject: Changed MAXPATH to MAX_PATH for AIX compatibility. -- aixtools
X-Git-Tag: v0.94~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2407e3eaf89392f9fb3a66e51b35695986631952;p=thirdparty%2Fmtr.git

Changed MAXPATH to MAX_PATH for AIX compatibility. -- aixtools
---

diff --git a/ui/curses.c b/ui/curses.c
index 3e63da5..34bf30d 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -471,7 +471,7 @@ static void mtr_curses_hosts(
             }
 
             /* Multi path */
-            for (i = 0; i < MAXPATH; i++) {
+            for (i = 0; i < MAX_PATH; i++) {
                 addrs = net_addrs(at, i);
                 mplss = net_mplss(at, i);
                 if (addrcmp(addrs, addr, ctl->af) == 0)
diff --git a/ui/mtr.h b/ui/mtr.h
index ac38016..01536f5 100644
--- a/ui/mtr.h
+++ b/ui/mtr.h
@@ -61,7 +61,7 @@ typedef int time_t;
 
 /* net related definitions */
 #define SAVED_PINGS 200
-#define MAXPATH 8
+#define MAX_PATH 8
 #define MaxHost 256
 #define MinPort 1024
 #define MaxPort 65535
diff --git a/ui/net.c b/ui/net.c
index 8f216ce..f684b3e 100644
--- a/ui/net.c
+++ b/ui/net.c
@@ -48,7 +48,7 @@ static int packetsize;          /* packet size used by ping */
 
 struct nethost {
     ip_t addr;                  /* Latest host to respond */
-    ip_t addrs[MAXPATH];        /* For Multi paths/Path Changes: List of all hosts that have responded */
+    ip_t addrs[MAX_PATH];        /* For Multi paths/Path Changes: List of all hosts that have responded */
     int err;
     int xmit;
     int returned;
@@ -68,7 +68,7 @@ struct nethost {
     int saved[SAVED_PINGS];
     int saved_seq_offset;
     struct mplslen mpls;
-    struct mplslen mplss[MAXPATH];
+    struct mplslen mplss[MAX_PATH];
 };
 
 
@@ -239,7 +239,7 @@ static void net_process_ping(
 
 
     if (addrcmp(&nh->addr, &addrcopy, ctl->af) != 0) {
-        for (i = 0; i < MAXPATH;) {
+        for (i = 0; i < MAX_PATH;) {
             if (addrcmp(&nh->addrs[i], &nh->addr, ctl->af) == 0) {
                 found = 1; /* This host is already in the list */
                 break;
@@ -250,7 +250,7 @@ static void net_process_ping(
             i++;
         }
 
-        if (found == 0 && i < MAXPATH) {
+        if (found == 0 && i < MAX_PATH) {
             memcpy(&nh->addrs[i], &nh->addr, sockaddr_addr_size(sourcesockaddr));
 
             nh->mplss[i] = nh->mpls;
diff --git a/ui/report.c b/ui/report.c
index 26b2543..b79f593 100644
--- a/ui/report.c
+++ b/ui/report.c
@@ -185,7 +185,7 @@ void report_close(
         /* This feature shows 'loadbalances' on routes */
 
         /* Print list of all hosts that have responded from ttl = at + 1 away */
-        for (z = 0; z < MAXPATH; z++) {
+        for (z = 0; z < MAX_PATH; z++) {
             int found = 0;
             addr2 = net_addrs(at, z);
             mplss = net_mplss(at, z);