Fossil SCM

Remove unused code from previous fork warning method.

andybradford 2015-04-14 00:42 UTC sync-forkwarn
Commit bc1e943fec5fa4159e0617d7e9f58ed7473c627a
Parent 731042d5ea4105f…
2 files changed -18 +2 -3
~ src/leaf.c ~ src/xfer.c
M src/leaf.c
-18
--- src/leaf.c
+++ src/leaf.c
@@ -73,28 +73,10 @@
7373
 }
7474
 db_reset(&q);
7575
 return nNonBranch;
7676
 }
7777
78
-/*
79
-** Return the primary parent pid given a child rid
80
-*/
81
-int primary_parent_pid_from_rid(int rid){
82
- static Stmt q;
83
- int pid = -1;
84
-
85
- db_static_prepare(&q,
86
- "SELECT pid FROM plink WHERE cid=:rid AND pid>0 AND isprim"
87
- );
88
- db_bind_int(&q, ":rid", rid);
89
- if( db_step(&q)==SQLITE_ROW ){
90
- pid = db_column_int(&q, 0);
91
- }
92
- db_reset(&q);
93
- return pid;
94
-}
95
-
9678
 /*
9779
 ** Recompute the entire LEAF table.
9880
 **
9981
 ** This can be expensive (5 seconds or so) for a really large repository.
10082
 ** So it is only done for things like a rebuild.
10183
--- src/leaf.c
+++ src/leaf.c
@@ -73,28 +73,10 @@
73 }
74 db_reset(&q);
75 return nNonBranch;
76 }
77
78 /*
79 ** Return the primary parent pid given a child rid
80 */
81 int primary_parent_pid_from_rid(int rid){
82 static Stmt q;
83 int pid = -1;
84
85 db_static_prepare(&q,
86 "SELECT pid FROM plink WHERE cid=:rid AND pid>0 AND isprim"
87 );
88 db_bind_int(&q, ":rid", rid);
89 if( db_step(&q)==SQLITE_ROW ){
90 pid = db_column_int(&q, 0);
91 }
92 db_reset(&q);
93 return pid;
94 }
95
96 /*
97 ** Recompute the entire LEAF table.
98 **
99 ** This can be expensive (5 seconds or so) for a really large repository.
100 ** So it is only done for things like a rebuild.
101
--- src/leaf.c
+++ src/leaf.c
@@ -73,28 +73,10 @@
73 }
74 db_reset(&q);
75 return nNonBranch;
76 }
77
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
78 /*
79 ** Recompute the entire LEAF table.
80 **
81 ** This can be expensive (5 seconds or so) for a really large repository.
82 ** So it is only done for things like a rebuild.
83
M src/xfer.c
+2 -3
--- src/xfer.c
+++ src/xfer.c
@@ -232,11 +232,10 @@
232232
 ** Any artifact successfully received by this routine is considered to
233233
 ** be public and is therefore removed from the "private" table.
234234
 */
235235
 static void xfer_accept_compressed_file(
236236
 Xfer *pXfer,
237
- int cloneFlag,
238237
 char **pzUuidList,
239238
 int *pnUuidList
240239
 ){
241240
 int szC; /* CSIZE */
242241
 int szU; /* USIZE */
@@ -1015,11 +1014,11 @@
10151014
 cgi_reset_content();
10161015
 @ error not\sauthorized\sto\swrite
10171016
 nErr++;
10181017
 break;
10191018
 }
1020
- xfer_accept_compressed_file(&xfer, 0, pzUuidList, pnUuidList);
1019
+ xfer_accept_compressed_file(&xfer, pzUuidList, pnUuidList);
10211020
 if( blob_size(&xfer.err) ){
10221021
 cgi_reset_content();
10231022
 @ error %T(blob_str(&xfer.err))
10241023
 nErr++;
10251024
 break;
@@ -1678,11 +1677,11 @@
16781677
 ** cfile UUID DELTASRC USIZE CSIZE \n CONTENT
16791678
 **
16801679
 ** Receive a compressed file transmitted from the server.
16811680
 */
16821681
 if( blob_eq(&xfer.aToken[0],"cfile") ){
1683
- xfer_accept_compressed_file(&xfer, (syncFlags & SYNC_CLONE)!=0, 0, 0);
1682
+ xfer_accept_compressed_file(&xfer, 0, 0);
16841683
 nArtifactRcvd++;
16851684
 }else
16861685
16871686
 /* gimme UUID
16881687
 **
16891688
--- src/xfer.c
+++ src/xfer.c
@@ -232,11 +232,10 @@
232 ** Any artifact successfully received by this routine is considered to
233 ** be public and is therefore removed from the "private" table.
234 */
235 static void xfer_accept_compressed_file(
236 Xfer *pXfer,
237 int cloneFlag,
238 char **pzUuidList,
239 int *pnUuidList
240 ){
241 int szC; /* CSIZE */
242 int szU; /* USIZE */
@@ -1015,11 +1014,11 @@
1015 cgi_reset_content();
1016 @ error not\sauthorized\sto\swrite
1017 nErr++;
1018 break;
1019 }
1020 xfer_accept_compressed_file(&xfer, 0, pzUuidList, pnUuidList);
1021 if( blob_size(&xfer.err) ){
1022 cgi_reset_content();
1023 @ error %T(blob_str(&xfer.err))
1024 nErr++;
1025 break;
@@ -1678,11 +1677,11 @@
1678 ** cfile UUID DELTASRC USIZE CSIZE \n CONTENT
1679 **
1680 ** Receive a compressed file transmitted from the server.
1681 */
1682 if( blob_eq(&xfer.aToken[0],"cfile") ){
1683 xfer_accept_compressed_file(&xfer, (syncFlags & SYNC_CLONE)!=0, 0, 0);
1684 nArtifactRcvd++;
1685 }else
1686
1687 /* gimme UUID
1688 **
1689
--- src/xfer.c
+++ src/xfer.c
@@ -232,11 +232,10 @@
232 ** Any artifact successfully received by this routine is considered to
233 ** be public and is therefore removed from the "private" table.
234 */
235 static void xfer_accept_compressed_file(
236 Xfer *pXfer,
 
237 char **pzUuidList,
238 int *pnUuidList
239 ){
240 int szC; /* CSIZE */
241 int szU; /* USIZE */
@@ -1015,11 +1014,11 @@
1014 cgi_reset_content();
1015 @ error not\sauthorized\sto\swrite
1016 nErr++;
1017 break;
1018 }
1019 xfer_accept_compressed_file(&xfer, pzUuidList, pnUuidList);
1020 if( blob_size(&xfer.err) ){
1021 cgi_reset_content();
1022 @ error %T(blob_str(&xfer.err))
1023 nErr++;
1024 break;
@@ -1678,11 +1677,11 @@
1677 ** cfile UUID DELTASRC USIZE CSIZE \n CONTENT
1678 **
1679 ** Receive a compressed file transmitted from the server.
1680 */
1681 if( blob_eq(&xfer.aToken[0],"cfile") ){
1682 xfer_accept_compressed_file(&xfer, 0, 0);
1683 nArtifactRcvd++;
1684 }else
1685
1686 /* gimme UUID
1687 **
1688

Keyboard Shortcuts

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