pc not sc

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 7a70b0558403c1c58f83e8471dd2ac40e5950e7a..2ebb96169c5933855d18be38bfc3b332cc1b293c 100644 (file)
--- 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 fdd0452c28b696f46adf5ca35e9f4e58f256a5bb..5cfbc391ba5e1e52fcc5ba5a18a3c57dae873df9 100644 (file)
--- 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 87461d1709c0be73ceabcea17e43e75d7915cb4d..392488dc7faa8588706d8d80c9a3cac46bc9deb8 100644 (file)
--- 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 82e19a7979957a98f78afc591519fc3e83bcff7b..f1fe8286f0bb0eccd50a8108a334be54fad64c22 100644 (file)
--- 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 c938162f8a22777baae6c713de6c35dd75e6e24c..6a9c1a7017b6e430d49bb1955c0f49dd6dfe7858 100644 (file)
--- 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 f3cbeb7bb71ea821a7eb35430621d22c89a6fce2..6c80cdd510971f950dea453fb8a60f8c0ca85b82 100644 (file)
--- 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 d39a630db544cb0bfe40262af5675739737112a8..7cb5cb9ea7ea598d7617d994e520c22ea9612e8f 100644 (file)
--- 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 42687a7431341a205575c64c776983ed81f0621c..42484374c011bcf39badf743e075c0ef17f2d99c 100644 (file)
--- 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 ebcf10f9ae9a871ebb2678dbb792bef6699a3315..7ea0130ae260d9ce38735e407c1283b96a080760 100644 (file)
--- 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 81beb33824c5684102ab15a78e0e177f3c5e2720..21bdc3cb3d1d1f44465246919b4a5120bbc701cf 100644 (file)
--- 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 9bf617ba24cbbac88df0e1c48011b7249c4130cc..ae7d09bb853d5df6d171864273239af9f8f772e6 100644 (file)
--- 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 c5db0a7fcaaa50bb87b443ab4c935cbcfee3245a..a6d116deb9a5ebcda91999e9b34bcaf4b79f8609 100644 (file)
--- 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.