1 files changed, 71 insertions, 71 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index c58a18e4..1f67235c 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -40,7 +40,7 @@
  */
 static int
 addFilesToDirectory (const ECRS_FileInfo * fi,
-                     const HashCode512 * key, int isRoot, void *closure)
+                     const GNUNET_HashCode * key, int isRoot, void *closure)
 {
   DownloadList *list = closure;
   GtkTreeIter iter;
@@ -49,16 +49,16 @@ addFilesToDirectory (const ECRS_FileInfo * fi,
   GtkTreePath *path;
   GtkTreeModel *model;
 
-  if (isRoot == YES)
-    return OK;
+  if (isRoot == GNUNET_YES)
+    return GNUNET_OK;
   if (!gtk_tree_row_reference_valid (list->searchViewRowReference))
-    return SYSERR;
+    return GNUNET_SYSERR;
   model = GTK_TREE_MODEL (list->searchList->tree);
   path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
   if (path == NULL)
     {
       GE_BREAK (ectx, 0);
-      return SYSERR;
+      return GNUNET_SYSERR;
     }
   gtk_tree_model_get_iter (model, &iter, path);
   gtk_tree_path_free (path);
@@ -72,12 +72,12 @@ addFilesToDirectory (const ECRS_FileInfo * fi,
           uri = NULL;
           gtk_tree_model_get (model, &child, SEARCH_URI, &uri, -1);
           if ((uri != NULL) && (ECRS_equalsUri (uri, fi->uri)))
-            return OK;
+            return GNUNET_OK;
         }
     }
   gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
   addEntryToSearchTree (list->searchList, list, fi, &child);
-  return OK;
+  return GNUNET_OK;
 }
 
 static void
@@ -91,7 +91,7 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   struct stat buf;
   const char *f;
 
