/ Check-in [837dc77f]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Always case 0 to (char*) on varargs functions. Otherwise there are problems on 64-bit machines. (CVS 2854)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:837dc77ff9f5271b7e1bb8602fc021670c7802d1
User & Date: drh 2006-01-03 15:16:26
Context
2006-01-04
15:54
Add support for CREATE INDEX IF NOT EXISTS and DROP INDEX IF EXISTS. (CVS 2855) check-in: 551cdd6c user: drh tags: trunk
2006-01-03
15:16
Always case 0 to (char*) on varargs functions. Otherwise there are problems on 64-bit machines. (CVS 2854) check-in: 837dc77f user: drh tags: trunk
13:39
Add test files for the asynchronous IO concept. (CVS 2853) check-in: 7c3492c8 user: danielk1977 tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/expr.c.

     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** This file contains routines used for analyzing expressions and
    13     13   ** for generating VDBE code that evaluates expressions in SQLite.
    14     14   **
    15         -** $Id: expr.c,v 1.242 2005/12/09 20:02:05 drh Exp $
           15  +** $Id: expr.c,v 1.243 2006/01/03 15:16:26 drh Exp $
    16     16   */
    17     17   #include "sqliteInt.h"
    18     18   #include <ctype.h>
    19     19   
    20     20   /*
    21     21   ** Return the 'affinity' of the expression pExpr if any.
    22     22   **
................................................................................
  1001   1001     ** more matches.  Either way, we have an error.
  1002   1002     */
  1003   1003     if( cnt!=1 ){
  1004   1004       char *z = 0;
  1005   1005       char *zErr;
  1006   1006       zErr = cnt==0 ? "no such column: %s" : "ambiguous column name: %s";
  1007   1007       if( zDb ){
  1008         -      sqlite3SetString(&z, zDb, ".", zTab, ".", zCol, 0);
         1008  +      sqlite3SetString(&z, zDb, ".", zTab, ".", zCol, (char*)0);
  1009   1009       }else if( zTab ){
  1010         -      sqlite3SetString(&z, zTab, ".", zCol, 0);
         1010  +      sqlite3SetString(&z, zTab, ".", zCol, (char*)0);
  1011   1011       }else{
  1012   1012         z = sqliteStrDup(zCol);
  1013   1013       }
  1014   1014       sqlite3ErrorMsg(pParse, zErr, z);
  1015   1015       sqliteFree(z);
  1016   1016       pTopNC->nErr++;
  1017   1017     }

Changes to src/select.c.

     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** This file contains C code routines that are called by the parser
    13     13   ** to handle SELECT statements in SQLite.
    14     14   **
    15         -** $Id: select.c,v 1.282 2005/12/09 20:02:05 drh Exp $
           15  +** $Id: select.c,v 1.283 2006/01/03 15:16:26 drh Exp $
    16     16   */
    17     17   #include "sqliteInt.h"
    18     18   
    19     19   
    20     20   /*
    21     21   ** Allocate a new Select structure and return a pointer to that
    22     22   ** structure.
................................................................................
   888    888           sqlite3VdbeSetColName(v, i, (char*)p->span.z, p->span.n);
   889    889         }else if( fullNames || (!shortNames && pTabList->nSrc>1) ){
   890    890           char *zName = 0;
   891    891           char *zTab;
   892    892    
   893    893           zTab = pTabList->a[j].zAlias;
   894    894           if( fullNames || zTab==0 ) zTab = pTab->zName;
   895         -        sqlite3SetString(&zName, zTab, ".", zCol, 0);
          895  +        sqlite3SetString(&zName, zTab, ".", zCol, (char*)0);
   896    896           sqlite3VdbeSetColName(v, i, zName, P3_DYNAMIC);
   897    897         }else{
   898    898           sqlite3VdbeSetColName(v, i, zCol, strlen(zCol));
   899    899         }
   900    900       }else if( p->span.z && p->span.z[0] ){
   901    901         sqlite3VdbeSetColName(v, i, (char*)p->span.z, p->span.n);
   902    902         /* sqlite3VdbeCompressSpace(v, addr); */

Changes to src/vdbe.c.

    39     39   **
    40     40   ** Various scripts scan this source file in order to generate HTML
    41     41   ** documentation, headers files, or other derived files.  The formatting
    42     42   ** of the code in this file is, therefore, important.  See other comments
    43     43   ** in this file for details.  If in doubt, do not deviate from existing
    44     44   ** commenting and indentation practices when changing or adding code.
    45     45   **
    46         -** $Id: vdbe.c,v 1.509 2005/12/29 19:23:07 drh Exp $
           46  +** $Id: vdbe.c,v 1.510 2006/01/03 15:16:26 drh Exp $
    47     47   */
    48     48   #include "sqliteInt.h"
    49     49   #include "os.h"
    50     50   #include <ctype.h>
    51     51   #include "vdbeInt.h"
    52     52   
    53     53   /*
................................................................................
  2294   2294   
  2295   2295     if( db->activeVdbeCnt>1 && i && !db->autoCommit ){
  2296   2296       /* If this instruction implements a COMMIT or ROLLBACK, other VMs are
  2297   2297       ** still running, and a transaction is active, return an error indicating
  2298   2298       ** that the other VMs must complete first. 
  2299   2299       */
  2300   2300       sqlite3SetString(&p->zErrMsg, "cannot ", rollback?"rollback":"commit", 
  2301         -        " transaction - SQL statements in progress", 0);
         2301  +        " transaction - SQL statements in progress", (char*)0);
  2302   2302       rc = SQLITE_ERROR;
  2303   2303     }else if( i!=db->autoCommit ){
  2304   2304       if( pOp->p2 ){
  2305   2305         assert( i==1 );
  2306   2306         sqlite3RollbackAll(db);
  2307   2307         db->autoCommit = 1;
  2308   2308       }else{
................................................................................
  2316   2316         }
  2317   2317       }
  2318   2318       return SQLITE_DONE;
  2319   2319     }else{
  2320   2320       sqlite3SetString(&p->zErrMsg,
  2321   2321           (!i)?"cannot start a transaction within a transaction":(
  2322   2322           (rollback)?"cannot rollback - no transaction is active":
  2323         -                   "cannot commit - no transaction is active"), 0);
         2323  +                   "cannot commit - no transaction is active"), (char*)0);
  2324   2324            
  2325   2325       rc = SQLITE_ERROR;
  2326   2326     }
  2327   2327     break;
  2328   2328   }
  2329   2329   
  2330   2330   /* Opcode: Transaction P1 P2 *