Fossil SCM
Renamed branch_of_rid() to branch_of_ckin_rid() to disambiguate it from the new branch_of_file_rid() function and to make it clear to callers what parameter type it expects.
Commit
da1adac6d103743f59a7a10a5ec8891606067279817b59356d0acfac07531d9a
Parent
d43afe59f3715d1…
3 files changed
+2
-2
+2
-2
+2
-2
+2
-2
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -26,11 +26,11 @@ | ||
| 26 | 26 | ** check-in. |
| 27 | 27 | ** |
| 28 | 28 | ** Space to hold the returned value is obtained from fossil_malloc() |
| 29 | 29 | ** and should be freed by the caller. |
| 30 | 30 | */ |
| 31 | -char *branch_of_rid(int rid){ | |
| 31 | +char *branch_of_ckin_rid(int rid){ | |
| 32 | 32 | char *zBr = 0; |
| 33 | 33 | static Stmt q; |
| 34 | 34 | db_static_prepare(&q, |
| 35 | 35 | "SELECT value FROM tagxref" |
| 36 | 36 | " WHERE rid=$rid AND tagid=%d" |
| @@ -47,11 +47,11 @@ | ||
| 47 | 47 | } |
| 48 | 48 | return zBr; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | /* |
| 52 | -** Same as branch_of_rid() except that it takes a file RID, not a | |
| 52 | +** Same as branch_of_ckin_rid() except that it takes a file RID, not a | |
| 53 | 53 | ** check-in RID. |
| 54 | 54 | */ |
| 55 | 55 | char *branch_of_file_rid(int rid){ |
| 56 | 56 | char *zBr = 0; |
| 57 | 57 | static Stmt q; |
| 58 | 58 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -26,11 +26,11 @@ | |
| 26 | ** check-in. |
| 27 | ** |
| 28 | ** Space to hold the returned value is obtained from fossil_malloc() |
| 29 | ** and should be freed by the caller. |
| 30 | */ |
| 31 | char *branch_of_rid(int rid){ |
| 32 | char *zBr = 0; |
| 33 | static Stmt q; |
| 34 | db_static_prepare(&q, |
| 35 | "SELECT value FROM tagxref" |
| 36 | " WHERE rid=$rid AND tagid=%d" |
| @@ -47,11 +47,11 @@ | |
| 47 | } |
| 48 | return zBr; |
| 49 | } |
| 50 | |
| 51 | /* |
| 52 | ** Same as branch_of_rid() except that it takes a file RID, not a |
| 53 | ** check-in RID. |
| 54 | */ |
| 55 | char *branch_of_file_rid(int rid){ |
| 56 | char *zBr = 0; |
| 57 | static Stmt q; |
| 58 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -26,11 +26,11 @@ | |
| 26 | ** check-in. |
| 27 | ** |
| 28 | ** Space to hold the returned value is obtained from fossil_malloc() |
| 29 | ** and should be freed by the caller. |
| 30 | */ |
| 31 | char *branch_of_ckin_rid(int rid){ |
| 32 | char *zBr = 0; |
| 33 | static Stmt q; |
| 34 | db_static_prepare(&q, |
| 35 | "SELECT value FROM tagxref" |
| 36 | " WHERE rid=$rid AND tagid=%d" |
| @@ -47,11 +47,11 @@ | |
| 47 | } |
| 48 | return zBr; |
| 49 | } |
| 50 | |
| 51 | /* |
| 52 | ** Same as branch_of_ckin_rid() except that it takes a file RID, not a |
| 53 | ** check-in RID. |
| 54 | */ |
| 55 | char *branch_of_file_rid(int rid){ |
| 56 | char *zBr = 0; |
| 57 | static Stmt q; |
| 58 |
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -649,11 +649,11 @@ | ||
| 649 | 649 | " FROM blob, event" |
| 650 | 650 | " WHERE blob.rid=%d" |
| 651 | 651 | " AND event.objid=%d", |
| 652 | 652 | rid, rid |
| 653 | 653 | ); |
| 654 | - zBrName = branch_of_rid(rid); | |
| 654 | + zBrName = branch_of_ckin_rid(rid); | |
| 655 | 655 | |
| 656 | 656 | cookie_link_parameter("diff","diff","2"); |
| 657 | 657 | diffType = atoi(PD("diff","2")); |
| 658 | 658 | if( db_step(&q1)==SQLITE_ROW ){ |
| 659 | 659 | const char *zUuid = db_column_text(&q1, 0); |
| @@ -1242,11 +1242,11 @@ | ||
| 1242 | 1242 | }else{ |
| 1243 | 1243 | style_header("Check-in Differences"); |
| 1244 | 1244 | } |
| 1245 | 1245 | if( P("nohdr")==0 ){ |
| 1246 | 1246 | if( zBranch ){ |
| 1247 | - char *zRealBranch = branch_of_rid(ridTo); | |
| 1247 | + char *zRealBranch = branch_of_ckin_rid(ridTo); | |
| 1248 | 1248 | char *zToUuid = rid_to_uuid(ridTo); |
| 1249 | 1249 | char *zFromUuid = rid_to_uuid(ridFrom); |
| 1250 | 1250 | @ <h2>Changes In Branch \ |
| 1251 | 1251 | @ %z(href("%R/timeline?r=%T",zRealBranch))%h(zRealBranch)</a> |
| 1252 | 1252 | if( ridTo != symbolic_name_to_rid(zRealBranch,"ci") ){ |
| 1253 | 1253 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -649,11 +649,11 @@ | |
| 649 | " FROM blob, event" |
| 650 | " WHERE blob.rid=%d" |
| 651 | " AND event.objid=%d", |
| 652 | rid, rid |
| 653 | ); |
| 654 | zBrName = branch_of_rid(rid); |
| 655 | |
| 656 | cookie_link_parameter("diff","diff","2"); |
| 657 | diffType = atoi(PD("diff","2")); |
| 658 | if( db_step(&q1)==SQLITE_ROW ){ |
| 659 | const char *zUuid = db_column_text(&q1, 0); |
| @@ -1242,11 +1242,11 @@ | |
| 1242 | }else{ |
| 1243 | style_header("Check-in Differences"); |
| 1244 | } |
| 1245 | if( P("nohdr")==0 ){ |
| 1246 | if( zBranch ){ |
| 1247 | char *zRealBranch = branch_of_rid(ridTo); |
| 1248 | char *zToUuid = rid_to_uuid(ridTo); |
| 1249 | char *zFromUuid = rid_to_uuid(ridFrom); |
| 1250 | @ <h2>Changes In Branch \ |
| 1251 | @ %z(href("%R/timeline?r=%T",zRealBranch))%h(zRealBranch)</a> |
| 1252 | if( ridTo != symbolic_name_to_rid(zRealBranch,"ci") ){ |
| 1253 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -649,11 +649,11 @@ | |
| 649 | " FROM blob, event" |
| 650 | " WHERE blob.rid=%d" |
| 651 | " AND event.objid=%d", |
| 652 | rid, rid |
| 653 | ); |
| 654 | zBrName = branch_of_ckin_rid(rid); |
| 655 | |
| 656 | cookie_link_parameter("diff","diff","2"); |
| 657 | diffType = atoi(PD("diff","2")); |
| 658 | if( db_step(&q1)==SQLITE_ROW ){ |
| 659 | const char *zUuid = db_column_text(&q1, 0); |
| @@ -1242,11 +1242,11 @@ | |
| 1242 | }else{ |
| 1243 | style_header("Check-in Differences"); |
| 1244 | } |
| 1245 | if( P("nohdr")==0 ){ |
| 1246 | if( zBranch ){ |
| 1247 | char *zRealBranch = branch_of_ckin_rid(ridTo); |
| 1248 | char *zToUuid = rid_to_uuid(ridTo); |
| 1249 | char *zFromUuid = rid_to_uuid(ridFrom); |
| 1250 | @ <h2>Changes In Branch \ |
| 1251 | @ %z(href("%R/timeline?r=%T",zRealBranch))%h(zRealBranch)</a> |
| 1252 | if( ridTo != symbolic_name_to_rid(zRealBranch,"ci") ){ |
| 1253 |
+2
-2
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -155,11 +155,11 @@ | ||
| 155 | 155 | */ |
| 156 | 156 | int start_of_branch(int rid, int eType){ |
| 157 | 157 | Stmt q; |
| 158 | 158 | int rc; |
| 159 | 159 | int ans = rid; |
| 160 | - char *zBr = branch_of_rid(rid); | |
| 160 | + char *zBr = branch_of_ckin_rid(rid); | |
| 161 | 161 | db_prepare(&q, |
| 162 | 162 | "SELECT pid, EXISTS(SELECT 1 FROM tagxref" |
| 163 | 163 | " WHERE tagid=%d AND tagtype>0" |
| 164 | 164 | " AND value=%Q AND rid=plink.pid)" |
| 165 | 165 | " FROM plink" |
| @@ -175,11 +175,11 @@ | ||
| 175 | 175 | if( eType==1 && db_column_int(&q,1)==0 ) break; |
| 176 | 176 | ans = db_column_int(&q, 0); |
| 177 | 177 | }while( db_column_int(&q, 1)==1 && ans>0 ); |
| 178 | 178 | db_finalize(&q); |
| 179 | 179 | if( eType==2 && ans>0 ){ |
| 180 | - zBr = branch_of_rid(ans); | |
| 180 | + zBr = branch_of_ckin_rid(ans); | |
| 181 | 181 | ans = compute_youngest_ancestor_in_branch(rid, zBr); |
| 182 | 182 | fossil_free(zBr); |
| 183 | 183 | } |
| 184 | 184 | return ans; |
| 185 | 185 | } |
| 186 | 186 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -155,11 +155,11 @@ | |
| 155 | */ |
| 156 | int start_of_branch(int rid, int eType){ |
| 157 | Stmt q; |
| 158 | int rc; |
| 159 | int ans = rid; |
| 160 | char *zBr = branch_of_rid(rid); |
| 161 | db_prepare(&q, |
| 162 | "SELECT pid, EXISTS(SELECT 1 FROM tagxref" |
| 163 | " WHERE tagid=%d AND tagtype>0" |
| 164 | " AND value=%Q AND rid=plink.pid)" |
| 165 | " FROM plink" |
| @@ -175,11 +175,11 @@ | |
| 175 | if( eType==1 && db_column_int(&q,1)==0 ) break; |
| 176 | ans = db_column_int(&q, 0); |
| 177 | }while( db_column_int(&q, 1)==1 && ans>0 ); |
| 178 | db_finalize(&q); |
| 179 | if( eType==2 && ans>0 ){ |
| 180 | zBr = branch_of_rid(ans); |
| 181 | ans = compute_youngest_ancestor_in_branch(rid, zBr); |
| 182 | fossil_free(zBr); |
| 183 | } |
| 184 | return ans; |
| 185 | } |
| 186 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -155,11 +155,11 @@ | |
| 155 | */ |
| 156 | int start_of_branch(int rid, int eType){ |
| 157 | Stmt q; |
| 158 | int rc; |
| 159 | int ans = rid; |
| 160 | char *zBr = branch_of_ckin_rid(rid); |
| 161 | db_prepare(&q, |
| 162 | "SELECT pid, EXISTS(SELECT 1 FROM tagxref" |
| 163 | " WHERE tagid=%d AND tagtype>0" |
| 164 | " AND value=%Q AND rid=plink.pid)" |
| 165 | " FROM plink" |
| @@ -175,11 +175,11 @@ | |
| 175 | if( eType==1 && db_column_int(&q,1)==0 ) break; |
| 176 | ans = db_column_int(&q, 0); |
| 177 | }while( db_column_int(&q, 1)==1 && ans>0 ); |
| 178 | db_finalize(&q); |
| 179 | if( eType==2 && ans>0 ){ |
| 180 | zBr = branch_of_ckin_rid(ans); |
| 181 | ans = compute_youngest_ancestor_in_branch(rid, zBr); |
| 182 | fossil_free(zBr); |
| 183 | } |
| 184 | return ans; |
| 185 | } |
| 186 |