Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | (cherry-pick): Define the NORETURN macro for MSVC |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | branch-2.1 |
| Files: | files | file ages | folders |
| SHA3-256: |
1112616e99047e3190c6b4494f23e917 |
| User & Date: | jan.nijtmans 2017-03-25 19:15:00.000 |
Context
|
2017-03-30
| ||
| 15:27 | Update the built-in SQLite to 3.18.0 Closed-Leaf check-in: 017baa24e1 user: jan.nijtmans tags: branch-2.1 | |
|
2017-03-25
| ||
| 19:15 | (cherry-pick): Define the NORETURN macro for MSVC check-in: 1112616e99 user: jan.nijtmans tags: branch-2.1 | |
|
2017-03-23
| ||
| 22:09 | Define the NORETURN macro for MSVC check-in: a99c9ffec2 user: drh tags: trunk | |
|
2017-03-22
| ||
| 16:26 | (cherry-pick): Fixes to SVN import received from Christophe Gouiran (bechris13250 at gmail) check-in: dec3383ed4 user: jan.nijtmans tags: branch-2.1 | |
Changes
Changes to src/config.h.
| ︙ | ︙ | |||
227 228 229 230 231 232 233 234 235 236 237 238 239 240 | #endif /* ** A marker for functions that never return. */ #if defined(__GNUC__) || defined(__clang__) # define NORETURN __attribute__((__noreturn__)) #else # define NORETURN #endif /* ** Number of elements in an array */ | > > | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 | #endif /* ** A marker for functions that never return. */ #if defined(__GNUC__) || defined(__clang__) # define NORETURN __attribute__((__noreturn__)) #elif defined(_MSC_VER) && (_MSC_VER >= 1310) # define NORETURN __declspec(noreturn) #else # define NORETURN #endif /* ** Number of elements in an array */ |
| ︙ | ︙ |
Changes to src/shell.c.
| ︙ | ︙ | |||
2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 |
/*
** This is the callback routine from sqlite3_exec() that appends all
** output onto the end of a ShellText object.
*/
static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
ShellText *p = (ShellText*)pArg;
int i;
if( p->n ) appendText(p, "|", 0);
for(i=0; i<nArg; i++){
if( i ) appendText(p, ",", 0);
if( azArg[i] ) appendText(p, azArg[i], 0);
}
return 0;
}
| > | 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 |
/*
** This is the callback routine from sqlite3_exec() that appends all
** output onto the end of a ShellText object.
*/
static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
ShellText *p = (ShellText*)pArg;
int i;
UNUSED_PARAMETER(az);
if( p->n ) appendText(p, "|", 0);
for(i=0; i<nArg; i++){
if( i ) appendText(p, ",", 0);
if( azArg[i] ) appendText(p, azArg[i], 0);
}
return 0;
}
|
| ︙ | ︙ | |||
4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 |
int i;
ShellClearFlag(p, SHFLG_PreserveRowid);
for(i=1; i<nArg; i++){
if( azArg[i][0]=='-' ){
const char *z = azArg[i]+1;
if( z[0]=='-' ) z++;
if( strcmp(z,"preserve-rowids")==0 ){
ShellSetFlag(p, SHFLG_PreserveRowid);
}else
{
raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);
rc = 1;
goto meta_command_exit;
}
}else if( zLike ){
| > > > > > > > | 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 |
int i;
ShellClearFlag(p, SHFLG_PreserveRowid);
for(i=1; i<nArg; i++){
if( azArg[i][0]=='-' ){
const char *z = azArg[i]+1;
if( z[0]=='-' ) z++;
if( strcmp(z,"preserve-rowids")==0 ){
#ifdef SQLITE_OMIT_VIRTUALTABLE
raw_printf(stderr, "The --preserve-rowids option is not compatible"
" with SQLITE_OMIT_VIRTUALTABLE\n");
rc = 1;
goto meta_command_exit;
#else
ShellSetFlag(p, SHFLG_PreserveRowid);
#endif
}else
{
raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);
rc = 1;
goto meta_command_exit;
}
}else if( zLike ){
|
| ︙ | ︙ |