[GNUnet-SVN] r12901 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-09-07 15:40:19 +0200 (Tue, 07 Sep 2010)
New Revision: 12901

Modified:
   gnunet/src/util/container_meta_data.c
Log:
relax format check

Modified: gnunet/src/util/container_meta_data.c
===================================================================
--- gnunet/src/util/container_meta_data.c       2010-09-07 13:37:28 UTC (rev 
12900)
+++ gnunet/src/util/container_meta_data.c       2010-09-07 13:40:19 UTC (rev 
12901)
@@ -283,7 +283,6 @@
       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 @@
              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;