Improved test coverage of table.c and printf.c. (CVS 1762)

FossilOrigin-Name: ba87834d863cb50f3016ccb04f790be5fa4070c6

diff --git a/manifest b/manifest
index ec76987897d2bfeaa7fa818ac50ef525835a7e81..315190a6a52623aae17f828f494505798df9b34d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\stest\scoverage\sof\stclsqlite.c\s(CVS\s1761)
-D 2004-06-29T12:39:08
+C Improved\stest\scoverage\sof\stable.c\sand\sprintf.c.\s(CVS\s1762)
+D 2004-06-29T13:04:33
 F Makefile.in cb7a9889c38723f72b2506c4236ff30a05ff172b
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -60,7 +60,7 @@ F src/select.c f02a65af34231031896e8442161cb5251e191e75
 F src/shell.c 24b641700c9d90f361fcfa4f432c5b4aff704e6d
 F src/sqlite.h.in b70fded2bdfeaddfb06adea3888118b722975136
 F src/sqliteInt.h 4f8d44f04cc51cb421bf3c195247353a5be2e98f
-F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2
+F src/table.c 4521c278892f60e4d630788c0ea5cf4db1e75c49
 F src/tclsqlite.c 7648310ff0034213f3e58e7272328ed306507e9f
 F src/test1.c 0eca68f6e70069aad7ad0fd91fda886926646786
 F src/test2.c dafd8bd314a554bf376c6d3a8c83fd69219f5a40
@@ -143,7 +143,7 @@ F test/null.test 64730a1c32955e5cc510b7632fed6b9929a4029a
 F test/pager.test 059cc5c58d3b5a851343dff8c56cf7286425d03a
 F test/pager2.test 55469c7c1c1a54d6b32d7b3cc99001e90101a1ce
 F test/pragma.test 212d810e02a51c0ff9784a19d55e35d23382005d
-F test/printf.test 1eb584b7272d1abdfe117b2ef7cf3376ae8e4e06
+F test/printf.test 5ed2e033a0b47f901764096bf1907915d6e39406
 F test/progress.test 76c722f090b1ccb575e7e4e203a71608c5763beb x
 F test/quick.test 4c0b3eabe2e0e606622d63d7d61ef6efb3ce156b
 F test/quote.test 08f23385c685d3dc7914ec760d492cacea7f6e3d
@@ -232,7 +232,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 7a15391079ae9ce5360fa13e8779c8872885e789
-R 6d1cc0ec8c79803128be2f6b6916c2d6
+P 008e57dcd5e16886ed732fe1e9797a3c00e8c579
+R 094ef9d75f74182971b9bfef31c30613
 U drh
-Z 724b6a206741f085ef273c2e8d104b2e
+Z f73ff388c64168a07cb5da4a2e119b6b

diff --git a/manifest.uuid b/manifest.uuid
index 824121abd9f547f5e85c35b43abd8e77e9310acc..47ebd13437ce589531fa2b00a334ec5ded966cec 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-008e57dcd5e16886ed732fe1e9797a3c00e8c579
\ No newline at end of file
+ba87834d863cb50f3016ccb04f790be5fa4070c6
\ No newline at end of file

diff --git a/src/table.c b/src/table.c
index f47ba60a2d9b8b31628cf4713502934325035972..dd0438c6355cb549c31fd7324b68f99bd830e4cb 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -58,10 +58,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
     char **azNew;
     p->nAlloc = p->nAlloc*2 + need + 1;
     azNew = realloc( p->azResult, sizeof(char*)*p->nAlloc );
-    if( azNew==0 ){
-      p->rc = SQLITE_NOMEM;
-      return 1;
-    }
+    if( azNew==0 ) goto malloc_failed;
     p->azResult = azNew;
   }
 
@@ -75,10 +72,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
         z = 0;
       }else{
         z = malloc( strlen(colv[i])+1 );
-        if( z==0 ){
-          p->rc = SQLITE_NOMEM;
-          return 1;
-        }
+        if( z==0 ) goto malloc_failed;
         strcpy(z, colv[i]);
       }
       p->azResult[p->nData++] = z;
