diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-09-07 13:40:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-09-07 13:40:19 +0000 |
commit | 6a356bcd131fa2b715642ec15a8fc25bb25c8e19 (patch) | |
tree | ea6e5869227d331c8b8f4b1e6c160d145f8d82f1 /src/util/container_meta_data.c | |
parent | 2a2509d66f5a7d670fbecb2b62498f1cab180161 (diff) | |
download | gnunet-6a356bcd131fa2b715642ec15a8fc25bb25c8e19.tar.gz gnunet-6a356bcd131fa2b715642ec15a8fc25bb25c8e19.zip |
relax format check
Diffstat (limited to 'src/util/container_meta_data.c')
-rw-r--r-- | src/util/container_meta_data.c | 7 |
1 files changed, 6 insertions, 1 deletions
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, | |||
283 | if (pos->data_size < data_len) | 283 | if (pos->data_size < data_len) |
284 | break; | 284 | break; |
285 | if ( (pos->type == type) && | 285 | if ( (pos->type == type) && |
286 | (pos->format == format) && | ||
287 | (pos->data_size == data_len) && | 286 | (pos->data_size == data_len) && |
288 | (0 == memcmp (pos->data, | 287 | (0 == memcmp (pos->data, |
289 | data, | 288 | data, |
@@ -295,6 +294,12 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md, | |||
295 | pos->mime_type = GNUNET_strdup (data_mime_type); | 294 | pos->mime_type = GNUNET_strdup (data_mime_type); |
296 | invalidate_sbuf (md); | 295 | invalidate_sbuf (md); |
297 | } | 296 | } |
297 | if ( (pos->format == EXTRACTOR_METAFORMAT_C_STRING) && | ||
298 | (format == EXTRACTOR_METAFORMAT_UTF8) ) | ||
299 | { | ||
300 | pos->format = EXTRACTOR_METAFORMAT_UTF8; | ||
301 | invalidate_sbuf (md); | ||
302 | } | ||
298 | return GNUNET_SYSERR; | 303 | return GNUNET_SYSERR; |
299 | } | 304 | } |
300 | prev = pos; | 305 | prev = pos; |