Make subroutines sampleCopy() and valueFromExpr() have file scope.

FossilOrigin-Name: 1660efbe46439734c7dc1674994ceb86a9b41d1a

diff --git a/manifest b/manifest
index 93d93d8c8477d1e58e96f3b5f05c3c18a114cb7b..f602a8f22525894f1311a317576b483cf270c541 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\snew\sapplication_id\sfor\sGeoPackage\sversion\s1.0.
-D 2013-10-14T10:46:05.794
+C Make\ssubroutines\ssampleCopy()\sand\svalueFromExpr()\shave\sfile\sscope.
+D 2013-10-14T13:21:00.014
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e2d28ec95bd17ab4f3b6ee40b7102e9d7a0857b9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -158,7 +158,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 2af0330bb1b601af7a7789bf7229675fd772a083
-F src/analyze.c f9e4eec962f2d81d775d8d5c2efb27b84acb0be0
+F src/analyze.c c6259f93c9e9029df8e23e1093e0c650974ca7e5
 F src/attach.c 0a17c9364895316ca4f52d06a97a72c0af1ae8b3
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
@@ -284,7 +284,7 @@ F src/vdbeInt.h ff57f67aee1ba26a3a47e786533dab155ab6dad6
 F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
 F src/vdbeaux.c 55f4858fe6abd84bd7311acbf30a75a28903ec25
 F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
-F src/vdbemem.c 28730af78c730cf230b64d62757a009668e76444
+F src/vdbemem.c 649933bad3e922465b726eaf85c72a75acba2ab7
 F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
 F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
 F src/vtab.c 5a423b042eb1402ef77697d03d6a67378d97bc8d
@@ -1123,7 +1123,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P f0cf8c85dcbcc7778aed2816792c368d777f79cb
-R 4f36494c4571dae8d7d76b44817e2e09
+P 98ddfe45713775657e586f5a2499cf3c036f13dd
+R 967432a4e7657b2df96a7af6fdae0344
 U drh
-Z 654d268a6340b2587df2d3f244d3f538
+Z 96efb7a8ef8355039cf707d085dc7cb4

diff --git a/manifest.uuid b/manifest.uuid
index 988bedcc6f8596181bd034ca26023b4a6ca0fb95..13ff7e5a8acd91ed8d4eab6a57288be72f6798df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-98ddfe45713775657e586f5a2499cf3c036f13dd
\ No newline at end of file
+1660efbe46439734c7dc1674994ceb86a9b41d1a
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 98687f5ac32883ed886f616b754cda01151f00b9..de2f84e32570d9c3991b4c6505667b8cb999c5d2 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -444,7 +444,7 @@ static int sampleIsBetter(
 /*
 ** Copy the contents of object (*pFrom) into (*pTo).
 */
-void sampleCopy(Stat4Accum *p, Stat4Sample *pTo, Stat4Sample *pFrom){
+static void sampleCopy(Stat4Accum *p, Stat4Sample *pTo, Stat4Sample *pFrom){
   pTo->iRowid = pFrom->iRowid;
   pTo->isPSample = pFrom->isPSample;
   pTo->iCol = pFrom->iCol;

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 91193bf2cf92e0282b0f12c0054f3609ea4e92a6..b549c4a31ac74cd536dcbbed2904dc1955db6977 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1075,7 +1075,7 @@ static sqlite3_value *valueNew(sqlite3 *db, struct ValueNewStat4Ctx *p){
 ** NULL, it is assumed that the caller will free any allocated object
 ** in all cases.
 */
-int valueFromExpr(
+static int valueFromExpr(
   sqlite3 *db,                    /* The database connection */
   Expr *pExpr,                    /* The expression to evaluate */
   u8 enc,                         /* Encoding to use */