[GNUnet-SVN] r1164 - in GNUnet/src/applications/fs: fsui tools

[grothoff]

Author: grothoff
Date: 2005-06-30 09:10:05 -0700 (Thu, 30 Jun 2005)
New Revision: 1164

Modified:
   GNUnet/src/applications/fs/fsui/upload.c
   GNUnet/src/applications/fs/tools/gnunet-insert.c
Log:
cleanup

Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c    2005-06-30 16:06:12 UTC (rev 
1163)
+++ GNUnet/src/applications/fs/fsui/upload.c    2005-06-30 16:10:05 UTC (rev 
1164)
@@ -68,7 +68,8 @@
 static void progressCallback(unsigned long long totalBytes,
                             unsigned long long completedBytes,
                             cron_t eta,
-                            UploadThreadClosure * utc) {
+                            void * ptr) {
+  UploadThreadClosure * utc = ptr;
   FSUI_Event event;
   cron_t now;
 
@@ -154,7 +155,7 @@
                            utc->anonymityLevel,
                            utc->priority,
                            utc->expiration,
-                           (ECRS_UploadProgressCallback) &progressCallback,
+                           &progressCallback,
                            utc,
                            NULL,
                            NULL,

Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c    2005-06-30 16:06:12 UTC 
(rev 1163)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c    2005-06-30 16:10:05 UTC 
(rev 1164)
@@ -123,7 +123,7 @@
   switch(event->type) {
   case FSUI_upload_progress:
     if (*verboselevel == YES) {
-      delta = event->data.UploadProgress.eta - cronTime(NULL);
+      delta = event->data.UploadProgress.main_eta - cronTime(NULL);
       PRINTF(_("%16llu of %16llu bytes inserted "
               "(estimating %llu seconds to completion)                "),
             event->data.UploadProgress.main_completed,