From: dan <dan@noemail.net>
Date: Tue, 17 Aug 2010 05:55:35 +0000 (+0000)
Subject: Fix some non-ANSI C code in test_demovfs.c. Also change the same file so that attempt... 
X-Git-Tag: version-3.7.2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc6a621a9600c26686776f8759760ae5324db81d;p=thirdparty%2Fsqlite.git

Fix some non-ANSI C code in test_demovfs.c. Also change the same file so that attempting to delete a file that does not exist does not return an error.

FossilOrigin-Name: 07570ce38051a05d6e8a71e39766850f6719ac07
---

diff --git a/manifest b/manifest
index 08525f8c8e..fd3c9c708d 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Remove\san\ssuperfluous\sbranch\sfrom\spager.c.
-D 2010-08-16T20:02:10
+C Fix\ssome\snon-ANSI\sC\scode\sin\stest_demovfs.c.\sAlso\schange\sthe\ssame\sfile\sso\sthat\sattempting\sto\sdelete\sa\sfile\sthat\sdoes\snot\sexist\sdoes\snot\sreturn\san\serror.
+D 2010-08-17T05:55:36
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -194,7 +191,7 @@ F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
 F src/test_config.c 5a11c51af2156e2d07186930b36f2b8239a4393f
-F src/test_demovfs.c da81a5f7785bb352bda7911c332a983ec4f17f27
+F src/test_demovfs.c 0aed671636735116fc872c5b03706fd5612488b5
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20
 F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
@@ -846,14 +843,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P d95bcc052910cfd4848afe0d32f717506ad5a789
-R 7f1ad401d5d30eb8789317264f68cef9
-U drh
-Z b110b81e4bbc30011f2058afc954649c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMaZlGoxKgR168RlERArY4AJ4kGrynz7zzjVX9UDbRDl5/3v+PggCeJDeA
-SaO0LUHGohOU+jh0oR4OoE4=
-=VOx3
------END PGP SIGNATURE-----
+P 4271a95c8236bda4a4f8c02bf3a3560de1d00402
+R 18c0cd58bb3c4ba7fcb0fd62a8f6bf9b
+U dan
+Z ca9e70bb404e459223eefc978ac4467f
diff --git a/manifest.uuid b/manifest.uuid
index 7dc6cc5cbb..5ec57d6f42 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4271a95c8236bda4a4f8c02bf3a3560de1d00402
\ No newline at end of file
+07570ce38051a05d6e8a71e39766850f6719ac07
\ No newline at end of file
diff --git a/src/test_demovfs.c b/src/test_demovfs.c
index 7cdae80670..8c51192b4c 100644
--- a/src/test_demovfs.c
+++ b/src/test_demovfs.c
@@ -127,6 +127,7 @@
 #include <sys/param.h>
 #include <unistd.h>
 #include <time.h>
+#include <errno.h>
 
 /*
 ** Size of the write buffer used by journal files in bytes.
@@ -135,6 +136,11 @@
 # define SQLITE_DEMOVFS_BUFFERSZ 8192
 #endif
 
+/*
+** The maximum pathname length supported by this VFS.
+*/
+#define MAXPATHNAME 512
+
 /*
 ** When using this VFS, the sqlite3_file* handles that SQLite uses are
 ** actually pointers to instances of type DemoFile.
@@ -446,16 +452,19 @@ static int demoOpen(
 ** file has been synced to disk before returning.
 */
 static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
-  int rc;
+  int rc;                         /* Return code */
+
   rc = unlink(zPath);
+  if( rc!=0 && errno==ENOENT ) return SQLITE_OK;
+
   if( rc==0 && dirSync ){
     int dfd;                      /* File descriptor open on directory */
     int i;                        /* Iterator variable */
-    char zDir[pVfs->mxPathname+1];/* Name of directory containing file zPath */
+    char zDir[MAXPATHNAME+1];     /* Name of directory containing file zPath */
 
     /* Figure out the directory name from the path of the file deleted. */
-    sqlite3_snprintf(pVfs->mxPathname, zDir, "%s", zPath);
-    zDir[pVfs->mxPathname] = '\0';
+    sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath);
+    zDir[MAXPATHNAME] = '\0';
     for(i=strlen(zDir); i>1 && zDir[i]!='/'; i++);
     zDir[i] = '\0';
 
@@ -524,13 +533,13 @@ static int demoFullPathname(
   int nPathOut,                   /* Size of output buffer in bytes */
   char *zPathOut                  /* Pointer to output buffer */
 ){
-  char zDir[pVfs->mxPathname+1];
+  char zDir[MAXPATHNAME+1];
   if( zPath[0]=='/' ){
     zDir[0] = '\0';
   }else{
     getcwd(zDir, sizeof(zDir));
   }
-  zDir[pVfs->mxPathname] = '\0';
+  zDir[MAXPATHNAME] = '\0';
 
   sqlite3_snprintf(nPathOut, zPathOut, "%s/%s", zDir, zPath);
   zPathOut[nPathOut-1] = '\0';
@@ -609,7 +618,7 @@ sqlite3_vfs *sqlite3_demovfs(void){
   static sqlite3_vfs demovfs = {
     1,                            /* iVersion */
     sizeof(DemoFile),             /* szOsFile */
-    512,                          /* mxPathname */
+    MAXPATHNAME,                  /* mxPathname */
     0,                            /* pNext */
     "demo",                       /* zName */
     0,                            /* pAppData */