From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 7 Sep 2010 13:40:19 +0000 (+0000)
Subject: relax format check
X-Git-Tag: initial-import-from-subversion-38251~20408
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a356bcd131fa2b715642ec15a8fc25bb25c8e19;p=oweals%2Fgnunet.git

relax format check
---

diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index 039ba86ab..9d20f8dc5 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -283,7 +283,6 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md,
       if (pos->data_size < data_len)
 	break;
       if ( (pos->type == type) &&
-	   (pos->format == format) &&
 	   (pos->data_size == data_len) &&
 	   (0 == memcmp (pos->data, 
 			 data,
@@ -295,6 +294,12 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md,
 	      pos->mime_type = GNUNET_strdup (data_mime_type);
 	      invalidate_sbuf (md);  
 	    }
+	  if ( (pos->format == EXTRACTOR_METAFORMAT_C_STRING) &&
+	       (format == EXTRACTOR_METAFORMAT_UTF8) )
+	    {
+	      pos->format = EXTRACTOR_METAFORMAT_UTF8;
+	      invalidate_sbuf (md);
+	    }
 	  return GNUNET_SYSERR;
 	}
       prev = pos;