Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Apr 2018 03:42:06 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r332532 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua
Message-ID:  <201804160342.w3G3g6IS015541@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Mon Apr 16 03:42:06 2018
New Revision: 332532
URL: https://svnweb.freebsd.org/changeset/base/332532

Log:
  MFC r329771: MFV r329770: 9035 zfs: this statement may fall through
  
  illumos/illumos-gate@46ac8fdfc5a1f9d8240c79a6ae5b2889cbe83553
  
  Reviewed by: Yuri Pankov <yuripv@yuripv.net>
  Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
  Reviewed by: Matthew Ahrens <mahrens@delphix.com>
  Approved by: Dan McDonald <danmcd@joyent.com>
  Author: Toomas Soome <tsoome@me.com>

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lgc.c
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/llex.c
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lstrlib.c
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/ltable.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lgc.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lgc.c	Mon Apr 16 03:41:21 2018	(r332531)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lgc.c	Mon Apr 16 03:42:06 2018	(r332532)
@@ -677,7 +677,7 @@ static void freeobj (lua_State *L, GCObject *o) {
     case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break;
     case LUA_TSHRSTR:
       G(L)->strt.nuse--;
-      /* go through */
+      /* FALLTHROUGH */
     case LUA_TLNGSTR: {
       luaM_freemem(L, o, sizestring(gco2ts(o)));
       break;

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/llex.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/llex.c	Mon Apr 16 03:41:21 2018	(r332531)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/llex.c	Mon Apr 16 03:42:06 2018	(r332532)
@@ -475,6 +475,7 @@ static int llex (LexState *ls, SemInfo *seminfo) {
         else if (!lisdigit(ls->current)) return '.';
         /* else go through */
       }
+      /* FALLTHROUGH */
       case '0': case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9': {
         read_numeral(ls, seminfo);

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lstrlib.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lstrlib.c	Mon Apr 16 03:41:21 2018	(r332531)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/lstrlib.c	Mon Apr 16 03:42:06 2018	(r332532)
@@ -519,7 +519,7 @@ static const char *match (MatchState *ms, const char *
             }
             case '+':  /* 1 or more repetitions */
               s++;  /* 1 match already done */
-              /* go through */
+              /* FALLTHROUGH */
             case '*':  /* 0 or more repetitions */
               s = max_expand(ms, s, p, ep);
               break;

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/ltable.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/ltable.c	Mon Apr 16 03:41:21 2018	(r332531)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/ltable.c	Mon Apr 16 03:42:06 2018	(r332532)
@@ -490,6 +490,7 @@ const TValue *luaH_get (Table *t, const TValue *key) {
         return luaH_getint(t, k);  /* use specialized version */
       /* else go through */
     }
+    /* FALLTHROUGH */
     default: {
       Node *n = mainposition(t, key);
       do {  /* check whether `key' is somewhere in the chain */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804160342.w3G3g6IS015541>