From: meingtsla <meingtsla@users.noreply.github.com>
Date: Sun, 9 Jul 2017 15:33:33 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/traviscross/mtr into asn-open-always... 
X-Git-Tag: v0.94~26^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F166%2Fhead;p=thirdparty%2Fmtr.git

Merge branch 'master' of https://github.com/traviscross/mtr into asn-open-always-hcreate
---

32a413f5c6f11fd97a4bf4eaf2ef093005ac3355
diff --cc ui/asn.c
index c39a78e,04c8e3a..4d544b0
--- a/ui/asn.c
+++ b/ui/asn.c
@@@ -277,14 -312,20 +312,18 @@@ int is_printii
      return ((ctl->ipinfo_no >= 0) && (ctl->ipinfo_no != ctl->ipinfo_max));
  }
  
- extern void asn_open(struct mtr_ctl *ctl) {
+ void asn_open(
+     struct mtr_ctl *ctl)
+ {
 -    if (ctl->ipinfo_no >= 0) {
 -        DEB_syslog(LOG_INFO, "hcreate(%d)", IIHASH_HI);
 -        if (!(iihash = hcreate(IIHASH_HI)))
 -            error(0, errno, "ipinfo hash");
 -    }
 +    DEB_syslog(LOG_INFO, "hcreate(%d)", IIHASH_HI);
 +    if (!(iihash = hcreate(IIHASH_HI)))
 +        error(0, errno, "ipinfo hash");
  }
  
- extern void asn_close(struct mtr_ctl *ctl) {
+ void asn_close(
+     struct mtr_ctl *ctl)
+ {
 -    if ((ctl->ipinfo_no >= 0) && iihash) {
 +    if (iihash) {
          DEB_syslog(LOG_INFO, "hdestroy()");
          hdestroy();
          iihash = 0;