-  if ((list->is_directory != YES) ||
+  if ((list->is_directory != GNUNET_YES) ||
       (list->searchList == NULL) ||
       (list->searchViewRowReference == NULL) ||
       (!gtk_tree_row_reference_valid (list->searchViewRowReference)))
@@ -102,14 +102,14 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   if (S_ISDIR (buf.st_mode))
     {
       fn =
-        MALLOC (strlen (list->filename) + strlen (GNUNET_DIRECTORY_EXT) + 1);
+        GNUNET_malloc (strlen (list->filename) + strlen (GNUNET_DIRECTORY_EXT) + 1);
       strcpy (fn, list->filename);
       if (fn[strlen (fn) - 1] == '/')
         fn[strlen (fn) - 1] = '\0';
       strcat (fn, GNUNET_DIRECTORY_EXT);
       if (0 != stat (list->filename, &buf))
         {
-          FREE (fn);
+          GNUNET_free (fn);
           return;
         }
       f = fn;
@@ -122,13 +122,13 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   size = buf.st_size;
   if (size == 0)
     {
-      FREENONNULL (fn);
+      GNUNET_free_non_null (fn);
       return;
     }
-  fd = disk_file_open (ectx, list->filename, O_RDONLY);
+  fd = GNUNET_disk_file_open (ectx, list->filename, O_RDONLY);
   if (fd == -1)
     {
-      FREENONNULL (fn);
+      GNUNET_free_non_null (fn);
       return;
     }
   data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
@@ -136,10 +136,10 @@ refreshDirectoryViewFromDisk (DownloadList * list)
     {
       GE_LOG_STRERROR_FILE (ectx, GE_ERROR | GE_ADMIN | GE_BULK, "mmap", f);
       CLOSE (fd);
-      FREENONNULL (fn);
+      GNUNET_free_non_null (fn);
       return;
     }
-  FREENONNULL (fn);
+  GNUNET_free_non_null (fn);
   meta = NULL;
   ECRS_listDirectory (ectx, data, size, &meta, &addFilesToDirectory, list);
   MUNMAP (data, size);
@@ -162,7 +162,7 @@ fs_download_started (struct FSUI_DownloadList *fsui_dl,
                      const ECRS_FileInfo * fi,
                      const char *filename,
                      unsigned long long completed,
-                     cron_t eta, FSUI_State state)
+                     GNUNET_CronTime eta, FSUI_State state)
 {
   DownloadList *list;
   GtkTreeIter iter;
@@ -178,10 +178,10 @@ fs_download_started (struct FSUI_DownloadList *fsui_dl,
   GtkTreeModel *model;
 
   /* setup visualization */
-  list = MALLOC (sizeof (DownloadList));
+  list = GNUNET_malloc (sizeof (DownloadList));
   memset (list, 0, sizeof (DownloadList));
   list->uri = ECRS_dupUri (fi->uri);
-  list->filename = STRDUP (filename);
+  list->filename = GNUNET_strdup (filename);
   if ((dl_parent != NULL) &&
       (NULL !=
        (path =
@@ -205,7 +205,7 @@ fs_download_started (struct FSUI_DownloadList *fsui_dl,
       gtk_tree_store_append (download_summary, &iter, NULL);
     }
   size = ECRS_fileSize (fi->uri);
-  size_h = string_get_fancy_byte_size (size);
+  size_h = GNUNET_get_byte_size_as_fancy_string (size);
   sname = &filename[strlen (filename) - 1];
   while ((sname > filename) && (sname[-1] != '/') && (sname[-1] != '\\'))
     sname--;
@@ -223,8 +223,8 @@ fs_download_started (struct FSUI_DownloadList *fsui_dl,
                       DOWNLOAD_PROGRESS, progress,
                       DOWNLOAD_URISTRING, uri_name,
                       DOWNLOAD_INTERNAL, list, -1);
-  FREE (uri_name);
-  FREE (size_h);
+  GNUNET_free (uri_name);
+  GNUNET_free (size_h);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (download_summary), &iter);
   list->summaryViewRowReference
     = gtk_tree_row_reference_new (GTK_TREE_MODEL (download_summary), path);
@@ -304,7 +304,7 @@ fs_download_started (struct FSUI_DownloadList *fsui_dl,
   list->has_terminated = ((state != FSUI_ACTIVE) && (state != FSUI_PENDING));
   list->next = download_head;
   download_head = list;
-  if ((list->is_directory == YES) && (completed != 0))
+  if ((list->is_directory == GNUNET_YES) && (completed != 0))
     refreshDirectoryViewFromDisk (list);
   return list;
 }
@@ -337,7 +337,7 @@ fs_download_update (DownloadList * list,
   else
     val = 100;
   gtk_tree_store_set (download_summary, &iter, DOWNLOAD_PROGRESS, val, -1);
-  if ((list->is_directory == YES) &&
+  if ((list->is_directory == GNUNET_YES) &&
       (list->searchList != NULL) && (list->searchViewRowReference != NULL))
     {
       meta = NULL;
@@ -372,7 +372,7 @@ fs_download_completed (DownloadList * downloadContext)
                           SEARCH_CELL_BG_COLOR,
                           getColorCode (URITRACK_DOWNLOAD_COMPLETED), -1);
     }
-  downloadContext->has_terminated = YES;
+  downloadContext->has_terminated = GNUNET_YES;
   refreshDirectoryViewFromDisk (downloadContext);
 }
 
@@ -400,7 +400,7 @@ fs_download_aborted (DownloadList * downloadContext)
                           SEARCH_CELL_BG_COLOR,
                           getColorCode (URITRACK_DOWNLOAD_ABORTED), -1);
     }
-  downloadContext->has_terminated = YES;
+  downloadContext->has_terminated = GNUNET_YES;
   refreshDirectoryViewFromDisk (downloadContext);
 }
 
@@ -432,7 +432,7 @@ fs_download_stopped (DownloadList * list)
       list->summaryViewRowReference = NULL;
       gtk_tree_store_remove (download_summary, &iter);
     }
-  FREE (list->filename);
+  GNUNET_free (list->filename);
   ECRS_freeUri (list->uri);
 
   /* if we have child-results in view, remove them! */
@@ -473,7 +473,7 @@ fs_download_stopped (DownloadList * list)
       else
         GE_BREAK (ectx, 0);
     }
-  FREE (list);
+  GNUNET_free (list);
 }
 
 
@@ -483,7 +483,7 @@ fs_download_stopped (DownloadList * list)
  * Check if a download for the given filename is
  * already running.
  *
- * @return OK if no download is pending, SYSERR if
+ * @return GNUNET_OK if no download is pending, GNUNET_SYSERR if
  *  such a download is already active.
  */
 static int
@@ -502,16 +502,16 @@ check_pending (const char *filename, GtkTreeIter * parent)
           if ((name != NULL) && (0 == strcmp (name, filename)))
             {
               free (name);
-              return SYSERR;
+              return GNUNET_SYSERR;
             }
           if (name != NULL)
             free (name);
-          if (SYSERR == check_pending (filename, &iter))
-            return SYSERR;
+          if (GNUNET_SYSERR == check_pending (filename, &iter))
+            return GNUNET_SYSERR;
         }
       while (gtk_tree_model_iter_next (model, &iter));
     }
-  return OK;
+  return GNUNET_OK;
 }
 
 typedef struct
