libedit: remove redundant break statements after EL_ABORT

Author: rillig

lib/libedit/el.c

@@ -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;
 	}

lib/libedit/el.h

@@ -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_internal(const char *, FILE *, FILE *,
 					 __FILE__, __LINE__); \
 				fprintf a; \
 				abort(); \
-			} while( /*CONSTCOND*/0);
+			} while (0)
 #else
 #define EL_ABORT(a)	abort()
 #endif

lib/libedit/keymacro.c

@@ -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 *ptr, const wchar_t *str,
 		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 *ptr, const wchar_t *str,
 			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 *ptr)
 		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 wchar_t *key, keymacro_value_t *val,
 			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,

lib/libedit/map.c

@@ -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 wchar_t **argv)
 	/* coverity[dead_error_begin] */
 	default:
 		EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
-		break;
 	}
 	return 0;
 }

lib/libedit/read.c

@@ -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 *cmdnum, wchar_t *ch)
 				return -1;
 			default:
 				EL_ABORT((el->el_errfile, "Bad XK_ type \n"));
-				break;
 			}
 		}
 	} while (cmd == ED_SEQUENCE_LEAD_IN);