aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2017-12-30 21:32:59 +0100
committerlurchi <lurchi@strangeplace.net>2017-12-30 21:32:59 +0100
commitdca8eb9c44dbdfa3fc572dde40c1e0927cfee8db (patch)
treee0b2a09e6d4777308bb9b30511815b4d5f756891 /src/fs
parent5c8feda7faa01365a1fb6983595ceb65dfe4fb11 (diff)
parent11f78ccd0b66e08b8d1084cc335daac99d3f6a7e (diff)
downloadgnunet-dca8eb9c44dbdfa3fc572dde40c1e0927cfee8db.tar.gz
gnunet-dca8eb9c44dbdfa3fc572dde40c1e0927cfee8db.zip
merge branch 'refactoring-scheduler'
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/test_fs_download_persistence.c1
-rw-r--r--src/fs/test_fs_publish_persistence.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c
index 76a1ea911..8f27e82af 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/fs/test_fs_download_persistence.c
@@ -179,7 +179,6 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
179 GNUNET_FS_DOWNLOAD_OPTION_NONE, "download", NULL); 179 GNUNET_FS_DOWNLOAD_OPTION_NONE, "download", NULL);
180 break; 180 break;
181 case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: 181 case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
182 consider_restart (event->status);
183 printf ("Download complete, %llu kbps.\n", 182 printf ("Download complete, %llu kbps.\n",
184 (unsigned long long) (FILESIZE * 1000000LL / 183 (unsigned long long) (FILESIZE * 1000000LL /
185 (1 + 184 (1 +
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c
index be9006d42..103ca01b8 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/fs/test_fs_publish_persistence.c
@@ -134,7 +134,6 @@ progress_cb (void *cls,
134 switch (event->status) 134 switch (event->status)
135 { 135 {
136 case GNUNET_FS_STATUS_PUBLISH_COMPLETED: 136 case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
137 consider_restart (event->status);
138 ret = event->value.publish.cctx; 137 ret = event->value.publish.cctx;
139 printf ("Publish complete, %llu kbps.\n", 138 printf ("Publish complete, %llu kbps.\n",
140 (unsigned long long) (FILESIZE * 1000000LL / 139 (unsigned long long) (FILESIZE * 1000000LL /