ats_ril: - removed some redundantly saved plugin environment attributes

[oweals/gnunet.git] / src / fs / fs_api.h

diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h
index 441e4fa9b8381934ea7553e260a0d5c0f19de6b4..5858c916c4ee1a8468ea29fca8de60f5dca40245 100644 (file)
--- a/src/fs/fs_api.h
+++ b/src/fs/fs_api.h
@@ -120,7 +120,7 @@ struct Location
   /**
    * Identity of the peer sharing the file.
    */
-  struct GNUNET_CRYPTO_EccPublicKey peer;
+  struct GNUNET_PeerIdentity peer;
 
   /**
    * Time when this location URI expires.
@@ -198,7 +198,7 @@ struct GNUNET_FS_Uri
       /**
        * Identifier of the namespace.
        */
-      struct GNUNET_CRYPTO_EccPublicKey ns;
+      struct GNUNET_CRYPTO_EccPublicSignKey ns;
 
       /**
        * Human-readable identifier chosen for this entry in the
@@ -340,7 +340,7 @@ struct GNUNET_FS_FileInformation
       int do_index;
 
       /**
-       * Is "file_id" already valid?  Set to GNUNET_YES once the hash
+       * Is "file_id" already valid?  Set to #GNUNET_YES once the hash
        * has been calculated.
        */
       int have_hash;
@@ -414,7 +414,7 @@ typedef void (*GNUNET_FS_QueueStop) (void *cls);
 
 /**
  * Priorities for the queue.
- */ 
+ */
 enum GNUNET_FS_QueuePriority
   {
     /**
@@ -1259,7 +1259,7 @@ struct GNUNET_FS_PublishContext
    * Set to GNUNET_YES if all processing has completed.
    */
   int all_done;
-  
+
   /**
    * Flag set to GNUNET_YES if the next callback from
    * GNUNET_FS_file_information_inspect should be skipped because it
@@ -1284,7 +1284,7 @@ enum UnindexState
    * the respective DBlocks and IBlocks.
    */
   UNINDEX_STATE_DS_REMOVE = 1,
-  
+
   /**
    * Find out which keywords apply.
    */
@@ -1300,12 +1300,12 @@ enum UnindexState
    * the unindexing.
    */
   UNINDEX_STATE_FS_NOTIFY = 4,
-  
+
   /**
    * We're done.
    */
   UNINDEX_STATE_COMPLETE = 5,
-  
+
   /**
    * We've encountered a fatal error.
    */
@@ -1323,7 +1323,7 @@ struct GNUNET_FS_UnindexContext
    * The content hash key of the last block we processed, will in the
    * end be set to the CHK from the URI.  Used to remove the KBlocks.
    */
-  struct ContentHashKey chk; 
+  struct ContentHashKey chk;
 
   /**
    * Global FS context.
@@ -1460,8 +1460,8 @@ struct SearchRequestEntry
 
   /**
    * Derived public key, hashes to 'uquery'.
-   */ 
-  struct GNUNET_CRYPTO_EccPublicKey dpub;
+   */
+  struct GNUNET_CRYPTO_EccPublicSignKey dpub;
 
   /**
    * The original keyword, used to derive the