8000 Merge branch 'release-integration' · PHPDOTSQL/sqlcipher@f018888 · GitHub
[go: up one dir, main page]
Skip to content

Commit f018888

Browse files
sjlombardosjlombardo
committed
Merge branch 'release-integration'
2 parents f09f9f9 + f26e6ab commit f018888

File tree

215 files changed

+13085
-2710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+13085
-2710
lines changed

‎Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ clean:
954954
rm -f mkkeywordhash$(BEXE) keywordhash.h
955955
rm -f $(PUBLISH)
956956
rm -f *.da *.bb *.bbg gmon.out
957+
rm -rf quota2a quota2b quota2c
957958
rm -rf tsrc .target_source
958959
rm -f tclsqlite3$(TEXE)
959960
rm -f testfixture$(TEXE) test.db

‎Makefile.msc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,9 +979,15 @@ sqlite3_analyzer.exe: sqlite3_analyzer.c
979979

980980
clean:
981981
del /Q *.lo *.ilk *.lib *.obj *.pdb sqlite3.exe libsqlite3.lib
982+
del /Q *.da *.bb *.bbg gmon.out
982983
del /Q sqlite3.h opcodes.c opcodes.h
983984
del /Q lemon.exe lempar.c parse.*
984985
del /Q mkkeywordhash.exe keywordhash.h
986+
-rmdir /Q/S .deps
987+
-rmdir /Q/S .libs
988+
-rmdir /Q/S quota2a
989+
-rmdir /Q/S quota2b
990+
-rmdir /Q/S quota2c
985991
-rmdir /Q/S tsrc
986992
del /Q .target_source
987993
del /Q tclsqlite3.exe

‎Makefile.vxworks

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@ clean:
657657
rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
658658
rm -f $(PUBLISH)
659659
rm -f *.da *.bb *.bbg gmon.out
660+
rm -rf quota2a quota2b quota2c
660661
rm -rf tsrc target_source
661662
rm -f testloadext.dll libtestloadext.so
662663
rm -f sqlite3.c fts?amal.c tclsqlite3.c

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.10
1+
3.7.12

‎art/2005osaward.gif

-3.66 KB
Binary file not shown.

‎art/SQLite.eps

-23.6 KB
Binary file not shown.

‎art/SQLite.gif

-2.99 KB
Binary file not shown.

‎art/SQLiteLogo3.tiff

-83.2 KB
Binary file not shown.

‎art/SQLite_big.gif

-7.25 KB
Binary file not shown.

‎art/nocopy.gif

-3.37 KB
Binary file not shown.

‎art/powered_by_sqlite.gif

-3.31 KB
Binary file not shown.

‎art/src_logo.gif

-3.27 KB
Binary file not shown.

‎config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
/* Define to 1 if you have the `localtime_s' function. */
3434
#undef HAVE_LOCALTIME_S
3535

36+
/* Define to 1 if you have the <malloc.h> header file. */
37+
#undef HAVE_MALLOC_H
38+
3639
/* Define to 1 if you have the `malloc_usable_size' function. */
3740
#undef HAVE_MALLOC_USABLE_SIZE
3841

‎configure

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.62 for sqlite 3.7.10.
3+
# Generated by GNU Autoconf 2.62 for sqlite 3.7.12.
44
#
55
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
66
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
743743
# Identity of this package.
744744
PACKAGE_NAME='sqlite'
745745
PACKAGE_TARNAME='sqlite'
746-
PACKAGE_VERSION='3.7.10'
747-
PACKAGE_STRING='sqlite 3.7.10'
746+
PACKAGE_VERSION='3.7.12'
747+
PACKAGE_STRING='sqlite 3.7.12'
748748
PACKAGE_BUGREPORT=''
749749

