9144 libsqlite: this statement may fall through

Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Joshua M. Clulow <josh@sysmgr.org>

7 files changed, 10 insertions, 28 deletions

diff --git a/usr/src/lib/libsqlite/src/expr.c b/usr/src/lib/libsqlite/src/expr.c
index 1155d045f6..f1b187974e 100644
--- a/usr/src/lib/libsqlite/src/expr.c
+++ b/usr/src/lib/libsqlite/src/expr.c
@@ -1,6 +1,3 @@
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
 ** 2001 September 15
 **
@@ -652,6 +649,7 @@ int sqliteExprResolveIds(
     }
     /* A lone identifier is the name of a columnd.
     */
+    /* FALLTHROUGH */
     case TK_ID: {
       if( lookupName(pParse, 0, 0, &pExpr->token, pSrcList, pEList, pExpr) ){
         return 1;
@@ -894,6 +892,7 @@ int sqliteExprCheck(Parse *pParse, Expr *pExpr, int allowAgg, int *pIsAgg){
         pExpr->dataType = SQLITE_SO_TEXT;
       }
     }
+    /* FALLTHROUGH */
     default: {
       if( pExpr->pLeft ){
         nErr = sqliteExprCheck(pParse, pExpr->pLeft, allowAgg, pIsAgg);
@@ -1081,8 +1080,8 @@ void sqliteExprCode(Parse *pParse, Expr *pExpr){
       if( pParse->db->file_format>=4 && sqliteExprType(pExpr)==SQLITE_SO_TEXT ){
         op += 6;  /* Convert numeric opcodes to text opcodes */
       }
-      /* Fall through into the next case */
     }
+    /* FALLTHROUGH */
     case TK_AND:
     case TK_OR:
     case TK_PLUS:
@@ -1127,6 +1126,7 @@ void sqliteExprCode(Parse *pParse, Expr *pExpr){
       }
       /* Fall through into TK_NOT */
     }
+    /* FALLTHROUGH */
     case TK_BITNOT:
     case TK_NOT: {
       sqliteExprCode(pParse, pExpr->pLeft);
diff --git a/usr/src/lib/libsqlite/src/insert.c b/usr/src/lib/libsqlite/src/insert.c
index 334acbf941..c6080a9a3c 100644
--- a/usr/src/lib/libsqlite/src/insert.c
+++ b/usr/src/lib/libsqlite/src/insert.c
@@ -1,6 +1,3 @@
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
 ** 2001 September 15
 **
@@ -722,8 +719,8 @@ void sqliteGenerateConstraintChecks(
     switch( onError ){
       default: {
         onError = OE_Abort;
-        /* Fall thru into the next case */
       }
+      /* FALLTHROUGH */
       case OE_Rollback:
       case OE_Abort:
       case OE_Fail: {
diff --git a/usr/src/lib/libsqlite/src/select.c b/usr/src/lib/libsqlite/src/select.c
index 92acc32c98..8b5c941075 100644
--- a/usr/src/lib/libsqlite/src/select.c
+++ b/usr/src/lib/libsqlite/src/select.c
@@ -1,6 +1,3 @@
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
 ** 2001 September 15
 **
@@ -19,7 +16,6 @@
 */
 #include "sqliteInt.h"
 
-
 /*
 ** Allocate a new Select structure and return a pointer to that
 ** structure.
@@ -1347,8 +1343,8 @@ static int multiSelect(Parse *pParse, Select *p, int eDest, int iParm){
         if( rc ) return rc;
         break;
       }
-      /* For UNION ALL ... ORDER BY fall through to the next case */
     }
+    /* FALLTHROUGH */
     case TK_EXCEPT:
     case TK_UNION: {
       int unionTab;    /* Cursor number of the temporary table holding result */
diff --git a/usr/src/lib/libsqlite/src/tokenize.c b/usr/src/lib/libsqlite/src/tokenize.c
index c7a6da42cb..914326708c 100644
--- a/usr/src/lib/libsqlite/src/tokenize.c
+++ b/usr/src/lib/libsqlite/src/tokenize.c
@@ -1,6 +1,3 @@
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
 ** 2001 September 15
 **
@@ -443,8 +440,8 @@ int sqliteRunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
       }
       case TK_SEMI: {
         pParse->zTail = &zSql[i];
-        /* Fall thru into the default case */
       }
+      /* FALLTHROUGH */
       default: {
         sqliteParser(pEngine, tokenType, pParse->sLastToken, pParse);
         lastTokenParsed = tokenType;
diff --git a/usr/src/lib/libsqlite/src/vdbe.c b/usr/src/lib/libsqlite/src/vdbe.c
index d631a98543..35683a44ff 100644
--- a/usr/src/lib/libsqlite/src/vdbe.c
+++ b/usr/src/lib/libsqlite/src/vdbe.c
@@ -3,8 +3,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
 ** 2001 September 15
 **
@@ -2200,8 +2198,8 @@ case OP_Transaction: {
       }
       case SQLITE_READONLY: {
         rc = SQLITE_OK;
-        /* Fall thru into the next case */
       }
+      /* FALLTHROUGH */
       case SQLITE_OK: {
         p->inTempTrans = 0;
         busy = 0;
diff --git a/usr/src/lib/libsqlite/src/vdbeaux.c b/usr/src/lib/libsqlite/src/vdbeaux.c
index aea32dd8f8..014cd3d32e 100644
--- a/usr/src/lib/libsqlite/src/vdbeaux.c
+++ b/usr/src/lib/libsqlite/src/vdbeaux.c
@@ -1,6 +1,3 @@
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
 ** 2003 September 6
 **
@@ -864,8 +861,8 @@ int sqliteVdbeReset(Vdbe *p, char **pzErrMsg){
           }
           break;
         }
-        /* Fall through to ROLLBACK */
       }
+      /* FALLTHROUGH */
       case OE_Rollback: {
         sqliteRollbackAll(db);
         db->flags &= ~SQLITE_InTrans;
diff --git a/usr/src/lib/libsqlite/tool/lemon.c b/usr/src/lib/libsqlite/tool/lemon.c
index d0321b0f55..03d96e3922 100644
--- a/usr/src/lib/libsqlite/tool/lemon.c
+++ b/usr/src/lib/libsqlite/tool/lemon.c
@@ -1,6 +1,3 @@
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
 ** This file contains all sources (including headers) to the LEMON
 ** LALR(1) parser generator.  The sources have been combined into a
@@ -1915,7 +1912,7 @@ struct pstate *psp;
       psp->preccounter = 0;
       psp->firstrule = psp->lastrule = 0;
       psp->gp->nrule = 0;
-      /* Fall thru to next case */
+      /* FALLTHROUGH */
     case WAITING_FOR_DECL_OR_RULE:
       if( x[0]=='%' ){
         psp->state = WAITING_FOR_DECL_KEYWORD;