aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrh <>2022-07-11 19:29:48 +0000
committerdrh <>2022-07-11 19:29:48 +0000
commit31114a38cc56733270a1d6b0601d4776c7241636 (patch)
tree7b6ad868f7d63ba8afc81195bc19eaf8e904e9a0
parent42929738106bbbcf01fe1b08454000d611663673 (diff)
downloadsqlite-31114a38cc56733270a1d6b0601d4776c7241636.tar.gz
sqlite-31114a38cc56733270a1d6b0601d4776c7241636.zip
Fix harmless compiler warnings.
FossilOrigin-Name: 9931bb202e2a4e0a980ebc6164e8f1da6c724e07242f448058e1c4cc3694b2b3
-rw-r--r--ext/misc/stmt.c2
-rw-r--r--manifest20
-rw-r--r--manifest.uuid2
-rw-r--r--src/main.c1
-rw-r--r--src/sqliteInt.h2
-rw-r--r--src/treeview.c6
6 files changed, 22 insertions, 11 deletions
diff --git a/ext/misc/stmt.c b/ext/misc/stmt.c
index ac0ae6f0f..42f4d651d 100644
--- a/ext/misc/stmt.c
+++ b/ext/misc/stmt.c
@@ -220,7 +220,7 @@ static int stmtFilter(
ppRow = &pCur->pRow;
for(p=sqlite3_next_stmt(pCur->db, 0); p; p=sqlite3_next_stmt(pCur->db, p)){
const char *zSql = sqlite3_sql(p);
- int nSql = zSql ? strlen(zSql)+1 : 0;
+ sqlite3_int64 nSql = zSql ? strlen(zSql)+1 : 0;
StmtRow *pNew = (StmtRow*)sqlite3_malloc(sizeof(StmtRow) + nSql);
if( pNew==0 ) return SQLITE_NOMEM;
diff --git a/manifest b/manifest
index 18d353420..48be7542d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.39.1.
-D 2022-07-11T14:44:28.505
+C Fix\sharmless\scompiler\swarnings.
+D 2022-07-11T19:29:48.871
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -344,7 +344,7 @@ F ext/misc/shathree.c 7b17615869a495659f1569ada1d8d3d21b4a24614f2746d93cc87ef7c0
F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
F ext/misc/spellfix.c 94df9bbfa514a563c1484f684a2df3d128a2f7209a84ca3ca100c68a0163e29f
F ext/misc/sqlar.c 0ace5d3c10fe736dc584bf1159a36b8e2e60fab309d310cd8a0eecd9036621b6
-F ext/misc/stmt.c 72b23e1746bedcf6e36907e972383e7eb74940344da90b2965149739b55cc801
+F ext/misc/stmt.c 2d68161cb32de25b4510cb8662af2e1ffd4e41c6b7bfb3aa64a49468bb6d36c1
F ext/misc/templatevtab.c 8a16a91a5ceaccfcbd6aaaa56d46828806e460dd194965b3f77bf38f14b942c4
F ext/misc/totype.c fa4aedeb07f66169005dffa8de3b0a2b621779fd44f85c103228a42afa71853b
F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a030b
@@ -534,7 +534,7 @@ F src/insert.c 173845e5a6bac96ae937409e4f876b631f26b31dabb9df8fd0eb3b130b2bb3a7
F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
-F src/main.c 62100512f2f86e8af2e17cc41644a358868d5b26c691118b6ef31fea066d49d3
+F src/main.c b91c7e71af6f33640c35b8239a285040aad8dfcfdaaf979152e743c0f8017ea8
F src/malloc.c a9127efdcef92d6934c6339ea9813075b90edc0ce2e5c723556381a3828fb720
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -575,7 +575,7 @@ F src/shell.c.in 08e59f1cb9d9b1180aba52861aaada0c95f6ddd210488719684e160a0724c80
F src/sqlite.h.in 01573eae96721f2a8ee2a9e3b7140ceeba2e9c44350911890b89b8ff0dcf6781
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
-F src/sqliteInt.h 8353e96646372efdb0795a13cd9949831b4992c928de8f5c43b2524e8a4c6e7b
+F src/sqliteInt.h 059d5a017ebf488c7484f79ea507f56b2bf4bb700f340abf91c5d2227869f275
F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -635,7 +635,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
F src/tokenize.c 36eb0799e487759bbe73e5742b82ee676f06cea2515ff578d03c59a74ccf2d6c
-F src/treeview.c 0bd550f5974565eba541db339906be7a3f9e91beafb879cb40705382887f08e1
+F src/treeview.c 9591c77f710a8408337e702ab84a3e41b181f202021da9e21f2e0076008e6d03
F src/trigger.c 61bea163b1fa3039bc572ed8312461b978e5c527e5301f302b078f4c1ccdec6a
F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877
F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
@@ -1978,8 +1978,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P eaef7b71900ef7701c11f07ec8b0ca3fec7e055ce8fd9c769f36669b482de134
-R 3b09436dc6c208f27c24105df847e5df
+P 88b1b0327f6d2843a4c84b4f5249162cf81a86bfd43f9412ebe6142d7c2df2fb
+Q +3fe19452499afc8e6b38905e1ce7e9153adbfebf10dccf39da4b7f1b0cd24f05
+Q +4d6f907712e35eddf6af36eb823c3ccdfcdff1c63b2c224b3bcf34ffec95d511
+R bc9e6dfbdeec42a03dbc828bb643b3ee
U drh
-Z 808fce68cb0000820a1b5dadb7954be9
+Z db58db4b1a11aa135449c69a9c71bf61
# Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2214d5b72..bb42a357d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88b1b0327f6d2843a4c84b4f5249162cf81a86bfd43f9412ebe6142d7c2df2fb \ No newline at end of file
+9931bb202e2a4e0a980ebc6164e8f1da6c724e07242f448058e1c4cc3694b2b3 \ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 6865121dd..d905ac8ea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4116,6 +4116,7 @@ int sqlite3_test_control(int op, ...){
sqlite3ShowWindow(0);
sqlite3ShowWinFunc(0);
#endif
+ sqlite3ShowSelect(0);
}
#endif
break;
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 45e345346..106a5d147 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4474,6 +4474,7 @@ char *sqlite3VMPrintf(sqlite3*,const char*, va_list);
void sqlite3TreeViewSelect(TreeView*, const Select*, u8);
void sqlite3TreeViewWith(TreeView*, const With*, u8);
void sqlite3TreeViewUpsert(TreeView*, const Upsert*, u8);
+#if TREETRACE_ENABLED
void sqlite3TreeViewDelete(const With*, const SrcList*, const Expr*,
const ExprList*,const Expr*, const Trigger*);
void sqlite3TreeViewInsert(const With*, const SrcList*,
@@ -4482,6 +4483,7 @@ char *sqlite3VMPrintf(sqlite3*,const char*, va_list);
void sqlite3TreeViewUpdate(const With*, const SrcList*, const ExprList*,
const Expr*, int, const ExprList*, const Expr*,
const Upsert*, const Trigger*);
+#endif
#ifndef SQLITE_OMIT_TRIGGER
void sqlite3TreeViewTriggerStep(TreeView*, const TriggerStep*, u8, u8);
void sqlite3TreeViewTrigger(TreeView*, const Trigger*, u8, u8);
diff --git a/src/treeview.c b/src/treeview.c
index 366c4afd1..290519fe4 100644
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -999,6 +999,7 @@ void sqlite3TreeViewUpsert(
sqlite3TreeViewPop(&pView);
}
+#if TREETRACE_ENABLED
/*
** Generate a human-readable diagram of the data structure that go
** into generating an DELETE statement.
@@ -1052,7 +1053,9 @@ void sqlite3TreeViewDelete(
}
sqlite3TreeViewPop(&pView);
}
+#endif /* TREETRACE_ENABLED */
+#if TREETRACE_ENABLED
/*
** Generate a human-readable diagram of the data structure that go
** into generating an INSERT statement.
@@ -1120,7 +1123,9 @@ void sqlite3TreeViewInsert(
}
sqlite3TreeViewPop(&pView);
}
+#endif /* TREETRACE_ENABLED */
+#if TREETRACE_ENABLED
/*
** Generate a human-readable diagram of the data structure that go
** into generating an UPDATE statement.
@@ -1196,6 +1201,7 @@ void sqlite3TreeViewUpdate(
}
sqlite3TreeViewPop(&pView);
}
+#endif /* TREETRACE_ENABLED */
#ifndef SQLITE_OMIT_TRIGGER
/*