Fossil SCM
Factored out an extraneous var from [1bb06c94]. No functional changes.
Commit
e0686dda41b9990731fdb68c835c7973573f9b0aa8c6027fe1e5ff5423c82e60
Parent
6d9ac907e550e85…
1 file changed
+1
-2
M
src/db.c
+1
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -878,16 +878,15 @@ | ||
| 878 | 878 | ** utility routine. |
| 879 | 879 | */ |
| 880 | 880 | void db_test_db_prepare(void){ |
| 881 | 881 | const int fAuthReport = find_option("auth-report",0,0)!=0; |
| 882 | 882 | const int fAuthSchema = find_option("auth-ticket",0,0)!=0; |
| 883 | - const int fAuth = fAuthReport + fAuthSchema; | |
| 884 | 883 | char * zReportErr = 0; /* auth-report error string. */ |
| 885 | 884 | int nSchemaErr = 0; /* Number of auth-ticket errors. */ |
| 886 | 885 | Stmt err; |
| 887 | 886 | |
| 888 | - if(fAuth>1){ | |
| 887 | + if(fAuthReport + fAuthSchema > 1){ | |
| 889 | 888 | fossil_fatal("Only one of --auth-report or --auth-ticket " |
| 890 | 889 | "may be used."); |
| 891 | 890 | } |
| 892 | 891 | db_find_and_open_repository(0,0); |
| 893 | 892 | verify_all_options(); |
| 894 | 893 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -878,16 +878,15 @@ | |
| 878 | ** utility routine. |
| 879 | */ |
| 880 | void db_test_db_prepare(void){ |
| 881 | const int fAuthReport = find_option("auth-report",0,0)!=0; |
| 882 | const int fAuthSchema = find_option("auth-ticket",0,0)!=0; |
| 883 | const int fAuth = fAuthReport + fAuthSchema; |
| 884 | char * zReportErr = 0; /* auth-report error string. */ |
| 885 | int nSchemaErr = 0; /* Number of auth-ticket errors. */ |
| 886 | Stmt err; |
| 887 | |
| 888 | if(fAuth>1){ |
| 889 | fossil_fatal("Only one of --auth-report or --auth-ticket " |
| 890 | "may be used."); |
| 891 | } |
| 892 | db_find_and_open_repository(0,0); |
| 893 | verify_all_options(); |
| 894 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -878,16 +878,15 @@ | |
| 878 | ** utility routine. |
| 879 | */ |
| 880 | void db_test_db_prepare(void){ |
| 881 | const int fAuthReport = find_option("auth-report",0,0)!=0; |
| 882 | const int fAuthSchema = find_option("auth-ticket",0,0)!=0; |
| 883 | char * zReportErr = 0; /* auth-report error string. */ |
| 884 | int nSchemaErr = 0; /* Number of auth-ticket errors. */ |
| 885 | Stmt err; |
| 886 | |
| 887 | if(fAuthReport + fAuthSchema > 1){ |
| 888 | fossil_fatal("Only one of --auth-report or --auth-ticket " |
| 889 | "may be used."); |
| 890 | } |
| 891 | db_find_and_open_repository(0,0); |
| 892 | verify_all_options(); |
| 893 |