1 files changed, 31 insertions, 31 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 7c6e56a7..9bb6b84e 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -94,7 +94,7 @@ updateSearchSummary (SearchList * searchContext)
   label = GTK_LABEL (glade_xml_get_widget (searchContext->labelXML,
                                            "searchTabLabel"));
   gtk_label_set (label, new_title);
-  FREE (new_title);
+  GNUNET_free (new_title);
 }
 
 /**
@@ -121,7 +121,7 @@ addEntryToSearchTree (SearchList * searchContext,
   size = ECRS_isFileUri (info->uri)
     || ECRS_isLocationUri (info->uri) ? ECRS_fileSize (info->uri) : 0;
   pixbuf = getThumbnailFromMetaData (info->meta);
-  size_h = string_get_fancy_byte_size (size);
+  size_h = GNUNET_get_byte_size_as_fancy_string (size);
   gtk_tree_store_set (searchContext->tree,
                       iter,
                       SEARCH_NAME, name,
@@ -138,10 +138,10 @@ addEntryToSearchTree (SearchList * searchContext,
                       SEARCH_INTERNAL_PARENT, downloadParent, -1);
   if (pixbuf != NULL)
     g_object_unref(pixbuf);
-  FREE (size_h);
-  FREE (name);
-  FREE (desc);
-  FREE (mime);
+  GNUNET_free (size_h);
+  GNUNET_free (name);
+  GNUNET_free (desc);
+  GNUNET_free (mime);
 }
 
 /**
@@ -164,9 +164,9 @@ fs_search_result_received (SearchList * searchContext,
   state = URITRACK_getState (ectx, cfg, info->uri);
   if ((state & (URITRACK_INSERTED |
                 URITRACK_INDEXED)) &&
-      (YES == GC_get_configuration_value_yesno (cfg,
+      (GNUNET_YES == GC_get_configuration_value_yesno (cfg,
                                                 "GNUNET-GTK",
-                                                "DISABLE-OWN", YES)))
+                                                "DISABLE-OWN", GNUNET_YES)))
     return;
   model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
   gtk_tree_store_append (model, &iter, NULL);
@@ -208,7 +208,7 @@ on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
   str = ECRS_uriToString (uri);
   clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clip, str, strlen (str));
-  FREE (str);
+  GNUNET_free (str);
   return FALSE;
 }
 
@@ -274,12 +274,12 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
     return FALSE;
   fis = NULL;
   fis_size = 0;
-  GROW (fis, fis_size, list->resultsReceived);
+  GNUNET_array_grow (fis, fis_size, list->resultsReceived);
   pos = 0;
   do
     {
       if (pos == fis_size)
-        GROW (fis, fis_size, pos + 1);
+        GNUNET_array_grow (fis, fis_size, pos + 1);
       gtk_tree_model_get (model,
                           &iter,
                           SEARCH_URI, &fis[pos].uri,
@@ -291,24 +291,24 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
   ECRS_addToMetaData (meta, EXTRACTOR_KEYWORDS, list->searchString);
   ECRS_addToMetaData (meta, EXTRACTOR_DESCRIPTION, _("Saved search results"));
   ECRS_addToMetaData (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
-  if (OK != ECRS_createDirectory (NULL,
+  if (GNUNET_OK != ECRS_createDirectory (NULL,
                                   &directory, &dir_len, fis_size, fis, meta))
     {
       addLogEntry (_("Internal error."));
       GE_BREAK (NULL, 0);
       ECRS_freeMetaData (meta);
-      GROW (fis, fis_size, 0);
-      FREE (name);
+      GNUNET_array_grow (fis, fis_size, 0);
+      GNUNET_free (name);
       return FALSE;
     }
   ECRS_freeMetaData (meta);
-  GROW (fis, fis_size, 0);
-  if (OK != disk_file_write (NULL, name, directory, dir_len, "644"))
+  GNUNET_array_grow (fis, fis_size, 0);
+  if (GNUNET_OK != GNUNET_disk_file_write (NULL, name, directory, dir_len, "644"))
     {
       addLogEntry (_("Error writing file `%s'."), name);
     }
-  FREE (directory);
-  FREE (name);
+  GNUNET_free (directory);
+  GNUNET_free (name);
   return FALSE;
 }
 
@@ -388,9 +388,9 @@ fs_search_started (struct FSUI_SearchList * fsui_list,
   else if (0 == strncmp (dhead,
                          ECRS_SUBSPACE_INFIX, strlen (ECRS_SUBSPACE_INFIX)))
     dhead = &dhead[strlen (ECRS_SUBSPACE_INFIX)];
-  list = MALLOC (sizeof (SearchList));
+  list = GNUNET_malloc (sizeof (SearchList));
   memset (list, 0, sizeof (SearchList));
-  list->searchString = STRDUP (dhead);
+  list->searchString = GNUNET_strdup (dhead);
   list->uri = ECRS_dupUri (uri);
   list->fsui_list = fsui_list;
   list->next = search_head;
@@ -477,9 +477,9 @@ fs_search_started (struct FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_reorderable (column, TRUE);
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
 
-  if (YES != GC_get_configuration_value_yesno (cfg,
+  if (GNUNET_YES != GC_get_configuration_value_yesno (cfg,
                                                "GNUNET-GTK",
-                                               "DISABLE-PREVIEWS", NO))
+                                               "DISABLE-PREVIEWS", GNUNET_NO))
     {
       renderer = gtk_cell_renderer_pixbuf_new ();
       col = gtk_tree_view_insert_column_with_attributes (list->treeview,
@@ -520,7 +520,7 @@ fs_search_started (struct FSUI_SearchList * fsui_list,
                       SEARCH_SUMMARY_NAME, dhead,
                       SEARCH_SUMMARY_RESULT_COUNT, 0,
                       SEARCH_SUMMARY_INTERNAL, list, -1);
-  FREE (description);
+  GNUNET_free (description);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (search_summary), &iter);
   list->summaryViewRowReference
     = gtk_tree_row_reference_new (GTK_TREE_MODEL (search_summary), path);
@@ -652,9 +652,9 @@ fs_search_stopped (SearchList * list)
   UNREF (list->searchXML);
   UNREF (list->labelXML);
   gtk_tree_row_reference_free (list->summaryViewRowReference);
-  FREE (list->searchString);
+  GNUNET_free (list->searchString);
   ECRS_freeUri (list->uri);
-  FREE (list);
+  GNUNET_free (list);
 }
 
 /* ****************** User event handling ************* */
