[GNUnet-SVN] r11823 - in gnunet/src: fs include

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r11823 - in gnunet/src: fs include

From:	gnunet
Subject:	[GNUnet-SVN] r11823 - in gnunet/src: fs include
Date:	Sun, 20 Jun 2010 13:32:18 +0200
Author: grothoff
Date: 2010-06-20 13:32:18 +0200 (Sun, 20 Jun 2010)
New Revision: 11823

Modified:
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/test_fs_download.c
   gnunet/src/fs/test_fs_download_indexed.c
   gnunet/src/fs/test_fs_download_persistence.c
   gnunet/src/fs/test_fs_list_indexed.c
   gnunet/src/fs/test_fs_publish.c
   gnunet/src/fs/test_fs_publish_persistence.c
   gnunet/src/fs/test_fs_search.c
   gnunet/src/fs/test_fs_search_persistence.c
   gnunet/src/fs/test_fs_unindex.c
   gnunet/src/fs/test_fs_unindex_persistence.c
   gnunet/src/include/gnunet_fs_service.h
Log:
pc not sc

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-06-20 09:17:43 UTC (rev 11822)
+++ gnunet/src/fs/fs_publish.c  2010-06-20 11:32:18 UTC (rev 11823)
@@ -85,7 +85,7 @@
                                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;

Modified: gnunet/src/fs/test_fs_download.c
===================================================================
--- gnunet/src/fs/test_fs_download.c    2010-06-20 09:17:43 UTC (rev 11822)
+++ gnunet/src/fs/test_fs_download.c    2010-06-20 11:32:18 UTC (rev 11823)
@@ -211,7 +211,7 @@
       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,

Modified: gnunet/src/fs/test_fs_download_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_download_indexed.c    2010-06-20 09:17:43 UTC (rev 
11822)
+++ gnunet/src/fs/test_fs_download_indexed.c    2010-06-20 11:32:18 UTC (rev 
11823)
@@ -213,7 +213,7 @@
       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,

Modified: gnunet/src/fs/test_fs_download_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_download_persistence.c        2010-06-20 09:17:43 UTC 
(rev 11822)
+++ gnunet/src/fs/test_fs_download_persistence.c        2010-06-20 11:32:18 UTC 
(rev 11823)
@@ -241,12 +241,12 @@
                                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 @@
       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);

Modified: gnunet/src/fs/test_fs_list_indexed.c
===================================================================
--- gnunet/src/fs/test_fs_list_indexed.c        2010-06-20 09:17:43 UTC (rev 
11822)
+++ gnunet/src/fs/test_fs_list_indexed.c        2010-06-20 11:32:18 UTC (rev 
11823)
@@ -126,7 +126,7 @@
       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 @@
       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;

Modified: gnunet/src/fs/test_fs_publish.c
===================================================================
--- gnunet/src/fs/test_fs_publish.c     2010-06-20 09:17:43 UTC (rev 11822)
+++ gnunet/src/fs/test_fs_publish.c     2010-06-20 11:32:18 UTC (rev 11823)
@@ -110,7 +110,7 @@
       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 @@
     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", 

Modified: gnunet/src/fs/test_fs_publish_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_publish_persistence.c 2010-06-20 09:17:43 UTC (rev 
11822)
+++ gnunet/src/fs/test_fs_publish_persistence.c 2010-06-20 11:32:18 UTC (rev 
11823)
@@ -159,7 +159,7 @@
     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 @@
 #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 @@
       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 @@
       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", 

Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c      2010-06-20 09:17:43 UTC (rev 11822)
+++ gnunet/src/fs/test_fs_search.c      2010-06-20 11:32:18 UTC (rev 11823)
@@ -156,7 +156,7 @@
       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);

Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c  2010-06-20 09:17:43 UTC (rev 
11822)
+++ gnunet/src/fs/test_fs_search_persistence.c  2010-06-20 11:32:18 UTC (rev 
11823)
@@ -168,12 +168,12 @@
       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 @@
       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);

Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c     2010-06-20 09:17:43 UTC (rev 11822)
+++ gnunet/src/fs/test_fs_unindex.c     2010-06-20 11:32:18 UTC (rev 11823)
@@ -162,7 +162,7 @@
       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);

Modified: gnunet/src/fs/test_fs_unindex_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_unindex_persistence.c 2010-06-20 09:17:43 UTC (rev 
11822)
+++ gnunet/src/fs/test_fs_unindex_persistence.c 2010-06-20 11:32:18 UTC (rev 
11823)
@@ -180,13 +180,13 @@
 #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 @@
       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);

Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h      2010-06-20 09:17:43 UTC (rev 
11822)
+++ gnunet/src/include/gnunet_fs_service.h      2010-06-20 11:32:18 UTC (rev 
11823)
@@ -749,9 +749,8 @@
 
       /**
        * 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.
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r11823 - in gnunet/src: fs include, gnunet <=
Prev by Date: [GNUnet-SVN] r11822 - in gnunet-gtk: contrib src
Next by Date: [GNUnet-SVN] r11824 - gnunet gnunet-gtk/src
Previous by thread: [GNUnet-SVN] r11822 - in gnunet-gtk: contrib src
Next by thread: [GNUnet-SVN] r11824 - gnunet gnunet-gtk/src
Index(es):
- Date
- Thread