/ Check-in [ace49950]
Login

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

Overview
Comment:Exclude a static function in test1.c from the build when OMIT_DEPRECATED is defined. This avoids a compiler warning that occurs with some compilers. (CVS 6967)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ace499506e3c7a315f66928d8a98de255491b2b9
User & Date: danielk1977 2009-08-10 04:37:50
Context
2009-08-10
10:18
Update a couple of tests in corrupt7.test to account for a change in the error message text emitted by SQLite. (CVS 6968) check-in: 3172a296 user: danielk1977 tags: trunk
04:37
Exclude a static function in test1.c from the build when OMIT_DEPRECATED is defined. This avoids a compiler warning that occurs with some compilers. (CVS 6967) check-in: ace49950 user: danielk1977 tags: trunk
04:26
Change mallocI.test to close a database connection that was being left open. (CVS 6966) check-in: 4f0096d7 user: danielk1977 tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/test1.c.

     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** Code for testing all sorts of SQLite interfaces.  This code
    13     13   ** is not included in the SQLite library.  It is used for automated
    14     14   ** testing of the SQLite library.
    15     15   **
    16         -** $Id: test1.c,v 1.353 2009/05/03 20:23:54 drh Exp $
           16  +** $Id: test1.c,v 1.354 2009/08/10 04:37:50 danielk1977 Exp $
    17     17   */
    18     18   #include "sqliteInt.h"
    19     19   #include "tcl.h"
    20     20   #include <stdlib.h>
    21     21   #include <string.h>
    22     22   
    23     23   /*
................................................................................
  1095   1095         sqlite3_result_error(context, "x_count totals to 42", -1);
  1096   1096       }else{
  1097   1097         sqlite3_result_int(context, p ? p->n : 0);
  1098   1098       }
  1099   1099     }
  1100   1100   }
  1101   1101   
         1102  +#ifndef SQLITE_OMIT_DEPRECATED
  1102   1103   static void legacyCountStep(
  1103   1104     sqlite3_context *context,
  1104   1105     int argc,
  1105   1106     sqlite3_value **argv
  1106   1107   ){
  1107   1108     /* no-op */
  1108   1109   }
  1109   1110   
  1110         -#ifndef SQLITE_OMIT_DEPRECATED
  1111   1111   static void legacyCountFinalize(sqlite3_context *context){
  1112   1112     sqlite3_result_int(context, sqlite3_aggregate_count(context));
  1113   1113   }
  1114   1114   #endif
  1115   1115   
  1116   1116   /*
  1117   1117   ** Usage:  sqlite3_create_aggregate DB