@@ -681,7 +681,7 @@ typedef struct
 {
   unsigned int anonymity;
   unsigned int max;
-  cron_t delay;
+  GNUNET_CronTime delay;
   struct ECRS_URI *uri;
 } FSSS;
 
@@ -757,15 +757,15 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
         }
       else
         {
-          GE_ASSERT (ectx, strlen (ns) == sizeof (EncName) - 1);
+          GE_ASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
           if ((descStr == NULL) && (ns != NULL))
-            descStr = STRDUP (ns);
+            descStr = GNUNET_strdup (ns);
         }
       if (ns != NULL)
         {
           char *ustring;
 
-          ustring = MALLOC (strlen (searchString) + sizeof (EncName) +
+          ustring = GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) +
                             strlen (ECRS_URI_PREFIX) +
                             strlen (ECRS_SUBSPACE_INFIX) + 10);
           strcpy (ustring, ECRS_URI_PREFIX);
@@ -781,7 +781,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                       _("Failed to create namespace URI from `%s'.\n"),
                       ustring);
             }
-          FREE (ustring);
+          GNUNET_free (ustring);
         }
       if (descStr != NULL)
         free (descStr);
@@ -821,7 +821,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                                        "searchAnonymitySelectionSpinButton");
   fsss.max = getSpinButtonValue (getMainXML (), "maxResultsSpinButton");
   fsss.delay = getSpinButtonValue (getMainXML (),
-                                   "searchDelaySpinButton") * cronSECONDS;
+                                   "searchDelaySpinButton") * GNUNET_CRON_SECONDS;
   run_with_save_calls (search_start_helper, &fsss);
   ECRS_freeUri (fsss.uri);
 }