use search path

[oweals/gnunet.git] / src / util / pseudonym.c

diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index a5e6ea736201e5576e1cd7c3c006869b26e781e9..fcef2e9f86c8d2bbe29d30b2ca038ac7ed44ab20 100644 (file)
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -197,7 +197,7 @@ write_pseudonym_info (const struct GNUNET_CONFIGURATION_Handle *cfg,
           (GNUNET_OK != GNUNET_BIO_write_string(fileW, ns_name)) ||
           (GNUNET_OK != GNUNET_BIO_write_meta_data(fileW, meta)) )
        {
-         GNUNET_BIO_write_close(fileW);
+         (void) GNUNET_BIO_write_close(fileW);
          GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn));
          GNUNET_free (fn);
          return;
@@ -300,15 +300,14 @@ GNUNET_PSEUDONYM_id_to_name (const struct GNUNET_CONFIGURATION_Handle *cfg,
     {
       if ((meta != NULL) && (name == NULL))
         name = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-                                                              EXTRACTOR_TITLE,
-                                                              EXTRACTOR_FILENAME,
-                                                              EXTRACTOR_DESCRIPTION,
-                                                              EXTRACTOR_SUBJECT,
-                                                              EXTRACTOR_PUBLISHER,
-                                                              EXTRACTOR_AUTHOR,
-                                                              EXTRACTOR_COMMENT,
-                                                              EXTRACTOR_SUMMARY,
-                                                              EXTRACTOR_OWNER,
+                                                              EXTRACTOR_METATYPE_TITLE,
+                                                              EXTRACTOR_METATYPE_FILENAME,
+                                                              EXTRACTOR_METATYPE_DESCRIPTION,
+                                                              EXTRACTOR_METATYPE_SUBJECT,
+                                                              EXTRACTOR_METATYPE_PUBLISHER,
+                                                              EXTRACTOR_METATYPE_AUTHOR_NAME,
+                                                              EXTRACTOR_METATYPE_COMMENT,
+                                                              EXTRACTOR_METATYPE_SUMMARY,
                                                               -1);
       if (meta != NULL)
         {
@@ -505,6 +504,7 @@ GNUNET_PSEUDONYM_list_all (const struct GNUNET_CONFIGURATION_Handle *cfg,
   return ret;
 }
 
+
 /**
  * Change the ranking of a pseudonym.
  *
@@ -537,19 +537,35 @@ GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg,
   return ranking;
 }
 
+
 /**
  * Insert metadata into existing MD record (passed as cls).
  *
  * @param cls metadata to add to
+ * @param plugin_name name of the plugin that generated the meta data
  * @param type type of entry to insert
- * @param data value of entry to insert
+ * @param format format of data
+ * @param data_mime_type mime type of data
+ * @param data value of the meta data
+ * @param data_len number of bytes in data
+ * @return always 0
  */
 static int
-merge_meta_helper (void *cls, EXTRACTOR_KeywordType type, const char *data)
+merge_meta_helper (void *cls, 
+                  const char *plugin_name,
+                  enum EXTRACTOR_MetaType type, 
+                  enum EXTRACTOR_MetaFormat format,
+                  const char *data_mime_type,
+                  const char *data,
+                  size_t data_len)
 {
   struct GNUNET_CONTAINER_MetaData *meta = cls;
-  GNUNET_CONTAINER_meta_data_insert (meta, type, data);
-  return GNUNET_OK;
+
+  (void) GNUNET_CONTAINER_meta_data_insert (meta, plugin_name,
+                                           type, format,
+                                           data_mime_type,
+                                           data, data_len);
+  return 0;
 }
 
 
@@ -581,7 +597,7 @@ GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg,
   if ((0 == STAT (fn, &sbuf)) &&
       (GNUNET_OK == read_info (cfg, id, &old, &ranking, &name)))
     {
-      GNUNET_CONTAINER_meta_data_get_contents (meta, &merge_meta_helper, old);
+      GNUNET_CONTAINER_meta_data_iterate (meta, &merge_meta_helper, old);
       write_pseudonym_info (cfg, id, old, ranking, name);
       GNUNET_CONTAINER_meta_data_destroy (old);
       GNUNET_free_non_null (name);
@@ -595,7 +611,4 @@ GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 
-
-
-
 /* end of pseudonym.c */