1 files changed, 19 insertions, 19 deletions

diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index b5861ebf..3ef752d4 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -46,7 +46,7 @@ publishMetaData (EXTRACTOR_KeywordType type, const char *data, void *cls)
                       &iter,
                       META_TYPE, type,
                       META_STYPE, stype, META_VALUE, data, -1);
-  return OK;
+  return GNUNET_OK;
 }
 
 void
@@ -134,7 +134,7 @@ publishKeyword (const char *data, void *cls)
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter, 0, data, -1);
   DEBUG_END ();
-  return OK;
+  return GNUNET_OK;
 }
 
 void
@@ -260,7 +260,7 @@ handleMetaDataListUpdate (GladeXML * xml,
                       META_TYPE, type,
                       META_STYPE, stype, META_VALUE, value, -1);
   gtk_entry_set_text (GTK_ENTRY (entryLine), "");
-  FREENONNULL (stype);
+  GNUNET_free_non_null (stype);
   DEBUG_END ();
 }
 
@@ -313,7 +313,7 @@ getMetaDataFromList (GladeXML * xml,
                               &iter,
                               META_TYPE, &type, META_VALUE, &mvalue, -1);
           ECRS_addToMetaData (meta, type, mvalue);
-          FREENONNULL (mvalue);
+          GNUNET_free_non_null (mvalue);
         }
       while (gtk_tree_model_iter_next (metamodel, &iter));
     }
@@ -358,7 +358,7 @@ getMetaDataFromList (GladeXML * xml,
                                                length);
               free (thumb);
               ECRS_addToMetaData (meta, EXTRACTOR_THUMBNAIL_DATA, binary);
-              FREE (binary);
+              GNUNET_free (binary);
             }
         }
     }
@@ -383,7 +383,7 @@ getKeywordURIFromList (GladeXML * xml, const char *name)
 
   keywords = NULL;
   ksize = 0;
-  GROW (keywords, ksize, 64);
+  GNUNET_array_grow (keywords, ksize, 64);
   kpos = 0;
   if (gtk_tree_model_get_iter_first (keymodel, &iter))
     {
@@ -392,7 +392,7 @@ getKeywordURIFromList (GladeXML * xml, const char *name)
           gtk_tree_model_get (keymodel, &iter, 0, &mvalue, -1);
           keywords[kpos++] = mvalue;
           if (kpos == ksize)
-            GROW (keywords, ksize, kpos * 2);
+            GNUNET_array_grow (keywords, ksize, kpos * 2);
         }
       while (gtk_tree_model_iter_next (keymodel, &iter));
     }
@@ -400,39 +400,39 @@ getKeywordURIFromList (GladeXML * xml, const char *name)
 
   keywordURI = ECRS_keywordsToUri ((const char **) keywords);
   while (kpos > 0)
-    FREE (keywords[--kpos]);
-  GROW (keywords, ksize, 0);
+    GNUNET_free (keywords[--kpos]);
+  GNUNET_array_grow (keywords, ksize, 0);
   DEBUG_END ();
   return keywordURI;
 }
 
 char *
-updateIntervalToString (TIME_T interval)
+updateIntervalToString (GNUNET_Int32Time interval)
 {
   if (interval == ECRS_SBLOCK_UPDATE_SPORADIC)
     return strdup (_("--sporadic update--"));
   if (interval == ECRS_SBLOCK_UPDATE_NONE)
     return strdup (_("--no update--"));
-  return string_get_fancy_time_interval (interval * cronSECONDS);
+  return GNUNET_get_time_interval_as_fancy_string (interval * GNUNET_CRON_SECONDS);
 }
 
 int
-parseTimeInterval (const char *timeSpec, TIME_T * interval)
+parseTimeInterval (const char *timeSpec, GNUNET_Int32Time * interval)
 {
   if (timeSpec == NULL)
-    return SYSERR;
+    return GNUNET_SYSERR;
   if (0 == strcmp (_("--sporadic update--"), timeSpec))
     *interval = ECRS_SBLOCK_UPDATE_SPORADIC;
   else if (0 == strcmp (_("--no update--"), timeSpec))
     *interval = ECRS_SBLOCK_UPDATE_NONE;
   else
     return parseTime (timeSpec, interval);
-  return OK;
+  return GNUNET_OK;
 }
 
 int
 tryParseTimeInterval (GladeXML * xml,
-                      const char *intervalComboBoxEntry, TIME_T * interval)
+                      const char *intervalComboBoxEntry, GNUNET_Int32Time * interval)
 {
   return parseTimeInterval (getEntryLineValue (xml,
                                                intervalComboBoxEntry),
@@ -457,7 +457,7 @@ getMimeTypeFromMetaData (const struct ECRS_MetaData *meta)
 
   mime = ECRS_getFromMetaData (meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
-    mime = STRDUP (_("unknown"));
+    mime = GNUNET_strdup (_("unknown"));
   return validate_utf8 (mime);
 }
 
@@ -477,7 +477,7 @@ getFileNameFromMetaData (const struct ECRS_MetaData *meta)
                                     EXTRACTOR_UNKNOWN, -1);
   if (name == NULL)
     {
-      name = STRDUP (_("no name given"));
+      name = GNUNET_strdup (_("no name given"));
     }
   else
     {
@@ -503,7 +503,7 @@ getDescriptionFromMetaData (const struct ECRS_MetaData *meta)
                                     EXTRACTOR_FORMAT,
                                     EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
-    desc = STRDUP ("");
+    desc = GNUNET_strdup ("");
   return validate_utf8 (desc);
 }
 
@@ -531,7 +531,7 @@ getThumbnailFromMetaData (const struct ECRS_MetaData * meta)
     {
       pixbuf = NULL;
     }
-  FREENONNULL (thumb);
+  GNUNET_free_non_null (thumb);
   return pixbuf;
 }