@@ -99,10 +93,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
         z = 0;
       }else{
         z = malloc( strlen(argv[i])+1 );
-        if( z==0 ){
-          p->rc = SQLITE_NOMEM;
-          return 1;
-        }
+        if( z==0 ) goto malloc_failed;
         strcpy(z, argv[i]);
       }
       p->azResult[p->nData++] = z;
@@ -110,6 +101,10 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
     p->nRow++;
   }
   return 0;
+
+malloc_failed:
+  p->rc = SQLITE_NOMEM;
+  return 1;
 }
 
 /*
@@ -144,9 +139,7 @@ int sqlite3_get_table(
   res.nAlloc = 20;
   res.rc = SQLITE_OK;
   res.azResult = malloc( sizeof(char*)*res.nAlloc );
-  if( res.azResult==0 ){
-    return SQLITE_NOMEM;
-  }
+  if( res.azResult==0 ) return SQLITE_NOMEM;
   res.azResult[0] = 0;
   rc = sqlite3_exec(db, zSql, sqlite3_get_table_cb, &res, pzErrMsg);
   if( res.azResult ){
@@ -190,7 +183,7 @@ int sqlite3_get_table(
 ** This routine frees the space the sqlite3_get_table() malloced.
 */
 void sqlite3_free_table(
-  char **azResult             /* Result returned from from sqlite3_get_table() */
+  char **azResult            /* Result returned from from sqlite3_get_table() */
 ){
   if( azResult ){
     int i, n;
@@ -201,6 +194,3 @@ void sqlite3_free_table(
     free(azResult);
   }
 }
-
-
-

diff --git a/test/printf.test b/test/printf.test
index 727bf2dbff0f7458804d0c2abf9d23a570d12df3..c99114236219fb532f47a24aba8d1e43bff5e129 100644 (file)
--- a/test/printf.test
+++ b/test/printf.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the sqlite_*_printf() interface.
 #
-# $Id: printf.test,v 1.10 2004/06/25 01:10:48 drh Exp $
+# $Id: printf.test,v 1.11 2004/06/29 13:04:33 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -36,6 +36,9 @@ foreach v {1 2 5 10 99 100 1000000 999999999 0 -1 -2 -5 -10 -99 -100 -9999999} {
   do_test printf-1.$n.6 [subst {
     sqlite3_mprintf_int {Three integers: (% 6d) (% 6x) (% 6o)} $v $v $v
   }] [format {Three integers: (% 6d) (% 6x) (% 6o)} $v $v $v]
+  do_test printf-1.$n.7 [subst {
+    sqlite3_mprintf_int {Three integers: (%#6d) (%#6x) (%#6o)} $v $v $v
+  }] [format {Three integers: (%#6d) (%#6x) (%#6o)} $v $v $v]
   incr n
 }
 
@@ -61,6 +64,9 @@ foreach {a b} {1 1 5 5 10 10 10 5} {
     do_test printf-2.$m.$n.5 [subst {
       sqlite3_mprintf_double {A double: %d %d %#g} $a $b $x
     }] [format {A double: %d %d %#g} $a $b $x]
+    do_test printf-2.$m.$n.6 [subst {
+      sqlite3_mprintf_double {A double: %d %d %010g} $a $b $x
+    }] [format {A double: %d %d %010g} $a $b $x]
     incr n
   }
   incr m
@@ -142,4 +148,17 @@ do_test printf-8.6 {
   sqlite3_mprintf_int64 {%llx %llo %lld} -1 -1 -1
 } {ffffffffffffffff 1777777777777777777777 -1}
 
+do_test printf-9.1 {
+  sqlite3_mprintf_int {%*.*c} 4 4 65
+} {AAAA}
+do_test printf-9.2 {
+  sqlite3_mprintf_int {%*.*c} -4 1 66
+} {B   }
+do_test printf-9.3 {
+  sqlite3_mprintf_int {%*.*c} 4 1 67
+} {   C}
+do_test printf-9.4 {
+  sqlite3_mprintf_int {%yhello} 0 0 0
+} {%}
+
 finish_test