SQLite

Check-in [b547e7ea75]
Login

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

Overview
Comment:Add "return rc;" to the end of sqlite3_test_control(). (CVS 4760)
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: b547e7ea75294997de4298e30af813f36dfa3b05
User & Date: danielk1977 2008-01-31 15:31:02.000
Context
2008-01-31
15:53
Make sure virtual table interfaces are not invoked after EOF when the virtual table appears in an outer join. Ticket #2894. (CVS 4761) (check-in: face510bc1 user: drh tags: trunk)
15:31
Add "return rc;" to the end of sqlite3_test_control(). (CVS 4760) (check-in: b547e7ea75 user: danielk1977 tags: trunk)
14:54
Fix assertion fault in sqllimits1.test encountered when auto_vacuum is enabled. Correct the sqllimit1 tests to account for extra pages inserted by auto_vacuum. (CVS 4759) (check-in: 9b207d1a66 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
︙︙
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

**
*************************************************************************
** Main file for the SQLite library.  The routines in this file
** implement the programmer interface to the library.  Routines in
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
** $Id: main.c,v 1.416 2008/01/31 14:43:24 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
#ifdef SQLITE_ENABLE_FTS3
# include "fts3.h"
#endif









|








10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

**
*************************************************************************
** Main file for the SQLite library.  The routines in this file
** implement the programmer interface to the library.  Routines in
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
** $Id: main.c,v 1.417 2008/01/31 15:31:02 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
#ifdef SQLITE_ENABLE_FTS3
# include "fts3.h"
#endif
︙︙
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853

#endif /* SQLITE_OMIT_UTF16 */

/*
** Return the most recent error code generated by an SQLite routine. If NULL is
** passed to this function, we assume a malloc() failed during sqlite3_open().
*/
int sqlite3_errcode(sqlite3 *db){
  if( !sqlite3SafetyCheckSickOrOk(db) ){
    return SQLITE_MISUSE;
  }
  if( !db || db->mallocFailed ){
    return SQLITE_NOMEM;
  }
  return db->errCode & db->errMask;
}








|








839
840
841
842
843
844
845
846
847
848
849
850
851
852
853

#endif /* SQLITE_OMIT_UTF16 */

/*
** Return the most recent error code generated by an SQLite routine. If NULL is
** passed to this function, we assume a malloc() failed during sqlite3_open().
*/
int sqlite3_errcode(sqlite3 *db){
  if( db && !sqlite3SafetyCheckSickOrOk(db) ){
    return SQLITE_MISUSE;
  }
  if( !db || db->mallocFailed ){
    return SQLITE_NOMEM;
  }
  return db->errCode & db->errMask;
}
︙︙
1501
1502
1503
1504
1505
1506
1507

1508

      int id = va_arg(ap, int);
      rc = sqlite3FaultPending(id);
      break;
    }
#endif /* SQLITE_OMIT_FAULTINJECTOR */
  }
  va_end(ap);

}








>


1501
1502
1503
1504
1505
1506
1507
1508
1509

      int id = va_arg(ap, int);
      rc = sqlite3FaultPending(id);
      break;
    }
#endif /* SQLITE_OMIT_FAULTINJECTOR */
  }
  va_end(ap);
  return rc;
}