[src/trunk]: src/usr.bin/unzip Remove the "original line"

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dfeaf22624bc
branches:  trunk
changeset: 959557:dfeaf22624bc
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 18 18:06:02 2021 +0000

description:
Remove the "original line"
Fix lint comment

diffstat:

 usr.bin/unzip/unzip.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 341b7f1b8cda -r dfeaf22624bc usr.bin/unzip/unzip.c
--- a/usr.bin/unzip/unzip.c     Thu Feb 18 18:02:09 2021 +0000
+++ b/usr.bin/unzip/unzip.c     Thu Feb 18 18:06:02 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: unzip.c,v 1.26 2021/02/18 17:58:51 christos Exp $ */
+/* $NetBSD: unzip.c,v 1.27 2021/02/18 18:06:02 christos Exp $ */
 
 /*-
  * Copyright (c) 2009, 2010 Joerg Sonnenberger <joerg%NetBSD.org@localhost>
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: unzip.c,v 1.26 2021/02/18 17:58:51 christos Exp $");
+__RCSID("$NetBSD: unzip.c,v 1.27 2021/02/18 18:06:02 christos Exp $");
 
 #ifdef __GLIBC__
 #define _GNU_SOURCE
@@ -97,7 +97,7 @@
                int acret = (call);                             \
                if (acret != ARCHIVE_OK)                        \
                        errorx("%s", archive_error_string(a));  \
-       } while (/*CONSTCONST*/0)
+       } while (/*CONSTCOND*/0)
 
 /*
  * Indicates that last info() did not end with EOL.  This helps error() et
@@ -991,7 +991,6 @@
 #endif
 
        while ((opt = getopt(argc, argv, "aCcd:fjLlnopP:qtuvyx:")) != -1)
-       while ((opt = getopt(argc, argv, "aCcd:fjLlnopqtuvyx:")) != -1)
                switch (opt) {
                case 'a':
                        a_opt = 1;