Module Name: src
Committed By: rillig
Date: Fri Jan 3 00:40:08 UTC 2025
Modified Files:
src/lib/libedit: el.c el.h keymacro.c map.c read.c
Log Message:
libedit: remove redundant break statements after EL_ABORT
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/lib/libedit/el.c
cvs rdiff -u -r1.47 -r1.48 src/lib/libedit/el.h
cvs rdiff -u -r1.24 -r1.25 src/lib/libedit/keymacro.c
cvs rdiff -u -r1.55 -r1.56 src/lib/libedit/map.c
cvs rdiff -u -r1.108 -r1.109 src/lib/libedit/read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.101 src/lib/libedit/el.c:1.102
--- src/lib/libedit/el.c:1.101 Sun Oct 30 19:11:31 2022
+++ src/lib/libedit/el.c Fri Jan 3 00:40:08 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.101 2022/10/30 19:11:31 christos Exp $ */
+/* $NetBSD: el.c,v 1.102 2025/01/03 00:40:08 rillig Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
#else
-__RCSID("$NetBSD: el.c,v 1.101 2022/10/30 19:11:31 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.102 2025/01/03 00:40:08 rillig Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -274,7 +274,6 @@ el_wset(EditLine *el, int op, ...)
default:
rv = -1;
EL_ABORT((el->el_errfile, "Bad op %d\n", op));
- break;
}
break;
}
Index: src/lib/libedit/el.h
diff -u src/lib/libedit/el.h:1.47 src/lib/libedit/el.h:1.48
--- src/lib/libedit/el.h:1.47 Fri May 17 02:59:08 2024
+++ src/lib/libedit/el.h Fri Jan 3 00:40:08 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.47 2024/05/17 02:59:08 christos Exp $ */
+/* $NetBSD: el.h,v 1.48 2025/01/03 00:40:08 rillig Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -153,7 +153,7 @@ libedit_private EditLine *el_init_intern
__FILE__, __LINE__); \
fprintf a; \
abort(); \
- } while( /*CONSTCOND*/0);
+ } while (0)
#else
#define EL_ABORT(a) abort()
#endif
Index: src/lib/libedit/keymacro.c
diff -u src/lib/libedit/keymacro.c:1.24 src/lib/libedit/keymacro.c:1.25
--- src/lib/libedit/keymacro.c:1.24 Tue Jul 23 10:18:52 2019
+++ src/lib/libedit/keymacro.c Fri Jan 3 00:40:08 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: keymacro.c,v 1.24 2019/07/23 10:18:52 christos Exp $ */
+/* $NetBSD: keymacro.c,v 1.25 2025/01/03 00:40:08 rillig Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: keymacro.c,v 1.24 2019/07/23 10:18:52 christos Exp $");
+__RCSID("$NetBSD: keymacro.c,v 1.25 2025/01/03 00:40:08 rillig Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -346,7 +346,6 @@ node__try(EditLine *el, keymacro_node_t
default:
EL_ABORT((el->el_errfile, "Bad XK_ type %d\n",
ptr->type));
- break;
}
switch (ptr->type = ntype) {
@@ -359,7 +358,6 @@ node__try(EditLine *el, keymacro_node_t
break;
default:
EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
- break;
}
} else {
/* still more chars to go */
@@ -444,7 +442,6 @@ node__put(EditLine *el, keymacro_node_t
break;
default:
EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ptr->type));
- break;
}
el_free(ptr);
}
@@ -614,7 +611,6 @@ keymacro_kprint(EditLine *el, const wcha
break;
default:
EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
- break;
}
else
(void) fprintf(el->el_outfile, fmt, ct_encode_string(key,
Index: src/lib/libedit/map.c
diff -u src/lib/libedit/map.c:1.55 src/lib/libedit/map.c:1.56
--- src/lib/libedit/map.c:1.55 Sun Oct 30 19:11:31 2022
+++ src/lib/libedit/map.c Fri Jan 3 00:40:08 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.55 2022/10/30 19:11:31 christos Exp $ */
+/* $NetBSD: map.c,v 1.56 2025/01/03 00:40:08 rillig Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: map.c,v 1.55 2022/10/30 19:11:31 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.56 2025/01/03 00:40:08 rillig Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1390,7 +1390,6 @@ map_bind(EditLine *el, int argc, const w
/* coverity[dead_error_begin] */
default:
EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
- break;
}
return 0;
}
Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.108 src/lib/libedit/read.c:1.109
--- src/lib/libedit/read.c:1.108 Sun Oct 30 19:11:31 2022
+++ src/lib/libedit/read.c Fri Jan 3 00:40:08 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.108 2022/10/30 19:11:31 christos Exp $ */
+/* $NetBSD: read.c,v 1.109 2025/01/03 00:40:08 rillig Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: read.c,v 1.108 2022/10/30 19:11:31 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.109 2025/01/03 00:40:08 rillig Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -265,7 +265,6 @@ read_getcmd(EditLine *el, el_action_t *c
return -1;
default:
EL_ABORT((el->el_errfile, "Bad XK_ type \n"));
- break;
}
}
} while (cmd == ED_SEQUENCE_LEAD_IN);