@@ -582,8 +582,8 @@ initiateDownload (GtkTreeModel * model,
       (!(ECRS_isFileUri (sdc.idc_uri) || ECRS_isLocationUri (sdc.idc_uri))))
     {
       GE_BREAK (ectx, 0);
-      FREENONNULL (idc_name);
-      FREENONNULL (idc_mime);
+      GNUNET_free_non_null (idc_name);
+      GNUNET_free_non_null (idc_mime);
       return;
     }
   sdc.uri_name = ECRS_uriToString (sdc.idc_uri);
@@ -592,9 +592,9 @@ initiateDownload (GtkTreeModel * model,
        strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX)))
     {
       GE_BREAK (ectx, 0);
-      FREENONNULL (sdc.uri_name);
-      FREENONNULL (idc_name);
-      FREENONNULL (idc_mime);
+      GNUNET_free_non_null (sdc.uri_name);
+      GNUNET_free_non_null (idc_name);
+      GNUNET_free_non_null (idc_mime);
       return;
     }
   /* reduce "//" to "/" */
@@ -614,21 +614,21 @@ initiateDownload (GtkTreeModel * model,
       GE_ASSERT (NULL,
                  strlen (sdc.uri_name) >
                  strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX));
-      FREENONNULL (idc_name);
+      GNUNET_free_non_null (idc_name);
       filehash =
-        STRDUP (&sdc.
+        GNUNET_strdup (&sdc.
                 uri_name[strlen (ECRS_URI_PREFIX) +
                          strlen (ECRS_FILE_INFIX)]);
       filehash[16] = 0;
-      idc_name = STRDUP (filehash);
-      FREENONNULL (filehash);
+      idc_name = GNUNET_strdup (filehash);
+      GNUNET_free_non_null (filehash);
 #else
       GE_ASSERT (NULL,
                  strlen (sdc.uri_name) >
                  strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX));
-      FREENONNULL (idc_name);
+      GNUNET_free_non_null (idc_name);
       idc_name =