750750
# Factoring default headers for most tests.
@@ -1485,7 +1485,7 @@ if test "$ac_init_help" = "long"; then
14851485
# Omit some internal or obsolete options to make the list less imposing.
14861486
# This message is too long to be a string in the A/UX 3.1 sh.
14871487
cat <<_ACEOF
1488-
\`configure' configures sqlite 3.7.10 to adapt to many kinds of systems.
1488+
\`configure' configures sqlite 3.7.12 to adapt to many kinds of systems.
14891489
14901490
Usage: $0 [OPTION]... [VAR=VALUE]...
14911491
@@ -1550,7 +1550,7 @@ fi
15501550

15511551
if test -n "$ac_init_help"; then
15521552
case $ac_init_help in
1553-
short | recursive ) echo "Configuration of sqlite 3.7.10:";;
1553+
short | recursive ) echo "Configuration of sqlite 3.7.12:";;
15541554
esac
15551555
cat <<\_ACEOF
15561556
@@ -1666,7 +1666,7 @@ fi
16661666
test -n "$ac_init_help" && exit $ac_status
16671667
if $ac_init_version; then
16681668
cat <<\_ACEOF
1669-
sqlite configure 3.7.10
1669+
sqlite configure 3.7.12
16701670
generated by GNU Autoconf 2.62
16711671
16721672
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
16801680
This file contains any messages produced by compilers while
16811681
running configure, to aid debugging if configure makes a mistake.
16821682
1683-
It was created by sqlite $as_me 3.7.10, which was
1683+
It was created by sqlite $as_me 3.7.12, which was
16841684
generated by GNU Autoconf 2.62. Invocation command line was
16851685
16861686
$ $0 $@
@@ -11992,7 +11992,8 @@ fi
1199211992
1199311993
1199411994
11995-
for ac_header in sys/types.h stdlib.h stdint.h inttypes.h
11995+
11996+
for ac_header in sys/types.h stdlib.h stdint.h inttypes.h malloc.h
1199611997
do
1199711998
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1199811999
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -14031,7 +14032,7 @@ exec 6>&1
1403114032
# report actual input values of CONFIG_FILES etc. instead of their
1403214033
# values after options handling.
1403314034
ac_log="
14034-
This file was extended by sqlite $as_me 3.7.10, which was
14035+
This file was extended by sqlite $as_me 3.7.12, which was
1403514036
generated by GNU Autoconf 2.62. Invocation command line was
1403614037
1403714038
CONFIG_FILES = $CONFIG_FILES
@@ -14084,7 +14085,7 @@ Report bugs to <bug-autoconf@gnu.org>."
1408414085
_ACEOF
1408514086
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1408614087
ac_cs_version="\\
14087-
sqlite config.status 3.7.10
14088+
sqlite config.status 3.7.12
1408814089
configured by $0, generated by GNU Autoconf 2.62,
1408914090
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1409014091

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ AC_CHECK_TYPES([int8_t, int16_t, int32_t, int64_t, intptr_t, uint8_t,
122122

123123
#########
124124
# Check for needed/wanted headers
125-
AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h])
125+
AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h malloc.h])
126126

127127
#########
128128
# Figure out whether or not we have these functions

‎ext/async/sqlite3async.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ static int asyncFileControl(sqlite3_file *id, int op, void *pArg){
944944
return SQLITE_OK;
945945
}
946946
}
947-
return SQLITE_ERROR;
947+
return SQLITE_NOTFOUND;
948948
}
949949

950950
/*
@@ -1044,15 +1044,18 @@ static int asyncOpen(
10441044
char *z;
10451045
int isAsyncOpen = doAsynchronousOpen(flags);
10461046

1047-
/* If zName is NULL, then the upper layer is requesting an anonymous file */
1047+
/* If zName is NULL, then the upper layer is requesting an anonymous file.
1048+
** Otherwise, allocate enough space to make a copy of the file name (along
1049+
** with the second nul-terminator byte required by xOpen).
1050+
*/
10481051
if( zName ){
1049-
nName = (int)strlen(zName)+1;
1052+
nName = (int)strlen(zName);
10501053
}
10511054

10521055
nByte = (
10531056
sizeof(AsyncFileData) + /* AsyncFileData structure */
10541057
2 * pVfs->szOsFile + /* AsyncFileData.pBaseRead and pBaseWrite */
1055-
nName /* AsyncFileData.zName */
1058+
nName + 2 /* AsyncFileData.zName */
10561059
);
10571060
z = sqlite3_malloc(nByte);
10581061
if( !z ){

0 commit comments

Comments
 (0)
0