paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the ZLIB version announcement in the CLI out of the default banner

Browse Source 
and put it in the ".version" command.

FossilOrigin-Name: 231679d6f8c0c3d957c8daa88b0743449b60b47159e114f4bc073a8612a73b2a
This commit is contained in:
drh
2018-01-16 20:05:27 +00:00
parent fff5367c24
commit 0ed2fd8a25
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c.in
+14 -3
View File
@@ -7537,6 +7537,20 @@ static int do_meta_command(char *zLine, ShellState *p){
if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
sqlite3_libversion(), sqlite3_sourceid());
#if SQLITE_HAVE_ZLIB
utf8_printf(p->out, "zlib version %s\n", zlibVersion());
#endif
#define CTIMEOPT_VAL_(opt) #opt
#define CTIMEOPT_VAL(opt) CTIMEOPT_VAL_(opt)
#if defined(__clang__) && defined(__clang_major__)
utf8_printf(p->out, "clang-" CTIMEOPT_VAL(__clang_major__) "."
CTIMEOPT_VAL(__clang_minor__) "."
CTIMEOPT_VAL(__clang_patchlevel__) "\n");
#elif defined(_MSC_VER)
utf8_printf(p->out, "msvc-" CTIMEOPT_VAL(_MSC_VER) "\n");
#elif defined(__GNUC__) && defined(__VERSION__)
utf8_printf(p->out, "gcc-" __VERSION__ "\n");
#endif
}else
if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
@@ -8380,9 +8394,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
"Enter \".help\" for usage hints.\n",
sqlite3_libversion(), sqlite3_sourceid()
);
#if SQLITE_HAVE_ZLIB
printf("Using zlib version %s.\n", zlibVersion());
#endif
if( warnInmemoryDb ){
printf("Connected to a ");
printBold("transient in-memory database");