types

[oweals/gnunet.git] / src / fs / fs_file_information.c

diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index e72f42f9a3413db9fb27becea0cb371c5708b440..e173b1149d4c34565e7b139cecdc215c27439e2d 100644 (file)
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -60,8 +60,9 @@ struct GNUNET_FS_FileInformation *
 GNUNET_FS_file_information_recover (const char *name)
 {
   struct GNUNET_FS_FileInformation *ret;
+  ret = NULL;
   // FIXME!
-  return NULL;
+  return ret;
 }
 
 
@@ -191,8 +192,8 @@ GNUNET_FS_file_information_create_from_file (void *client_info,
                                             const struct GNUNET_FS_Uri *keywords,
                                             const struct GNUNET_CONTAINER_MetaData *meta,
                                             int do_index,
-                                            unsigned int anonymity,
-                                            unsigned int priority,
+                                            uint32_t anonymity,
+                                            uint32_t priority,
                                             struct GNUNET_TIME_Absolute expirationTime)
 {
   struct FileInfo *fi;
@@ -279,8 +280,8 @@ GNUNET_FS_file_information_create_from_data (void *client_info,
                                             const struct GNUNET_FS_Uri *keywords,
                                             const struct GNUNET_CONTAINER_MetaData *meta,
                                             int do_index,
-                                            unsigned int anonymity,
-                                            unsigned int priority,
+                                            uint32_t anonymity,
+                                            uint32_t priority,
                                             struct GNUNET_TIME_Absolute expirationTime)
 {
   return GNUNET_FS_file_information_create_from_reader (client_info,
@@ -322,8 +323,8 @@ GNUNET_FS_file_information_create_from_reader (void *client_info,
                                               const struct GNUNET_FS_Uri *keywords,
                                               const struct GNUNET_CONTAINER_MetaData *meta,
                                               int do_index,
-                                              unsigned int anonymity,
-                                              unsigned int priority,
+                                              uint32_t anonymity,
+                                              uint32_t priority,
                                               struct GNUNET_TIME_Absolute expirationTime)
 {
   struct GNUNET_FS_FileInformation *ret;
@@ -386,12 +387,12 @@ struct DirScanCls
   /**
    * Desired anonymity level.
    */
-  unsigned int anonymity;
+  uint32_t anonymity;
 
   /**
    * Desired publishing priority.
    */
-  unsigned int priority;
+  uint32_t priority;
 
   /**
    * Expiration time for publication.
@@ -498,8 +499,8 @@ int
 GNUNET_FS_directory_scanner_default (void *cls,
                                     const char *dirname,
                                     int do_index,
-                                    unsigned int anonymity,
-                                    unsigned int priority,
+                                    uint32_t anonymity,
+                                    uint32_t priority,
                                     struct GNUNET_TIME_Absolute expirationTime,
                                     GNUNET_FS_FileProcessor proc,
                                     void *proc_cls,
@@ -592,8 +593,8 @@ GNUNET_FS_file_information_create_from_directory (void *client_info,
                                                  GNUNET_FS_DirectoryScanner scanner,
                                                  void *scanner_cls,
                                                  int do_index,
-                                                 unsigned int anonymity,
-                                                 unsigned int priority,
+                                                 uint32_t anonymity,
+                                                 uint32_t priority,
                                                  struct GNUNET_TIME_Absolute expirationTime,
                                                  char **emsg)
 {
@@ -655,8 +656,8 @@ struct GNUNET_FS_FileInformation *
 GNUNET_FS_file_information_create_empty_directory (void *client_info,
                                                   const struct GNUNET_CONTAINER_MetaData *meta,
                                                   const struct GNUNET_FS_Uri *keywords,
-                                                  unsigned int anonymity,
-                                                  unsigned int priority,
+                                                  uint32_t anonymity,
+                                                  uint32_t priority,
                                                   struct GNUNET_TIME_Absolute expirationTime)
 {
   struct GNUNET_FS_FileInformation *ret;
@@ -700,7 +701,6 @@ GNUNET_FS_file_information_add (struct GNUNET_FS_FileInformation *dir,
   ent->next = dir->data.dir.entries;
   dir->data.dir.entries = ent;
   dir->data.dir.dir_size = 0;
-  dir->publish_offset = 0;
   GNUNET_FS_file_information_sync (ent);
   GNUNET_FS_file_information_sync (dir);
   return GNUNET_OK;
@@ -823,7 +823,6 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
               &fi->client_info);
     }
   GNUNET_free_non_null (fi->emsg);
-  GNUNET_free_non_null (fi->chk_tree);
   /* clean up serialization */
   if (0 != UNLINK (fi->serialization))
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,