/ Check-in [f426c625]
Login

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

Overview
Comment:Fix a #ifdef in util.c. (CVS 2369)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f426c625c4c3de626b5f5f8b5a6343a7ec3b16e9
User & Date: drh 2005-03-10 12:35:46
Context
2005-03-10
12:52
Disable the alter2 tests if there is a codec compiled into the library. (CVS 2370) check-in: 06a48da6 user: drh tags: trunk
12:35
Fix a #ifdef in util.c. (CVS 2369) check-in: f426c625 user: drh tags: trunk
2005-03-09
13:09
Fix a file corruption bug in CREATE INDEX in auto-vacuum databases. (CVS 2368) check-in: 64c4c717 user: danielk1977 tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/util.c.

    10     10   **
    11     11   *************************************************************************
    12     12   ** Utility functions used throughout sqlite.
    13     13   **
    14     14   ** This file contains functions for allocating memory, comparing
    15     15   ** strings, and stuff like that.
    16     16   **
    17         -** $Id: util.c,v 1.130 2005/02/01 10:35:07 danielk1977 Exp $
           17  +** $Id: util.c,v 1.131 2005/03/10 12:35:46 drh Exp $
    18     18   */
    19     19   #include "sqliteInt.h"
    20     20   #include <stdarg.h>
    21     21   #include <ctype.h>
    22     22   
    23     23   #if SQLITE_MEMDEBUG>2 && defined(__GLIBC__)
    24     24   #include <execinfo.h>
................................................................................
   898    898     do{
   899    899       i++;
   900    900       v >>= 7;
   901    901     }while( v!=0 && i<9 );
   902    902     return i;
   903    903   }
   904    904   
   905         -#if (!defined(SQLITE_OMIT_BLOB_LITERAL) && !defined(SQLITE_HAS_CODEC)) \
          905  +#if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC) \
   906    906       || defined(SQLITE_TEST)
   907    907   /*
   908    908   ** Translate a single byte of Hex into an integer.
   909    909   */
   910    910   static int hexToInt(int h){
   911    911     if( h>='0' && h<='9' ){
   912    912       return h - '0';
................................................................................
   913    913     }else if( h>='a' && h<='f' ){
   914    914       return h - 'a' + 10;
   915    915     }else{
   916    916       assert( h>='A' && h<='F' );
   917    917       return h - 'A' + 10;
   918    918     }
   919    919   }
   920         -#endif /* (!SQLITE_OMIT_BLOB_LITERAL && !SQLITE_HAS_CODEC) || SQLITE_TEST */
          920  +#endif /* !SQLITE_OMIT_BLOB_LITERAL || SQLITE_HAS_CODEC || SQLITE_TEST */
   921    921   
   922    922   #if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC)
   923    923   /*
   924    924   ** Convert a BLOB literal of the form "x'hhhhhh'" into its binary
   925    925   ** value.  Return a pointer to its binary value.  Space to hold the
   926    926   ** binary value has been obtained from malloc and must be freed by
   927    927   ** the calling routine.