Avoid need for cast in CLI shell_check_oom() calls.

FossilOrigin-Name: c88550ef6711b03a81e2e6d121e2eb99ccff6e925c025dd6e85dd81088508400

diff --git a/manifest b/manifest
index ed423c62d2accb222be12322b32b1ad52dd2ca88..d6cd4f55c8be07da5d83159cc02395f632e4a61e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sunchecked\sreturn\sin\sCLI\s.dbi\scommand.\s([forum\s79e2cd1bc](forum:)79e2cd1bc)
-D 2023-04-22T09:14:22.636
+C Avoid\sneed\sfor\scast\sin\sCLI\sshell_check_oom()\scalls.
+D 2023-04-22T09:26:36.892
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -633,7 +633,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c f879cef11c462a2c37a8c906932781e384c3bb32042c355a704a043029c90d27
-F src/shell.c.in bc9c19ce1ed333a588efe9938f95737134ae2cfee8b9fa068f02eb0911667369
+F src/shell.c.in ac2fd1e1c0c0c5b1b3fcb3eaf0979599f8741a7ba3dfd9746b0c58fd67aa4091
 F src/sqlite.h.in 4fff9c6cc5d4cbba9532a668112efb6dc469c425e1a2196664d7c07d508363ef
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2059,8 +2059,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7809e7ce6a70657b8ea239eb4778698f7986a658e9177a57b2fb7814c069c936
-R 971884221506697aa42bffd1340dd9c8
+P 81a74ee9d66ba23dfadd875e372ce96491dd6bf146e03e7fec8c3fd98e6be825
+R 888832a9c27abfed9d01271116b52d4d
 U larrybr
-Z 474a941f83c00eb962a4baaa47422704
+Z 2e700a9c3ffdbd06ea1f995ee54b1148
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 92d90b16e7d40773b6214df380f9f0e4635e99e9..43336de39498ceade19f09d8e4f2b611670b91d3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-81a74ee9d66ba23dfadd875e372ce96491dd6bf146e03e7fec8c3fd98e6be825
\ No newline at end of file
+c88550ef6711b03a81e2e6d121e2eb99ccff6e925c025dd6e85dd81088508400
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 8d65071e4e5e5336d6d007dbe55e8c77a677d4c4..49cdc984506f1938d46d135b5b35444f47c618b1 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -765,7 +765,7 @@ static void shell_out_of_memory(void){
 /* Check a pointer to see if it is NULL.  If it is NULL, exit with an
 ** out-of-memory error.
 */
-static void shell_check_oom(void *p){
+static void shell_check_oom(const void *p){
   if( p==0 ) shell_out_of_memory();
 }
 
@@ -3810,7 +3810,7 @@ static void exec_prepared_stmt_columnar(
   azData = sqlite3_malloc64( nAlloc*sizeof(char*) );
   shell_check_oom(azData);
   azNextLine = sqlite3_malloc64( nColumn*sizeof(char*) );
-  shell_check_oom((void*)azNextLine);
+  shell_check_oom(azNextLine);
   memset((void*)azNextLine, 0, nColumn*sizeof(char*) );
   if( p->cmOpts.bQuote ){
     azQuoted = sqlite3_malloc64( nColumn*sizeof(char*) );
@@ -6242,7 +6242,7 @@ static int shell_dbinfo_command(ShellState *p, int nArg, char **azArg){
    && sqlite3_column_bytes(pStmt,0)>100
   ){
     const u8 *pb = sqlite3_column_blob(pStmt,0);
-    shell_check_oom((void*)pb);
+    shell_check_oom(pb);
     memcpy(aHdr, pb, 100);
     sqlite3_finalize(pStmt);
   }else{