From: Matt Kimball <matt.kimball@gmail.com>
Date: Sat, 4 Feb 2017 21:18:13 +0000 (-0800)
Subject: cleanup: Fix #ifdef structure which confuses 'ident'
X-Git-Tag: v0.88~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8718f19f310447d84a69134260f73281f04aed0;p=thirdparty%2Fmtr.git

cleanup: Fix #ifdef structure which confuses 'ident'

The 'indent' tool is confused by some strange #ifdef structure
around HAVE_IPINFO in report.c.  Cleaned up that structure
so 'indent' can be used successfully.
---

diff --git a/ui/report.c b/ui/report.c
index 4e85c8f..2e8ba22 100644
--- a/ui/report.c
+++ b/ui/report.c
@@ -185,7 +185,7 @@ void report_close(struct mtr_ctl *ctl)
           printf("     %s%s\n", fmt_ipinfo(ctl, addr2), name);
           if (ctl->enablempls)
             print_mpls(mplss);
-        } else {
+        }
 #else
         int k;
         if (mpls->labels && z == 1 && ctl->enablempls) {
@@ -205,9 +205,6 @@ void report_close(struct mtr_ctl *ctl)
             printf("    |   +-- [MPLS: Lbl %lu Exp %u S %u TTL %u]\n", mplss->label[k], mplss->exp[k], mplss->s[k], mplss->ttl[k]);
           }
         }
-#endif
-#ifdef HAVE_IPINFO
-        }
 #endif
       }
     }
@@ -217,7 +214,7 @@ void report_close(struct mtr_ctl *ctl)
     if (is_printii(ctl)) {
       if (mpls->labels && z == 1 && ctl->enablempls)
         print_mpls(mpls);
-    } else {
+    }
 #else
     if(mpls->labels && z == 1 && ctl->enablempls) {
       int k;
@@ -225,9 +222,6 @@ void report_close(struct mtr_ctl *ctl)
         printf("    |   +-- [MPLS: Lbl %lu Exp %u S %u TTL %u]\n", mpls->label[k], mpls->exp[k], mpls->s[k], mpls->ttl[k]);
       }
     }
-#endif
-#ifdef HAVE_IPINFO
-    }
 #endif
   }
 }