From 739bdf5dab0611603296ee08fdd64ddcc4e0afe9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 20 Jun 2010 11:32:18 +0000 Subject: [PATCH] pc not sc --- src/fs/fs_publish.c | 2 +- src/fs/test_fs_download.c | 2 +- src/fs/test_fs_download_indexed.c | 2 +- src/fs/test_fs_download_persistence.c | 6 +++--- src/fs/test_fs_list_indexed.c | 4 ++-- src/fs/test_fs_publish.c | 4 ++-- src/fs/test_fs_publish_persistence.c | 10 +++++----- src/fs/test_fs_search.c | 2 +- src/fs/test_fs_search_persistence.c | 6 +++--- src/fs/test_fs_unindex.c | 2 +- src/fs/test_fs_unindex_persistence.c | 6 +++--- src/include/gnunet_fs_service.h | 3 +-- 12 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 7a70b0558..2ebb96169 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -85,7 +85,7 @@ GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi, const struct GNUNET_FS_FileInformation *p, uint64_t offset) { - pi->value.publish.sc = sc; + pi->value.publish.pc = sc; pi->value.publish.fi = p; pi->value.publish.cctx = p->client_info; diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index fdd0452c2..5cfbc391b 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -211,7 +211,7 @@ progress_cb (void *cls, GNUNET_assert (1 == event->value.publish.anonymity); break; case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (1 == event->value.publish.anonymity); GNUNET_SCHEDULER_add_now (sched, diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c index 87461d170..392488dc7 100644 --- a/src/fs/test_fs_download_indexed.c +++ b/src/fs/test_fs_download_indexed.c @@ -213,7 +213,7 @@ progress_cb (void *cls, GNUNET_assert (1 == event->value.publish.anonymity); break; case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (1 == event->value.publish.anonymity); GNUNET_SCHEDULER_add_now (sched, diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index 82e19a797..f1fe8286f 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c @@ -241,12 +241,12 @@ progress_cb (void *cls, NULL); break; case GNUNET_FS_STATUS_PUBLISH_SUSPEND: - GNUNET_assert (event->value.publish.sc == publish); + GNUNET_assert (event->value.publish.pc == publish); publish = NULL; break; case GNUNET_FS_STATUS_PUBLISH_RESUME: GNUNET_assert (NULL == publish); - publish = event->value.publish.sc; + publish = event->value.publish.pc; break; case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND: GNUNET_assert (event->value.download.dc == download); @@ -270,7 +270,7 @@ progress_cb (void *cls, GNUNET_assert (1 == event->value.publish.anonymity); break; case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (1 == event->value.publish.anonymity); GNUNET_FS_stop (fs); diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index c938162f8..6a9c1a701 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -126,7 +126,7 @@ progress_cb (void *cls, break; case GNUNET_FS_STATUS_PUBLISH_PROGRESS: ret = event->value.publish.cctx; - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); #if VERBOSE printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", (unsigned long long) event->value.publish.completed, @@ -181,7 +181,7 @@ progress_cb (void *cls, if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx)) { - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); publish = NULL; } break; diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index f3cbeb7bb..6c80cdd51 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -110,7 +110,7 @@ progress_cb (void *cls, break; case GNUNET_FS_STATUS_PUBLISH_PROGRESS: ret = event->value.publish.cctx; - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); #if VERBOSE printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", (unsigned long long) event->value.publish.completed, @@ -168,7 +168,7 @@ progress_cb (void *cls, case GNUNET_FS_STATUS_PUBLISH_STOPPED: if (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); break; default: printf ("Unexpected event: %d\n", diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index d39a630db..7cb5cb9ea 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -159,7 +159,7 @@ progress_cb (void *cls, case GNUNET_FS_STATUS_PUBLISH_PROGRESS: consider_restart (event->status); ret = event->value.publish.cctx; - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); #if VERBOSE printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", (unsigned long long) event->value.publish.completed, @@ -169,13 +169,13 @@ progress_cb (void *cls, #endif break; case GNUNET_FS_STATUS_PUBLISH_SUSPEND: - if (event->value.publish.sc == publish) + if (event->value.publish.pc == publish) publish = NULL; break; case GNUNET_FS_STATUS_PUBLISH_RESUME: if (NULL == publish) { - publish = event->value.publish.sc; + publish = event->value.publish.pc; return "publish-context-dir"; } break; @@ -194,7 +194,7 @@ progress_cb (void *cls, break; case GNUNET_FS_STATUS_PUBLISH_START: consider_restart (event->status); - publish = event->value.publish.sc; + publish = event->value.publish.pc; ret = event->value.publish.cctx; if (0 == strcmp ("publish-context1", event->value.publish.cctx)) @@ -227,7 +227,7 @@ progress_cb (void *cls, consider_restart (event->status); if (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); break; default: printf ("Unexpected event: %d\n", diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 42687a743..42484374c 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -156,7 +156,7 @@ progress_cb (void *cls, GNUNET_assert (1 == event->value.publish.anonymity); break; case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (1 == event->value.publish.anonymity); GNUNET_FS_stop (fs); diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index ebcf10f9a..7ea0130ae 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -168,12 +168,12 @@ progress_cb (void *cls, GNUNET_assert (search != NULL); break; case GNUNET_FS_STATUS_PUBLISH_SUSPEND: - if (event->value.publish.sc == publish) + if (event->value.publish.pc == publish) publish = NULL; break; case GNUNET_FS_STATUS_PUBLISH_RESUME: if (NULL == publish) - publish = event->value.publish.sc; + publish = event->value.publish.pc; break; case GNUNET_FS_STATUS_SEARCH_RESULT: /* FIXME: consider_restart (event->status); cannot be tested with @@ -224,7 +224,7 @@ progress_cb (void *cls, GNUNET_assert (1 == event->value.publish.anonymity); break; case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (1 == event->value.publish.anonymity); GNUNET_FS_stop (fs); diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index 81beb3382..21bdc3cb3 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -162,7 +162,7 @@ progress_cb (void *cls, GNUNET_assert (1 == event->value.publish.anonymity); break; case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (1 == event->value.publish.anonymity); GNUNET_FS_stop (fs); diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index 9bf617ba2..ae7d09bb8 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c @@ -180,13 +180,13 @@ progress_cb (void *cls, #endif break; case GNUNET_FS_STATUS_PUBLISH_SUSPEND: - if (event->value.publish.sc == publish) + if (event->value.publish.pc == publish) publish = NULL; break; case GNUNET_FS_STATUS_PUBLISH_RESUME: if (NULL == publish) { - publish = event->value.publish.sc; + publish = event->value.publish.pc; return "publish-context"; } break; @@ -225,7 +225,7 @@ progress_cb (void *cls, GNUNET_assert (1 == event->value.publish.anonymity); break; case GNUNET_FS_STATUS_PUBLISH_STOPPED: - GNUNET_assert (publish == event->value.publish.sc); + GNUNET_assert (publish == event->value.publish.pc); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (1 == event->value.publish.anonymity); GNUNET_FS_stop (fs); diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index c5db0a7fc..a6d116deb 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h @@ -749,9 +749,8 @@ struct GNUNET_FS_ProgressInfo /** * Context for controlling the upload. - * FIXME: rename to 'pc'. */ - struct GNUNET_FS_PublishContext *sc; + struct GNUNET_FS_PublishContext *pc; /** * Information about the file that is being publishd. -- 2.25.1