SHA1 Hash:	64c58fd64f5efa972b445e46ebe604543d368518
Date:	2008-05-18 17:33:25
User:	drh
Comment:	Remove the "Dangling" column from the sync status display.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/xfer.c from [0e1aa871ca] to [c1b226ecc2].

@@ -779,12 +779,12 @@
 }
 
 /*
 ** Format strings for progress reporting.
 */
-static const char zLabel[] = "%-10s %10s %10s %10s %10s %10s\n";
-static const char zValue[] = "\r%-10s %10d %10d %10d %10d %10d\n";
+static const char zLabelFormat[] = "%-10s %10s %10s %10s %10s\n";
+static const char zValueFormat[] = "\r%-10s %10d %10d %10d %10d\n";
 
 
 /*
 ** Sync to the host identified in g.urlName and g.urlPath.  This
 ** routine is called by the client.
@@ -840,11 +840,11 @@
   }
   if( pushFlag ){
     blob_appendf(&send, "push %s %s\n", zSCode, zPCode);
     nCard++;
   }
-  printf(zLabel, "", "Bytes", "Cards", "Artifacts", "Deltas", "Dangling");
+  printf(zLabelFormat, "", "Bytes", "Cards", "Artifacts", "Deltas");
 
   while( go ){
     int newPhantom = 0;
 
     /* Send make the most recently received cookie.  Let the server
@@ -866,13 +866,13 @@
       nCard += send_unclustered(&xfer);
     }
 
     /* Exchange messages with the server */
     nFileSend = xfer.nFileSent + xfer.nDeltaSent;
-    printf(zValue, "Send:",
+    printf(zValueFormat, "Send:",
             blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent,
-            xfer.nFileSent, xfer.nDeltaSent, 0);
+            xfer.nFileSent, xfer.nDeltaSent);
 #if 0
     printf("Sent:      %10d bytes, %5d cards, %5d files (%d+%d)\n",
             blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent,
             nFileSend, xfer.nFileSent, xfer.nDeltaSent);
 #endif
@@ -1027,19 +1027,13 @@
         fossil_fatal("%b", &xfer.err);
       }
       blobarray_reset(xfer.aToken, xfer.nToken);
       blob_reset(&xfer.line);
     }
-    printf(zValue, "Received:",
+    printf(zValueFormat, "Received:",
             blob_size(&recv), nCard,
-            xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile);
-#if 0
-    printf("\rReceived:  %10d bytes, %5d cards, %5d files (%d+%d+%d)\n",
-            blob_size(&recv), nCard,
-            xfer.nFileRcvd + xfer.nDeltaRcvd + xfer.nDanglingFile,
-            xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile);
-#endif
+            xfer.nFileRcvd, xfer.nDeltaRcvd + xfer.nDanglingFile);
     blob_reset(&recv);
     nCycle++;
     go = 0;
 
     /* If we received one or more files on the previous exchange but