/ Check-in [518a24aa]
Login

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

Overview
Comment:Fix a bug introduced by check-in (5406). Ticket #3216. (CVS 5407)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 518a24aa3e042782fbf2e805cf080b61e58a8150
User & Date: drh 2008-07-14 12:38:21
Context
2008-07-14
12:52
Write sqlite3_initialize() calls in sqlite3_malloc() within SQLITE_OMIT_AUTOINIT. Ticket #3217. (CVS 5408) check-in: 4961b0bb user: drh tags: trunk
12:38
Fix a bug introduced by check-in (5406). Ticket #3216. (CVS 5407) check-in: 518a24aa user: drh tags: trunk
12:30
Work around a bug in Borland C. Ticket #3216. (CVS 5406) check-in: 2c24e50d user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/malloc.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   **
    13     13   ** Memory allocation functions used throughout sqlite.
    14     14   **
    15         -** $Id: malloc.c,v 1.27 2008/07/14 12:30:54 drh Exp $
           15  +** $Id: malloc.c,v 1.28 2008/07/14 12:38:21 drh Exp $
    16     16   */
    17     17   #include "sqliteInt.h"
    18     18   #include <stdarg.h>
    19     19   #include <ctype.h>
    20     20   
    21     21   /*
    22     22   ** This routine runs when the memory allocator sees that the
................................................................................
   161    161   ** checked out since either the beginning of this process
   162    162   ** or since the most recent reset.
   163    163   */
   164    164   sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
   165    165     int n, mx;
   166    166     sqlite3_int64 res;
   167    167     sqlite3_status(SQLITE_STATUS_MEMORY_USED, &n, &mx, resetFlag);
   168         -  res = (sqlite3_int64)n;  /* Work around bug in Borland C. Ticket #3216 */
          168  +  res = (sqlite3_int64)mx;  /* Work around bug in Borland C. Ticket #3216 */
   169    169     return res;
   170    170   }
   171    171   
   172    172   /*
   173    173   ** Change the alarm callback
   174    174   */
   175    175   int sqlite3_memory_alarm(