Fossil SCM

Merge changes from trunk.

drh 2017-01-10 19:09 UTC remarks-on-checkins merge
Commit 43fa1ecc734c9fd2a678fa9e74cef65eda2b4df7
Parent b78d1a67b732c92…
4 files changed +3 -1 +1 -1 +1 -1 +1 -1
~ src/db.c ~ src/makemake.tcl ~ src/report.c ~ win/Makefile.msc
M src/db.c
+3 -1
--- src/db.c
+++ src/db.c
@@ -1136,13 +1136,15 @@
11361136
 **
11371137
 ** Return -1 if zLabel does not match any open database.
11381138
 */
11391139
 int db_database_slot(const char *zLabel){
11401140
 int iSlot = -1;
1141
+ int rc;
11411142
 Stmt q;
11421143
 if( g.db==0 ) return iSlot;
1143
- db_prepare(&q, "PRAGMA database_list");
1144
+ rc = db_prepare_ignore_error(&q, "PRAGMA database_list");
1145
+ if( rc!=SQLITE_OK ) return iSlot;
11441146
 while( db_step(&q)==SQLITE_ROW ){
11451147
 if( fossil_strcmp(db_column_text(&q,1),zLabel)==0 ){
11461148
 iSlot = db_column_int(&q, 0);
11471149
 break;
11481150
 }
11491151
--- src/db.c
+++ src/db.c
@@ -1136,13 +1136,15 @@
1136 **
1137 ** Return -1 if zLabel does not match any open database.
1138 */
1139 int db_database_slot(const char *zLabel){
1140 int iSlot = -1;
 
1141 Stmt q;
1142 if( g.db==0 ) return iSlot;
1143 db_prepare(&q, "PRAGMA database_list");
 
1144 while( db_step(&q)==SQLITE_ROW ){
1145 if( fossil_strcmp(db_column_text(&q,1),zLabel)==0 ){
1146 iSlot = db_column_int(&q, 0);
1147 break;
1148 }
1149
--- src/db.c
+++ src/db.c
@@ -1136,13 +1136,15 @@
1136 **
1137 ** Return -1 if zLabel does not match any open database.
1138 */
1139 int db_database_slot(const char *zLabel){
1140 int iSlot = -1;
1141 int rc;
1142 Stmt q;
1143 if( g.db==0 ) return iSlot;
1144 rc = db_prepare_ignore_error(&q, "PRAGMA database_list");
1145 if( rc!=SQLITE_OK ) return iSlot;
1146 while( db_step(&q)==SQLITE_ROW ){
1147 if( fossil_strcmp(db_column_text(&q,1),zLabel)==0 ){
1148 iSlot = db_column_int(&q, 0);
1149 break;
1150 }
1151
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1613,11 +1613,11 @@
16131613
 !else
16141614
 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
16151615
 !endif
16161616
16171617
 !if $(FOSSIL_ENABLE_WINXP)!=0
1618
-XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
1618
+XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
16191619
 CFLAGS = $(CFLAGS) $(XPCFLAGS)
16201620
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
16211621
 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
16221622
 !else
16231623
 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
16241624
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1613,11 +1613,11 @@
1613 !else
1614 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
1615 !endif
1616
1617 !if $(FOSSIL_ENABLE_WINXP)!=0
1618 XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
1619 CFLAGS = $(CFLAGS) $(XPCFLAGS)
1620 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1621 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1622 !else
1623 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1624
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1613,11 +1613,11 @@
1613 !else
1614 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
1615 !endif
1616
1617 !if $(FOSSIL_ENABLE_WINXP)!=0
1618 XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1619 CFLAGS = $(CFLAGS) $(XPCFLAGS)
1620 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1621 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1622 !else
1623 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1624
M src/report.c
+1 -1
--- src/report.c
+++ src/report.c
@@ -916,11 +916,11 @@
916916
917917
 nVar = sqlite3_bind_parameter_count(pStmt);
918918
 for(i=1; i<=nVar; i++){
919919
 const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
920920
 if( zVar==0 ) continue;
921
- if( zVar[0]!='$' && zVar[0]!='$' && zVar[0]!=':' ) continue;
921
+ if( zVar[0]!='$' && zVar[0]!='@' && zVar[0]!=':' ) continue;
922922
 if( !fossil_islower(zVar[1]) ) continue;
923923
 if( strcmp(zVar, "$login")==0 ){
924924
 sqlite3_bind_text(pStmt, i, g.zLogin, -1, SQLITE_TRANSIENT);
925925
 }else{
926926
 sqlite3_bind_text(pStmt, i, P(zVar+1), -1, SQLITE_TRANSIENT);
927927
--- src/report.c
+++ src/report.c
@@ -916,11 +916,11 @@
916
917 nVar = sqlite3_bind_parameter_count(pStmt);
918 for(i=1; i<=nVar; i++){
919 const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
920 if( zVar==0 ) continue;
921 if( zVar[0]!='$' && zVar[0]!='$' && zVar[0]!=':' ) continue;
922 if( !fossil_islower(zVar[1]) ) continue;
923 if( strcmp(zVar, "$login")==0 ){
924 sqlite3_bind_text(pStmt, i, g.zLogin, -1, SQLITE_TRANSIENT);
925 }else{
926 sqlite3_bind_text(pStmt, i, P(zVar+1), -1, SQLITE_TRANSIENT);
927
--- src/report.c
+++ src/report.c
@@ -916,11 +916,11 @@
916
917 nVar = sqlite3_bind_parameter_count(pStmt);
918 for(i=1; i<=nVar; i++){
919 const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
920 if( zVar==0 ) continue;
921 if( zVar[0]!='$' && zVar[0]!='@' && zVar[0]!=':' ) continue;
922 if( !fossil_islower(zVar[1]) ) continue;
923 if( strcmp(zVar, "$login")==0 ){
924 sqlite3_bind_text(pStmt, i, g.zLogin, -1, SQLITE_TRANSIENT);
925 }else{
926 sqlite3_bind_text(pStmt, i, P(zVar+1), -1, SQLITE_TRANSIENT);
927
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -210,11 +210,11 @@
210210
 !else
211211
 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
212212
 !endif
213213
214214
 !if $(FOSSIL_ENABLE_WINXP)!=0
215
-XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
215
+XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
216216
 CFLAGS = $(CFLAGS) $(XPCFLAGS)
217217
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
218218
 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
219219
 !else
220220
 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
221221
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -210,11 +210,11 @@
210 !else
211 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
212 !endif
213
214 !if $(FOSSIL_ENABLE_WINXP)!=0
215 XPCFLAGS = $(XPCFLAGS) /D_USING_V110_SDK71_=1
216 CFLAGS = $(CFLAGS) $(XPCFLAGS)
217 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
218 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
219 !else
220 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
221
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -210,11 +210,11 @@
210 !else
211 LDFLAGS = $(LDFLAGS) /NODEFAULTLIB:msvcrt /MANIFEST:NO
212 !endif
213
214 !if $(FOSSIL_ENABLE_WINXP)!=0
215 XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
216 CFLAGS = $(CFLAGS) $(XPCFLAGS)
217 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
218 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
219 !else
220 XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
221

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button