From: pweilbacher <pweilbacher@noemail.net>
Date: Wed, 16 Jul 2008 19:30:37 +0000 (+0000)
Subject: Get rid of the debug output, and make pre-C99 compilers happy with sqlite3_os_init... 
X-Git-Tag: version-3.6.10~748
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71b53ca460a5fa2b2aa688d156e8de81bcee0014;p=thirdparty%2Fsqlite.git

Get rid of the debug output, and make pre-C99 compilers happy with sqlite3_os_init() on OS/2. (CVS 5429)

FossilOrigin-Name: 08fe49f62f8a91c36ad4bb9a1d8c89806c37f600
---

diff --git a/manifest b/manifest
index 6c5f3a74c1..5e1c09058e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sauxiliary\sdatabase\sconnection\sis\sclosed\safter\severy\stest.\s(CVS\s5428)
-D 2008-07-16T18:35:46
+C Get\srid\sof\sthe\sdebug\soutput,\sand\smake\spre-C99\scompilers\shappy\swith\ssqlite3_os_init()\son\sOS/2.\s(CVS\s5429)
+D 2008-07-16T19:30:37
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -131,7 +131,7 @@ F src/mutex_w32.c f0d21ff1f6981e5aedc56796adf3a347423ef736
 F src/os.c 292b3b4a49fe5bf6cf2f1cf0af186ebd334e80b8
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
-F src/os_os2.c b16aee2f727842f758140641835a46caad322f5d
+F src/os_os2.c 5f81fda19c86b39723caa8f5d0c6b01d693385bf
 F src/os_unix.c 1df6108efdb7957a9f28b9700600e58647c9c12d
 F src/os_win.c 2bf2f8cd700299564cc236262c2668e1e02c626a
 F src/pager.c e65d78bdbd316c3ca0135d2a98ecc607873145aa
@@ -608,7 +608,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 632bb3c73443606bd2c7a5eadf0f4b8971a2b41e
-R 3ff30330b52183dbda7935a7c7b49559
-U drh
-Z e2c020bbf55175cfd1051117aa9dd76e
+P e60bb6a179c6e674db2b9362e2ccdefaa3bc17f4
+R a31140b737af6c0a9d7edc118fd6fbec
+U pweilbacher
+Z 588ce637dab590e74bf4372c2ed59ca2
diff --git a/manifest.uuid b/manifest.uuid
index aa077880c1..c2497ccefa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e60bb6a179c6e674db2b9362e2ccdefaa3bc17f4
\ No newline at end of file
+08fe49f62f8a91c36ad4bb9a1d8c89806c37f600
\ No newline at end of file
diff --git a/src/os_os2.c b/src/os_os2.c
index 29628a4664..1f1b465629 100644
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $Id: os_os2.c,v 1.50 2008/07/15 22:59:05 pweilbacher Exp $
+** $Id: os_os2.c,v 1.51 2008/07/16 19:30:37 pweilbacher Exp $
 */
 
 #include "sqliteInt.h"
@@ -558,7 +558,6 @@ static UconvObject uclCp = NULL;  /* convert between local codepage and UCS-2 */
 ** Helper function to initialize the conversion objects from and to UTF-8.
 */
 static void initUconvObjects( void ){
-	printf("init them\n");
   if( UniCreateUconvObject( UTF_8, &ucUtf8 ) != ULS_SUCCESS )
     ucUtf8 = NULL;
   if ( UniCreateUconvObject( (UniChar *)L"@path=yes", &uclCp ) != ULS_SUCCESS )
@@ -569,7 +568,6 @@ static void initUconvObjects( void ){
 ** Helper function to free the conversion objects from and to UTF-8.
 */
 static void freeUconvObjects( void ){
-	printf("free them\n");
   if ( ucUtf8 )
     UniFreeUconvObject( ucUtf8 );
   if ( uclCp )
@@ -587,7 +585,6 @@ static void freeUconvObjects( void ){
 static char *convertUtf8PathToCp( const char *in ){
   UniChar tempPath[CCHMAXPATH];
   char *out = (char *)calloc( CCHMAXPATH, 1 );
-printf("convertUtf8PathToCp(%s)\n", in);
 
   if( !out )
     return NULL;
@@ -602,7 +599,6 @@ printf("convertUtf8PathToCp(%s)\n", in);
   /* conversion for current codepage which can be used for paths */
   UniStrFromUcs( uclCp, out, tempPath, CCHMAXPATH );
 
-	printf("%s -> Cp = %s\n", in, out);
   return out;
 }
 
@@ -618,7 +614,6 @@ printf("convertUtf8PathToCp(%s)\n", in);
 char *convertCpPathToUtf8( const char *in ){
   UniChar tempPath[CCHMAXPATH];
   char *out = (char *)calloc( CCHMAXPATH, 1 );
-printf("convertCpPathToUtf8(%s)\n", in);
 
   if( !out )
     return NULL;
@@ -633,7 +628,6 @@ printf("convertCpPathToUtf8(%s)\n", in);
   /* determine string for the conversion of UTF-8 which is CP1208 */
   UniStrFromUcs( ucUtf8, out, tempPath, CCHMAXPATH );
 
-	printf("%s -> Utf8 = %s\n", in, out);
   return out;
 }
 
@@ -1089,8 +1083,6 @@ static int os2GetLastError(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
 ** Initialize and deinitialize the operating system interface.
 */
 int sqlite3_os_init(void){
-  initUconvObjects();
-
   static sqlite3_vfs os2Vfs = {
     1,                 /* iVersion */
     sizeof(os2File),   /* szOsFile */
@@ -1113,6 +1105,7 @@ int sqlite3_os_init(void){
     os2GetLastError    /* xGetLastError */
   };
   sqlite3_vfs_register(&os2Vfs, 1);
+  initUconvObjects();
   return SQLITE_OK;
 }
 int sqlite3_os_end(void){