rpki-client: move inherit in {ip,as}_warn()

While alphabetic order makes sense, having inherit between individual
AS and IP entries and ranges makes little sense. Use the order that we
have elsewhere.

ok claudio job

diff --git a/usr.sbin/rpki-client/as.c b/usr.sbin/rpki-client/as.c
index 68941ad..6f64a73 100644 (file)
--- a/usr.sbin/rpki-client/as.c
+++ b/usr.sbin/rpki-client/as.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: as.c,v 1.14 2023/10/18 07:04:24 tb Exp $ */
+/*     $OpenBSD: as.c,v 1.15 2023/10/18 07:10:24 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -143,13 +143,13 @@ as_warn(const char *fn, const struct cert_as *cert, const char *msg)
        case CERT_AS_ID:
                warnx("%s: AS %u: %s", fn, cert->id, msg);
                break;
-       case CERT_AS_INHERIT:
-               warnx("%s: AS (inherit): %s", fn, msg);
-               break;
        case CERT_AS_RANGE:
                warnx("%s: AS range %u--%u: %s", fn, cert->range.min,
                    cert->range.max, msg);
                break;
+       case CERT_AS_INHERIT:
+               warnx("%s: AS (inherit): %s", fn, msg);
+               break;
        default:
                warnx("%s: corrupt cert", fn);
                break;

diff --git a/usr.sbin/rpki-client/ip.c b/usr.sbin/rpki-client/ip.c
index 3d41bb1..a754172 100644 (file)
--- a/usr.sbin/rpki-client/ip.c
+++ b/usr.sbin/rpki-client/ip.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip.c,v 1.30 2023/10/18 07:08:19 tb Exp $ */
+/*     $OpenBSD: ip.c,v 1.31 2023/10/18 07:10:24 tb Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -342,13 +342,13 @@ ip_warn(const char *fn, const struct cert_ip *cert, const char *msg)
                ip_addr_print(&cert->ip, cert->afi, buf, sizeof(buf));
                warnx("%s: %s: %s", fn, buf, msg);
                break;
-       case CERT_IP_INHERIT:
-               warnx("%s: (inherit): %s", fn, msg);
-               break;
        case CERT_IP_RANGE:
                ip_addr_range_print(&cert->range, cert->afi, buf, sizeof(buf));
                warnx("%s: %s: %s", fn, buf, msg);
                break;
+       case CERT_IP_INHERIT:
+               warnx("%s: (inherit): %s", fn, msg);
+               break;
        default:
                warnx("%s: corrupt cert", fn);
                break;