/ Check-in [1bd1484c]
Login

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

Overview
Comment:Change the name of an internal function to avoid conflicts with the math library.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1bd1484cd7e09709d87aa84b82e87597d00a4162
User & Date: drh 2011-04-27 18:08:42
Context
2011-04-27
19:54
In windows, ignore ERROR_NOT_LOCKED when calling the read-lock removal routine. check-in: f55156c5 user: drh tags: trunk
18:08
Change the name of an internal function to avoid conflicts with the math library. check-in: 1bd1484c user: drh tags: trunk
16:05
Expose the UTF8 to MBCS conversion routine in os_win.c to external applications. check-in: 7b479b9b user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/func.c.

   775    775   }
   776    776   
   777    777   /*
   778    778   ** Implementation of the sqlite_log() function.  This is a wrapper around
   779    779   ** sqlite3_log().  The return value is NULL.  The function exists purely for
   780    780   ** its side-effects.
   781    781   */
   782         -static void logFunc(
          782  +static void errlogFunc(
   783    783     sqlite3_context *context,
   784    784     int argc,
   785    785     sqlite3_value **argv
   786    786   ){
   787    787     UNUSED_PARAMETER(argc);
   788    788     UNUSED_PARAMETER(context);
   789    789     sqlite3_log(sqlite3_value_int(argv[0]), "%s", sqlite3_value_text(argv[1]));
................................................................................
  1552   1552   /*  FUNCTION(ifnull,             2, 0, 0, ifnullFunc       ), */
  1553   1553       {2,SQLITE_UTF8,SQLITE_FUNC_COALESCE,0,0,ifnullFunc,0,0,"ifnull",0,0},
  1554   1554       FUNCTION(random,             0, 0, 0, randomFunc       ),
  1555   1555       FUNCTION(randomblob,         1, 0, 0, randomBlob       ),
  1556   1556       FUNCTION(nullif,             2, 0, 1, nullifFunc       ),
  1557   1557       FUNCTION(sqlite_version,     0, 0, 0, versionFunc      ),
  1558   1558       FUNCTION(sqlite_source_id,   0, 0, 0, sourceidFunc     ),
  1559         -    FUNCTION(sqlite_log,         2, 0, 0, logFunc          ),
         1559  +    FUNCTION(sqlite_log,         2, 0, 0, errlogFunc       ),
  1560   1560   #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
  1561   1561       FUNCTION(sqlite_compileoption_used,1, 0, 0, compileoptionusedFunc  ),
  1562   1562       FUNCTION(sqlite_compileoption_get, 1, 0, 0, compileoptiongetFunc  ),
  1563   1563   #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
  1564   1564       FUNCTION(quote,              1, 0, 0, quoteFunc        ),
  1565   1565       FUNCTION(last_insert_rowid,  0, 0, 0, last_insert_rowid),
  1566   1566       FUNCTION(changes,            0, 0, 0, changes          ),