/ Check-in [6c0b2e75]
Login

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

Overview
Comment:Fix a bug in win32 command-line client introduced during efforts to reduce the number of harmless compiler warnings (check-in (5982).) (CVS 5992)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6c0b2e7579ee5504617831a5e8bb6193e283ad30
User & Date: drh 2008-12-08 18:27:31
Context
2008-12-08
21:37
Some minor name refactoring in where.c. Avoid declaring variables before initializing them in the amalgamation because VC++ doesn't like that. (CVS 5993) check-in: 6ed696e7 user: drh tags: trunk
18:27
Fix a bug in win32 command-line client introduced during efforts to reduce the number of harmless compiler warnings (check-in (5982).) (CVS 5992) check-in: 6c0b2e75 user: drh tags: trunk
18:19
The amalgamation now compiles cleanly on GCC with options -pedantic-errors -Wno-long-long. (CVS 5991) check-in: 73c7302c user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/shell.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   ** This file contains code to implement the "sqlite" command line
    13     13   ** utility for accessing SQLite databases.
    14     14   **
    15         -** $Id: shell.c,v 1.190 2008/12/05 17:17:08 drh Exp $
           15  +** $Id: shell.c,v 1.191 2008/12/08 18:27:31 drh Exp $
    16     16   */
    17     17   #include <stdlib.h>
    18     18   #include <string.h>
    19     19   #include <stdio.h>
    20     20   #include <assert.h>
    21     21   #include "sqlite3.h"
    22     22   #include <ctype.h>
................................................................................
    61     61    */
    62     62   #define isatty(x) 1
    63     63   #endif
    64     64   
    65     65   #if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(__RTP__) && !defined(_WRS_KERNEL)
    66     66   #include <sys/time.h>
    67     67   #include <sys/resource.h>
    68         -
    69         -/*
    70         -** Used to prevent warnings about unused parameters
    71         -*/
    72         -#define UNUSED_PARAMETER(x) (void)(x)
    73         -
    74     68   
    75     69   /* Saved resource information for the beginning of an operation */
    76     70   static struct rusage sBegin;
    77     71   
    78     72   /* True if the timer is enabled */
    79     73   static int enableTimer = 0;
    80     74   
................................................................................
   110    104   #define HAS_TIMER 1
   111    105   #else
   112    106   #define BEGIN_TIMER 
   113    107   #define END_TIMER
   114    108   #define HAS_TIMER 0
   115    109   #endif
   116    110   
          111  +/*
          112  +** Used to prevent warnings about unused parameters
          113  +*/
          114  +#define UNUSED_PARAMETER(x) (void)(x)
   117    115   
   118    116   /*
   119    117   ** If the following flag is set, then command execution stops
   120    118   ** at an error if we are not interactive.
   121    119   */
   122    120   static int bail_on_error = 0;
   123    121