/ Check-in [52b03f04]
Login

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

Overview
Comment:Fix harmless compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 52b03f045edf6fc29f9ba9a5cac53a59f0feb0eb
User & Date: drh 2014-08-11 14:21:32
Context
2014-08-11
15:54
Updates to evidence marks and requirements. No changes to code. check-in: 62d38308 user: drh tags: trunk
14:21
Fix harmless compiler warnings. check-in: 52b03f04 user: drh tags: trunk
13:53
Changes that will perhaps enable SQLite to work better on VxWorks. check-in: de27c742 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3_unicode.c.

   314    314     int *pnToken,                   /* OUT: Number of bytes at *paToken */
   315    315     int *piStart,                   /* OUT: Starting offset of token */
   316    316     int *piEnd,                     /* OUT: Ending offset of token */
   317    317     int *piPos                      /* OUT: Position integer of token */
   318    318   ){
   319    319     unicode_cursor *pCsr = (unicode_cursor *)pC;
   320    320     unicode_tokenizer *p = ((unicode_tokenizer *)pCsr->base.pTokenizer);
   321         -  int iCode;
          321  +  int iCode = 0;
   322    322     char *zOut;
   323    323     const unsigned char *z = &pCsr->aInput[pCsr->iOff];
   324    324     const unsigned char *zStart = z;
   325    325     const unsigned char *zEnd;
   326    326     const unsigned char *zTerm = &pCsr->aInput[pCsr->nInput];
   327    327   
   328    328     /* Scan past any delimiter characters before the start of the next token.

Changes to ext/misc/fileio.c.

    57     57   static void writefileFunc(
    58     58     sqlite3_context *context,
    59     59     int argc,
    60     60     sqlite3_value **argv
    61     61   ){
    62     62     FILE *out;
    63     63     const char *z;
    64         -  int n;
    65     64     sqlite3_int64 rc;
    66     65     const char *zFile;
    67     66   
    68     67     zFile = (const char*)sqlite3_value_text(argv[0]);
    69     68     if( zFile==0 ) return;
    70     69     out = fopen(zFile, "wb");
    71     70     if( out==0 ) return;
    72     71     z = (const char*)sqlite3_value_blob(argv[1]);
    73     72     if( z==0 ){
    74         -    n = 0;
    75     73       rc = 0;
    76     74     }else{
    77         -    n = sqlite3_value_bytes(argv[1]);
    78         -    rc = fwrite(z, 1, n, out);
           75  +    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
    79     76     }
    80     77     fclose(out);
    81     78     sqlite3_result_int64(context, rc);
    82     79   }
    83     80   
    84     81   
    85     82   #ifdef _WIN32

Changes to src/shell.c.

  1690   1690   static void writefileFunc(
  1691   1691     sqlite3_context *context,
  1692   1692     int argc,
  1693   1693     sqlite3_value **argv
  1694   1694   ){
  1695   1695     FILE *out;
  1696   1696     const char *z;
  1697         -  int n;
  1698   1697     sqlite3_int64 rc;
  1699   1698     const char *zFile;
  1700   1699   
  1701   1700     zFile = (const char*)sqlite3_value_text(argv[0]);
  1702   1701     if( zFile==0 ) return;
  1703   1702     out = fopen(zFile, "wb");
  1704   1703     if( out==0 ) return;
  1705   1704     z = (const char*)sqlite3_value_blob(argv[1]);
  1706   1705     if( z==0 ){
  1707         -    n = 0;
  1708   1706       rc = 0;
  1709   1707     }else{
  1710         -    n = sqlite3_value_bytes(argv[1]);
  1711         -    rc = fwrite(z, 1, n, out);
         1708  +    rc = fwrite(z, 1, sqlite3_value_bytes(argv[1]), out);
  1712   1709     }
  1713   1710     fclose(out);
  1714   1711     sqlite3_result_int64(context, rc);
  1715   1712   }
  1716   1713   
  1717   1714   /*
  1718   1715   ** Make sure the database is open.  If it is not, then open it.  If