Fossil SCM
Removed some dead SQL code and fixed transaction closing in a "cannot happen" scenario in load_vfile_from_rid(), per ML discussion.
Commit
3e9f9b0609095ffc2d41cb78ea435f7d7606f70b
Parent
429aba33c27a598…
1 file changed
+4
-2
+4
-2
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -82,12 +82,14 @@ | ||
| 82 | 82 | return; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | db_begin_transaction(); |
| 86 | 86 | p = manifest_get(vid, CFTYPE_MANIFEST); |
| 87 | - if( p==0 ) return; | |
| 88 | - db_multi_exec("DELETE FROM vfile WHERE vid=%d", vid); | |
| 87 | + if( p==0 ) { | |
| 88 | + db_end_transaction(1); | |
| 89 | + return; | |
| 90 | + } | |
| 89 | 91 | db_prepare(&ins, |
| 90 | 92 | "INSERT INTO vfile(vid,isexe,islink,rid,mrid,pathname) " |
| 91 | 93 | " VALUES(:vid,:isexe,:islink,:id,:id,:name)"); |
| 92 | 94 | db_prepare(&ridq, "SELECT rid,size FROM blob WHERE uuid=:uuid"); |
| 93 | 95 | db_bind_int(&ins, ":vid", vid); |
| 94 | 96 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -82,12 +82,14 @@ | |
| 82 | return; |
| 83 | } |
| 84 | |
| 85 | db_begin_transaction(); |
| 86 | p = manifest_get(vid, CFTYPE_MANIFEST); |
| 87 | if( p==0 ) return; |
| 88 | db_multi_exec("DELETE FROM vfile WHERE vid=%d", vid); |
| 89 | db_prepare(&ins, |
| 90 | "INSERT INTO vfile(vid,isexe,islink,rid,mrid,pathname) " |
| 91 | " VALUES(:vid,:isexe,:islink,:id,:id,:name)"); |
| 92 | db_prepare(&ridq, "SELECT rid,size FROM blob WHERE uuid=:uuid"); |
| 93 | db_bind_int(&ins, ":vid", vid); |
| 94 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -82,12 +82,14 @@ | |
| 82 | return; |
| 83 | } |
| 84 | |
| 85 | db_begin_transaction(); |
| 86 | p = manifest_get(vid, CFTYPE_MANIFEST); |
| 87 | if( p==0 ) { |
| 88 | db_end_transaction(1); |
| 89 | return; |
| 90 | } |
| 91 | db_prepare(&ins, |
| 92 | "INSERT INTO vfile(vid,isexe,islink,rid,mrid,pathname) " |
| 93 | " VALUES(:vid,:isexe,:islink,:id,:id,:name)"); |
| 94 | db_prepare(&ridq, "SELECT rid,size FROM blob WHERE uuid=:uuid"); |
| 95 | db_bind_int(&ins, ":vid", vid); |
| 96 |