From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 6 May 2013 02:52:14 +0000 (-0700)
Subject: Rename a variable to attempt to fix an AIX compile error.
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/6eec569493db88f7043c4aa301859298d0388cb3

Rename a variable to attempt to fix an AIX compile error.

On AIX 5.1, at least when compiling with xlc, the statement

       struct mp_remove_addr *rem_addr = (struct mp_remove_addr *) opt;

gets a complaint "Syntax error: possible missing '{'?"

"/usr/include/sys/xmem.h" #defines rem_addr; I've no idea whether we're
indirectly including that, but maybe we are and maybe that's causing the
problem.
---

diff --git a/print-mptcp.c b/print-mptcp.c
index c5fad69b..17be82fa 100644
--- a/print-mptcp.c
+++ b/print-mptcp.c
@@ -217,8 +217,8 @@ static int add_addr_print(const u_char *opt, u_int opt_len, u_char flags _U_)
 
 static int remove_addr_print(const u_char *opt, u_int opt_len, u_char flags _U_)
 {
-        struct mp_remove_addr *rem_addr = (struct mp_remove_addr *) opt;
-        u_int8_t *addr_id = &rem_addr->addrs_id;
+        struct mp_remove_addr *remove_addr = (struct mp_remove_addr *) opt;
+        u_int8_t *addr_id = &remove_addr->addrs_id;
 
         if (opt_len < 4)
                 return 0;