1 files changed, 58 insertions, 58 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 425efefe..ee1d0232 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -49,7 +49,7 @@ typedef struct NL
   GtkWidget *updateButton;
   GtkTreeModel *model;
   char *name;
-  HashCode512 id;
+  GNUNET_HashCode id;
   struct ECRS_MetaData *meta;
 } NamespaceList;
 
@@ -95,7 +95,7 @@ on_namespaceContentSelectionChanged (gpointer signal, gpointer cls)
                               &iter, IN_NAMESPACE_PUB_DATE_STRING, &freq, -1);
           if ((freq != NULL) && (0 != strcmp (freq, _("never"))))
             ok = 1;
-          FREENONNULL (freq);
+          GNUNET_free_non_null (freq);
         }
       gtk_widget_set_sensitive (list->updateButton, ok);
       list = list->next;
@@ -295,15 +295,15 @@ makeNamespaceFrame (NamespaceList * entry)
  * @param publicationFrequency how often are updates scheduled?
  * @param nextPublicationTime the scheduled time for the
  *  next update (0 for sporadic updates)
- * @return OK to continue iteration, SYSERR to abort
+ * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
  */
 static int
 addNamespaceContentToModel (void *cls,
                             const ECRS_FileInfo * fi,
-                            const HashCode512 * lastId,
-                            const HashCode512 * nextId,
-                            TIME_T publicationFrequency,
-                            TIME_T nextPublicationTime)
+                            const GNUNET_HashCode * lastId,
+                            const GNUNET_HashCode * nextId,
+                            GNUNET_Int32Time publicationFrequency,
+                            GNUNET_Int32Time nextPublicationTime)
 {
   GtkListStore *model = GTK_LIST_STORE (cls);
   GtkTreeIter iter;
@@ -311,8 +311,8 @@ addNamespaceContentToModel (void *cls,
   char *desc;
   char *mime;
   char *uriString;
-  EncName last;
-  EncName next;
+  GNUNET_EncName last;
+  GNUNET_EncName next;
   char *freq;
   char *date;
   unsigned long long size;
@@ -329,7 +329,7 @@ addNamespaceContentToModel (void *cls,
                                         EXTRACTOR_PRODUCER,
                                         EXTRACTOR_UNKNOWN, -1);
   if (filename == NULL)
-    filename = STRDUP (_("no name given"));
+    filename = GNUNET_strdup (_("no name given"));
   else
     {
       char *dotdot;
@@ -346,31 +346,31 @@ addNamespaceContentToModel (void *cls,
                                     EXTRACTOR_FORMAT,
                                     EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
-    desc = STRDUP ("");
+    desc = GNUNET_strdup ("");
   mime = ECRS_getFromMetaData (fi->meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
-    mime = STRDUP (_("unknown"));
+    mime = GNUNET_strdup (_("unknown"));
   if (ECRS_isFileUri (fi->uri))
     size = ECRS_fileSize (fi->uri);
   else
     size = 0;
   uriString = ECRS_uriToString (fi->uri);
-  hash2enc (lastId, &last);
+  GNUNET_hash_to_enc (lastId, &last);
   if (nextId != NULL)
-    hash2enc (nextId, &next);
+    GNUNET_hash_to_enc (nextId, &next);
   else
-    memset (&next, 0, sizeof (EncName));
+    memset (&next, 0, sizeof (GNUNET_EncName));
   if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC)
-    date = STRDUP (_("unspecified"));
+    date = GNUNET_strdup (_("unspecified"));
   else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE)
-    date = STRDUP (_("never"));
+    date = GNUNET_strdup (_("never"));
   else
-    date = GN_CTIME (&nextPublicationTime);
+    date = GNUNET_int32_time_to_string (&nextPublicationTime);
   if (date[strlen (date) - 1] == '\n')
     date[strlen (date) - 1] = '\0';
 
   freq = updateIntervalToString (publicationFrequency);
-  size_h = string_get_fancy_byte_size (size);
+  size_h = GNUNET_get_byte_size_as_fancy_string (size);
   gtk_list_store_append (model, &iter);
   gtk_list_store_set (model,
                       &iter,
@@ -385,14 +385,14 @@ addNamespaceContentToModel (void *cls,
                       IN_NAMESPACE_PUB_DATE_STRING, date,
                       IN_NAMESPACE_URI, ECRS_dupUri (fi->uri),
                       IN_NAMESPACE_META, ECRS_dupMetaData (fi->meta), -1);
-  FREE (size_h);
-  FREE (filename);
-  FREE (uriString);
-  FREE (freq);
-  FREE (date);
-  FREE (mime);
+  GNUNET_free (size_h);
+  GNUNET_free (filename);
+  GNUNET_free (uriString);
+  GNUNET_free (freq);
+  GNUNET_free (date);
+  GNUNET_free (mime);
   DEBUG_END ();
-  return OK;
+  return GNUNET_OK;
 }
 
 /**
@@ -401,7 +401,7 @@ addNamespaceContentToModel (void *cls,
 int
 addTabForNamespace (void *unused,
                     const char *namespaceName,
-                    const HashCode512 * namespaceId,
+                    const GNUNET_HashCode * namespaceId,
                     const struct ECRS_MetaData *md, int rating)
 {
   NamespaceList *list;
@@ -409,12 +409,12 @@ addTabForNamespace (void *unused,
   GtkWidget *notebook;
   GtkWidget *del_menu;
 
-  if (OK != ECRS_testNamespaceExists (NULL, cfg, namespaceName, namespaceId))
-    return OK;
+  if (GNUNET_OK != ECRS_testNamespaceExists (NULL, cfg, namespaceName, namespaceId))
+    return GNUNET_OK;
   DEBUG_BEGIN ();
   label = gtk_label_new (namespaceName);
-  list = MALLOC (sizeof (NamespaceList));
-  list->name = STRDUP (namespaceName);
+  list = GNUNET_malloc (sizeof (NamespaceList));
+  list->name = GNUNET_strdup (namespaceName);
   list->id = *namespaceId;
   list->meta = ECRS_dupMetaData (md);
   makeNamespaceFrame (list);
@@ -433,7 +433,7 @@ addTabForNamespace (void *unused,
 
   del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
   gtk_widget_set_sensitive (del_menu, TRUE);
-  return OK;
+  return GNUNET_OK;
 }
 
 
@@ -467,7 +467,7 @@ frame_destroy (GtkWidget * tree)
     head = pos->next;
   else
     prev->next = pos->next;
-  FREE (pos->name);
+  GNUNET_free (pos->name);
   ECRS_freeMetaData (pos->meta);
   if (gtk_tree_model_get_iter_first (pos->model, &iter))
     {
@@ -488,7 +488,7 @@ frame_destroy (GtkWidget * tree)
         }
       while (gtk_tree_model_iter_next (pos->model, &iter));
     }
-  FREE (pos);
+  GNUNET_free (pos);
   del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
   gtk_widget_set_sensitive (del_menu, head != NULL);
 }
@@ -559,10 +559,10 @@ typedef struct
 {
   unsigned int anonymityLevel;
   char *namespaceName;
-  TIME_T updateInterval;
-  HashCode512 *lastId;
-  HashCode512 thisId;
-  HashCode512 *nextId;
+  GNUNET_Int32Time updateInterval;
+  GNUNET_HashCode *lastId;
+  GNUNET_HashCode thisId;
+  GNUNET_HashCode *nextId;
 } IUC;
 
 /**
@@ -590,7 +590,7 @@ addToNamespaceCB (GtkTreeModel * model,
       return;
     }
   resultURI = NS_addToNamespace (ectx, cfg, cls->anonymityLevel, 1000,  /* FIXME: priority */
-                                 get_time () + 2 * cronYEARS,   /* FIXME: expiration */
+                                 GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,   /* FIXME: expiration */
                                  cls->namespaceName,
                                  cls->updateInterval,
                                  cls->lastId,
@@ -614,13 +614,13 @@ addToNamespaceCB (GtkTreeModel * model,
                                       &cls->thisId,
                                       cls->nextId,
                                       cls->updateInterval,
-                                      cls->updateInterval + TIME (NULL));
+                                      cls->updateInterval + GNUNET_get_time_int32 (NULL));
         }
       ECRS_freeUri (resultURI);
     }
   else
     {
-      infoMessage (YES,
+      infoMessage (GNUNET_YES,
                    _("Failed to insert content into namespace "
                      "(consult logs).\n"));
     }
@@ -654,7 +654,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GtkWidget *notebook;
   GtkWidget *dialog;
   GtkWidget *updateIntervalComboBox;
-  HashCode512 nextId;
+  GNUNET_HashCode nextId;
   IUC cls;
   gint num;
 
@@ -686,11 +686,11 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
-      if (OK != tryParseTimeInterval (metaXML,
+      if (GNUNET_OK != tryParseTimeInterval (metaXML,
                                       "updateIntervalComboBoxEntry",
                                       &cls.updateInterval))
         {
-          /* this should be impossible - OK button is
+          /* this should be impossible - GNUNET_OK button is
              deactivated while parse errors are there */
           gtk_widget_destroy (dialog);
           UNREF (metaXML);
@@ -711,7 +711,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       identifierName = gtk_entry_get_text (GTK_ENTRY (nameLine));
       if (identifierName == NULL)
         identifierName = "";
-      hash (identifierName, strlen (identifierName), &cls.thisId);
+      GNUNET_hash (identifierName, strlen (identifierName), &cls.thisId);
       cls.lastId = NULL;
 
       nameLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
@@ -722,7 +722,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
         }
       else
         {
-          hash (identifierName, strlen (identifierName), &nextId);
+          GNUNET_hash (identifierName, strlen (identifierName), &nextId);
           cls.nextId = &nextId;
         }
       ggc_tree_selection_selected_foreach
@@ -743,14 +743,14 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 {
   NamespaceList *list;
   GtkTreeIter iter;
-  HashCode512 nextId;
-  HashCode512 lastId;
+  GNUNET_HashCode nextId;
+  GNUNET_HashCode lastId;
   GtkTreeSelection *selection;
   IUC cls;
   char *last;
   char *next;
   char *freq;
-  EncName nextnext;
+  GNUNET_EncName nextnext;
   GtkWidget *nextEntryLine;
   GtkWidget *identifierLabel;
   GtkWidget *updateIntervalComboBox;
@@ -795,7 +795,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       GE_BREAK (NULL, 0);
       return;
     }
-  if (OK != parseTimeInterval (freq, &cls.updateInterval))
+  if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval))
     {
       GE_BREAK (ectx, 0);
       cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
@@ -810,19 +810,19 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   identifierLabel = glade_xml_get_widget (metaXML, "identifierLabel");
   gtk_label_set_text (GTK_LABEL (identifierLabel), next);
-  enc2hash (last, &lastId);
+  GNUNET_enc_to_hash (last, &lastId);
   cls.lastId = &lastId;
-  enc2hash (next, &cls.thisId);
+  GNUNET_enc_to_hash (next, &cls.thisId);
 
   nextEntryLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
   if ((cls.updateInterval != ECRS_SBLOCK_UPDATE_SPORADIC) &&
-      (OK == NS_computeNextId (NULL,
+      (GNUNET_OK == NS_computeNextId (NULL,
                                cfg,
                                cls.namespaceName,
                                &lastId,
                                &cls.thisId, cls.updateInterval, &nextId)))
     {
-      hash2enc (&nextId, &nextnext);
+      GNUNET_hash_to_enc (&nextId, &nextnext);
       gtk_entry_set_text (GTK_ENTRY (nextEntryLine), (char *) &nextnext);
       gtk_widget_set_sensitive (nextEntryLine, FALSE);
     }
@@ -844,15 +844,15 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   nn_str = gtk_entry_get_text (GTK_ENTRY (nextEntryLine));
   if (nn_str == NULL)
     nn_str = "";
-  hash (nn_str, strlen (nn_str), &nextId);
+  GNUNET_hash (nn_str, strlen (nn_str), &nextId);
   cls.nextId = &nextId;
 
-  if (OK != tryParseTimeInterval (metaXML,
+  if (GNUNET_OK != tryParseTimeInterval (metaXML,
                                   "namespaceUpdateIntervalComboBoxEntry",
                                   &cls.updateInterval))
     {
       /* This should be impossible since the
-         the OK button is deactivated while parse errors are present */
+         the GNUNET_OK button is deactivated while parse errors are present */
       mdialog = gtk_message_dialog_new
         (NULL,
          GTK_DIALOG_MODAL,
@@ -896,7 +896,7 @@ fs_namespace_start ()
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (trackCheckButton),
                                 URITRACK_trackStatus (ectx,
                                                       cfg) ==
-                                YES ? TRUE : FALSE);
+                                GNUNET_YES ? TRUE : FALSE);
 
   contentList = glade_xml_get_widget (getMainXML (), "availableContentList");