Skip to content

Commit 432a68e

Browse files
committed
sqlite: update to 3.50.4
1 parent ee68951 commit 432a68e

File tree

3 files changed

+339
-246
lines changed

3 files changed

+339
-246
lines changed

external/sqlite/shell.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8027,13 +8027,14 @@ SQLITE_EXTENSION_INIT1
80278027
# include <dirent.h>
80288028
# include <utime.h>
80298029
# include <sys/time.h>
8030+
# define STRUCT_STAT struct stat
80308031
#else
80318032
# include "windows.h"
80328033
# include <io.h>
80338034
# include <direct.h>
80348035
/* # include "test_windirent.h" */
80358036
# define dirent DIRENT
8036-
# define stat _stat
8037+
# define STRUCT_STAT struct _stat
80378038
# define chmod(path,mode) fileio_chmod(path,mode)
80388039
# define mkdir(path,mode) fileio_mkdir(path)
80398040
#endif
@@ -8224,7 +8225,7 @@ LPWSTR utf8_to_utf16(const char *z){
82248225
*/
82258226
static void statTimesToUtc(
82268227
const char *zPath,
8227-
struct stat *pStatBuf
8228+
STRUCT_STAT *pStatBuf
82288229
){
82298230
HANDLE hFindFile;
82308231
WIN32_FIND_DATAW fd;
@@ -8252,7 +8253,7 @@ static void statTimesToUtc(
82528253
*/
82538254
static int fileStat(
82548255
const char *zPath,
8255-
struct stat *pStatBuf
8256+
STRUCT_STAT *pStatBuf
82568257
){
82578258
#if defined(_WIN32)
82588259
sqlite3_int64 sz = strlen(zPath);
@@ -8276,7 +8277,7 @@ static int fileStat(
82768277
*/
82778278
static int fileLinkStat(
82788279
const char *zPath,
8279-
struct stat *pStatBuf
8280+
STRUCT_STAT *pStatBuf
82808281
){
82818282
#if defined(_WIN32)
82828283
return fileStat(zPath, pStatBuf);
@@ -8309,7 +8310,7 @@ static int makeDirectory(
83098310
int i = 1;
83108311

83118312
while( rc==SQLITE_OK ){
8312-
struct stat sStat;
8313+
STRUCT_STAT sStat;
83138314
int rc2;
83148315

83158316
for(; zCopy[i]!='/' && i<nCopy; i++);
@@ -8359,7 +8360,7 @@ static int writeFile(
83598360
** be an error though - if there is already a directory at the same
83608361
** path and either the permissions already match or can be changed
83618362
** to do so using chmod(), it is not an error. */
8362-
struct stat sStat;
8363+
STRUCT_STAT sStat;
83638364
if( errno!=EEXIST
83648365
|| 0!=fileStat(zFile, &sStat)
83658366
|| !S_ISDIR(sStat.st_mode)
@@ -8561,7 +8562,7 @@ struct fsdir_cursor {
85618562
const char *zBase;
85628563
int nBase;
85638564

8564-
struct stat sStat; /* Current lstat() results */
8565+
STRUCT_STAT sStat; /* Current lstat() results */
85658566
char *zPath; /* Path to current entry */
85668567
sqlite3_int64 iRowid; /* Current rowid */
85678568
};
@@ -15035,7 +15036,7 @@ void sqlite3_expert_destroy(sqlite3expert *p){
1503515036
** }
1503615037
** rc = sqlite3_intck_error(p, &zErr);
1503715038
** if( rc!=SQLITE_OK ){
15038-
** printf("error occurred (rc=%d), (errmsg=%s)\n", rc, zErr);
15039+
** printf("error occured (rc=%d), (errmsg=%s)\n", rc, zErr);
1503915040
** }
1504015041
** sqlite3_intck_close(p);
1504115042
**

0 commit comments

Comments
 (0)