From 82ba72ad7a4121524ee989cde09d61dab6b34dbc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 29 Apr 2019 08:39:34 -0700 Subject: [PATCH] =?utf8?q?Replace=20=E2=80=98/*=20FALLTHROUGH!=20*/?= =?utf8?q?=E2=80=99=20with=20=E2=80=98break;=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * src/data.c (set_internal, set_default_internal): Replace obsolescent /* FALLTHROUGH! */ comments with ‘break;’, as ‘FALLTHROUGH;’ is not needed here. --- src/data.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/data.c b/src/data.c index 7928a1dc41d..476d28eadbc 100644 --- a/src/data.c +++ b/src/data.c @@ -1301,15 +1301,13 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, enum Set_Internal_Bind bindflag) { bool voide = EQ (newval, Qunbound); - struct Lisp_Symbol *sym; - Lisp_Object tem1; /* If restoring in a dead buffer, do nothing. */ /* if (BUFFERP (where) && NILP (XBUFFER (where)->name)) return; */ CHECK_SYMBOL (symbol); - sym = XSYMBOL (symbol); + struct Lisp_Symbol *sym = XSYMBOL (symbol); switch (sym->u.s.trapped_write) { case SYMBOL_NOWRITE: @@ -1328,9 +1326,10 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, bindflag == SET_INTERNAL_UNBIND? Qunlet : voide? Qmakunbound : Qset), where); - /* FALLTHROUGH! */ + break; + case SYMBOL_UNTRAPPED_WRITE: - break; + break; default: emacs_abort (); } @@ -1363,8 +1362,9 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, /* Find the new binding. */ XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ - tem1 = assq_no_quit (symbol, - BVAR (XBUFFER (where), local_var_alist)); + Lisp_Object tem1 + = assq_no_quit (symbol, + BVAR (XBUFFER (where), local_var_alist)); set_blv_where (blv, where); blv->found = true; @@ -1649,10 +1649,8 @@ void set_default_internal (Lisp_Object symbol, Lisp_Object value, enum Set_Internal_Bind bindflag) { - struct Lisp_Symbol *sym; - CHECK_SYMBOL (symbol); - sym = XSYMBOL (symbol); + struct Lisp_Symbol *sym = XSYMBOL (symbol); switch (sym->u.s.trapped_write) { case SYMBOL_NOWRITE: @@ -1669,9 +1667,10 @@ set_default_internal (Lisp_Object symbol, Lisp_Object value, /* Setting due to thread switching doesn't count. */ && bindflag != SET_INTERNAL_THREAD_SWITCH) notify_variable_watchers (symbol, value, Qset_default, Qnil); - /* FALLTHROUGH! */ + break; + case SYMBOL_UNTRAPPED_WRITE: - break; + break; default: emacs_abort (); } -- 2.39.2