projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a2509d
)
relax format check
author
Christian Grothoff
<christian@grothoff.org>
Tue, 7 Sep 2010 13:40:19 +0000
(13:40 +0000)
committer
Christian Grothoff
<christian@grothoff.org>
Tue, 7 Sep 2010 13:40:19 +0000
(13:40 +0000)
src/util/container_meta_data.c
patch
|
blob
|
history
diff --git
a/src/util/container_meta_data.c
b/src/util/container_meta_data.c
index 039ba86ab2dfc4c26dca7a3194efced41aa99e3b..9d20f8dc59ebaa8e428fc94489ada134ede7132e 100644
(file)
--- 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;