-        STRDUP (&sdc.
+        GNUNET_strdup (&sdc.
                 uri_name[strlen (ECRS_URI_PREFIX) +
                          strlen (ECRS_FILE_INFIX)]);
 #endif
@@ -636,7 +636,7 @@ initiateDownload (GtkTreeModel * model,
 
   /* dname = directory portion of idc_name */
   cname = idc_name;
-  dname = STRDUP (idc_name);
+  dname = GNUNET_strdup (idc_name);
   cname = &dname[strlen (dname) - 1];
   if (cname != dname)
     cname--;                    /* ignore tailing '/' */
@@ -645,8 +645,8 @@ initiateDownload (GtkTreeModel * model,
   if (*cname == DIR_SEPARATOR)
     {
       *cname = '\0';
-      FREE (idc_name);
-      idc_name = STRDUP (cname + 1);
+      GNUNET_free (idc_name);
+      idc_name = GNUNET_strdup (cname + 1);
     }
   else
     {
@@ -661,7 +661,7 @@ initiateDownload (GtkTreeModel * model,
                                        &final_download_dir);
   if (strlen (dname) > 0)
     {
-      tmp = MALLOC (strlen (final_download_dir) + strlen (dname) + 2);
+      tmp = GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
       strcpy (tmp, final_download_dir);
       if (tmp[strlen (tmp)] != DIR_SEPARATOR)
         strcat (tmp, DIR_SEPARATOR_STR);
@@ -669,14 +669,14 @@ initiateDownload (GtkTreeModel * model,
         strcat (tmp, &dname[1]);
       else
         strcat (tmp, dname);
-      FREE (final_download_dir);
+      GNUNET_free (final_download_dir);
       final_download_dir = tmp;
     }
-  FREE (dname);
+  GNUNET_free (dname);
   dname = NULL;
   /* If file is inside a directory, get the full path */
   dirTreePath = gtk_tree_path_copy (path);
-  dirPath = MALLOC (1);
+  dirPath = GNUNET_malloc (1);
   dirPath[0] = '\0';
   dirPathLen = 0;
   while (gtk_tree_path_get_depth (dirTreePath) > 1)
@@ -691,12 +691,12 @@ initiateDownload (GtkTreeModel * model,
       gtk_tree_model_get (model, &iiter, SEARCH_NAME, &dirname, -1);
       dirPathLen =
         strlen (dirPath) + strlen (dirname) + strlen (DIR_SEPARATOR_STR) + 1;
-      newPath = MALLOC (dirPathLen + 1);
+      newPath = GNUNET_malloc (dirPathLen + 1);
       strcpy (newPath, dirname);
       if (newPath[strlen (newPath) - 1] != DIR_SEPARATOR)
         strcat (newPath, DIR_SEPARATOR_STR);
       strcat (newPath, dirPath);
-      FREE (dirPath);
+      GNUNET_free (dirPath);
       dirPath = newPath;
       free (dirname);
     }
@@ -704,7 +704,7 @@ initiateDownload (GtkTreeModel * model,
 
   /* construct completed/directory/real-filename */
   sdc.idc_final_download_destination =
-    MALLOC (strlen (final_download_dir) + 2 + strlen (idc_name) +
+    GNUNET_malloc (strlen (final_download_dir) + 2 + strlen (idc_name) +
             strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
   strcpy (sdc.idc_final_download_destination, final_download_dir);
   if (sdc.
@@ -718,7 +718,7 @@ initiateDownload (GtkTreeModel * model,
                                       "downloadAnonymitySpinButton");
   sdc.recursive = getToggleButtonValue (sdc.searchContext->searchXML,
                                         "downloadRecursiveCheckButton");
-  if (OK == check_pending (idc_name, NULL))
+  if (GNUNET_OK == check_pending (idc_name, NULL))
     {
       addLogEntry (_("Downloading `%s'\n"), idc_name);
       run_with_save_calls (&init_download_helper, &sdc);
@@ -727,17 +727,17 @@ initiateDownload (GtkTreeModel * model,
     {
       addLogEntry (_("ERROR: already downloading `%s'"), idc_name);
     }
-  FREE (sdc.uri_name);
-  FREE (dirPath);
-  FREE (sdc.idc_final_download_destination);
-  FREENONNULL (final_download_dir);
-  FREENONNULL (idc_name);
-  FREENONNULL (idc_mime);
+  GNUNET_free (sdc.uri_name);
+  GNUNET_free (dirPath);
+  GNUNET_free (sdc.idc_final_download_destination);
+  GNUNET_free_non_null (final_download_dir);
+  GNUNET_free_non_null (idc_name);
+  GNUNET_free_non_null (idc_mime);
 }
 
 /**
  * The download button in the search dialog was
- * clicked.  Download all selected entries.
+ * clicked.  GNUNET_ND_DOWNLOAD all selected entries.
  */
 void
 on_downloadButton_clicked_fs (GtkWidget * treeview,
@@ -770,27 +770,27 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
   SDC sdc;
 
   uris = gtk_entry_get_text (GTK_ENTRY (entry));
-  urid = STRDUP (uris);
+  urid = GNUNET_strdup (uris);
   gtk_entry_set_text (GTK_ENTRY (entry), ECRS_URI_PREFIX);
   sdc.idc_uri = ECRS_stringToUri (ectx, urid);
   if (sdc.idc_uri == NULL)
     {
       addLogEntry (_("Invalid URI `%s'"), urid);
-      FREE (urid);
+      GNUNET_free (urid);
       return;
     }
   if (ECRS_isKeywordUri (sdc.idc_uri))
     {
       addLogEntry (_
                    ("Please use the search function for keyword (KSK) URIs!"));
-      FREE (urid);
+      GNUNET_free (urid);
       ECRS_freeUri (sdc.idc_uri);
       return;
     }
   else if (ECRS_isLocationUri (sdc.idc_uri))
     {
       addLogEntry (_("Location URIs are not yet supported"));
-      FREE (urid);
+      GNUNET_free (urid);
       ECRS_freeUri (sdc.idc_uri);
       return;
     }
@@ -799,12 +799,12 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
                                        "INCOMINGDIR",
                                        "$HOME/gnunet-downloads/",
                                        &final_download_dir);
-  disk_directory_create (ectx, final_download_dir);
+  GNUNET_disk_directory_create (ectx, final_download_dir);
   dname = &uris[strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX)];
   sdc.idc_final_download_destination =
-    MALLOC (strlen (final_download_dir) + strlen (dname) + 2);
+    GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
   strcpy (sdc.idc_final_download_destination, final_download_dir);
-  FREE (final_download_dir);
+  GNUNET_free (final_download_dir);
   if (sdc.
       idc_final_download_destination[strlen
                                      (sdc.idc_final_download_destination)] !=
@@ -815,13 +815,13 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
   addLogEntry (_("Downloading `%s'\n"), uris);
   sdc.idc_meta = ECRS_createMetaData ();
   sdc.anonymity = getSpinButtonValue (getMainXML (), "fsstatusAnonymitySpin");
-  sdc.recursive = NO;
+  sdc.recursive = GNUNET_NO;
   sdc.searchContext = NULL;
   sdc.parentContext = NULL;
   run_with_save_calls (&init_download_helper, &sdc);
   ECRS_freeMetaData (sdc.idc_meta);
-  FREE (sdc.idc_final_download_destination);
-  FREE (urid);
+  GNUNET_free (sdc.idc_final_download_destination);
+  GNUNET_free (urid);
 }
 
 struct FCBC