diff options
| author | drh <drh@noemail.net> | 2020-12-04 16:04:45 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-12-04 16:04:45 +0000 |
| commit | fda8e49207df6036e229e73cfe6b614416a486b1 (patch) | |
| tree | 6ea568be12493b9b6863c0232fda42700fe104b2 /src | |
| parent | c0622a4d0307a30a9eb2aa650722aef1340f04cb (diff) | |
| download | sqlite-fda8e49207df6036e229e73cfe6b614416a486b1.tar.gz sqlite-fda8e49207df6036e229e73cfe6b614416a486b1.zip | |
Further changes to the trace variables to try to eliminate (harmless) compiler
warnings in all configurations.
FossilOrigin-Name: 3a4c98b989964e3e366fe9519e9b5ed935e893d5b69d92bc0388a14c7e7938e6
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/shell.c.in | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c index 815583acb..bbf81e778 100644 --- a/src/main.c +++ b/src/main.c @@ -4265,17 +4265,15 @@ int sqlite3_test_control(int op, ...){ ** op==3 Set sqlite3WhereTrace to the value *ptr */ case SQLITE_TESTCTRL_TRACEFLAGS: { -#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) - int op = va_arg(ap, int); + int opTrace = va_arg(ap, int); u32 *ptr = va_arg(ap, u32*); - switch( op ){ + switch( opTrace ){ case 0: *ptr = sqlite3SelectTrace; break; case 1: sqlite3SelectTrace = *ptr; break; case 2: *ptr = sqlite3WhereTrace; break; case 3: sqlite3WhereTrace = *ptr; break; } break; -#endif } } va_end(ap); diff --git a/src/shell.c.in b/src/shell.c.in index 4465ad549..826523870 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -9233,7 +9233,7 @@ static int do_meta_command(char *zLine, ShellState *p){ }else if( c=='s' && n==11 && strncmp(azArg[0], "selecttrace", n)==0 ){ - unsigned int x = nArg>=2 ? (int)integerValue(azArg[1]) : 0xffffffff; + unsigned int x = nArg>=2 ? (unsigned int)integerValue(azArg[1]) : 0xffffffff; sqlite3_test_control(SQLITE_TESTCTRL_TRACEFLAGS, 1, &x); }else |