Fossil SCM
Simplifications to db_get_manifest_setting().
Commit
ed6b0c0b5c65c8def8de5c9bf8f5ecf28f46768f6e53b20a42a6c1ff43bf40c8
Parent
eb41a9f3c4493eb…
1 file changed
+6
-18
M
src/db.c
+6
-18
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -4087,30 +4087,18 @@ | ||
| 4087 | 4087 | /* Look for the versioned setting first */ |
| 4088 | 4088 | zVal = db_get_versioned("manifest", 0, zCkin); |
| 4089 | 4089 | |
| 4090 | 4090 | if( zVal==0 && g.repositoryOpen ){ |
| 4091 | 4091 | /* No versioned setting, look for the repository setting second */ |
| 4092 | - static char *zCached = 0; | |
| 4093 | - if( zCached ){ | |
| 4094 | - zVal = zCached; | |
| 4095 | - }else{ | |
| 4096 | - zVal = db_text(0, "SELECT value FROM config WHERE name='manifest'"); | |
| 4097 | - } | |
| 4092 | + zVal = db_text(0, "SELECT value FROM config WHERE name='manifest'"); | |
| 4098 | 4093 | if( zVal==0 && g.zConfigDbName ){ |
| 4099 | 4094 | /* No repository setting either, look for a global setting */ |
| 4100 | - static Stmt q2; | |
| 4101 | - const char *zRes; | |
| 4102 | - db_swap_connections(); | |
| 4103 | - db_static_prepare(&q2, | |
| 4104 | - "SELECT value FROM global_config WHERE name='manifest'"); | |
| 4105 | - db_swap_connections(); | |
| 4106 | - if( db_step(&q2)==SQLITE_ROW && (zRes = db_column_text(&q2,0))!=0 ){ | |
| 4107 | - zVal = fossil_strdup(zRes); | |
| 4108 | - } | |
| 4109 | - db_reset(&q2); | |
| 4110 | - } | |
| 4111 | - zCached = zVal; | |
| 4095 | + db_swap_connections(); | |
| 4096 | + zVal = db_text(0, | |
| 4097 | + "SELECT value FROM global_config WHERE name='manifest'"); | |
| 4098 | + db_swap_connections(); | |
| 4099 | + } | |
| 4112 | 4100 | } |
| 4113 | 4101 | if( zVal==0 || is_false(zVal) ){ |
| 4114 | 4102 | return 0; |
| 4115 | 4103 | }else if( is_truth(zVal) ){ |
| 4116 | 4104 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 4117 | 4105 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4087,30 +4087,18 @@ | |
| 4087 | /* Look for the versioned setting first */ |
| 4088 | zVal = db_get_versioned("manifest", 0, zCkin); |
| 4089 | |
| 4090 | if( zVal==0 && g.repositoryOpen ){ |
| 4091 | /* No versioned setting, look for the repository setting second */ |
| 4092 | static char *zCached = 0; |
| 4093 | if( zCached ){ |
| 4094 | zVal = zCached; |
| 4095 | }else{ |
| 4096 | zVal = db_text(0, "SELECT value FROM config WHERE name='manifest'"); |
| 4097 | } |
| 4098 | if( zVal==0 && g.zConfigDbName ){ |
| 4099 | /* No repository setting either, look for a global setting */ |
| 4100 | static Stmt q2; |
| 4101 | const char *zRes; |
| 4102 | db_swap_connections(); |
| 4103 | db_static_prepare(&q2, |
| 4104 | "SELECT value FROM global_config WHERE name='manifest'"); |
| 4105 | db_swap_connections(); |
| 4106 | if( db_step(&q2)==SQLITE_ROW && (zRes = db_column_text(&q2,0))!=0 ){ |
| 4107 | zVal = fossil_strdup(zRes); |
| 4108 | } |
| 4109 | db_reset(&q2); |
| 4110 | } |
| 4111 | zCached = zVal; |
| 4112 | } |
| 4113 | if( zVal==0 || is_false(zVal) ){ |
| 4114 | return 0; |
| 4115 | }else if( is_truth(zVal) ){ |
| 4116 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 4117 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4087,30 +4087,18 @@ | |
| 4087 | /* Look for the versioned setting first */ |
| 4088 | zVal = db_get_versioned("manifest", 0, zCkin); |
| 4089 | |
| 4090 | if( zVal==0 && g.repositoryOpen ){ |
| 4091 | /* No versioned setting, look for the repository setting second */ |
| 4092 | zVal = db_text(0, "SELECT value FROM config WHERE name='manifest'"); |
| 4093 | if( zVal==0 && g.zConfigDbName ){ |
| 4094 | /* No repository setting either, look for a global setting */ |
| 4095 | db_swap_connections(); |
| 4096 | zVal = db_text(0, |
| 4097 | "SELECT value FROM global_config WHERE name='manifest'"); |
| 4098 | db_swap_connections(); |
| 4099 | } |
| 4100 | } |
| 4101 | if( zVal==0 || is_false(zVal) ){ |
| 4102 | return 0; |
| 4103 | }else if( is_truth(zVal) ){ |
| 4104 | return MFESTFLG_RAW|MFESTFLG_UUID; |
| 4105 |