diff options
| author | Christian Grothoff <christian@grothoff.org> | 2010-04-28 08:07:19 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2010-04-28 08:07:19 +0000 |
| commit | b393f0f2c8f2075c16310a8edbe552020fd8b147 (patch) | |
| tree | d6b91d0939ab540d2f66291cf0659ed40bda9626 /src/fs/fs_search.c | |
| parent | 1c90bd35e34a9a237ebde4440367322a8cc2a686 (diff) | |
| download | gnunet-b393f0f2c8f2075c16310a8edbe552020fd8b147.tar.gz gnunet-b393f0f2c8f2075c16310a8edbe552020fd8b147.zip | |
merge meta data for search results
Diffstat (limited to 'src/fs/fs_search.c')
| -rw-r--r-- | src/fs/fs_search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index c75b21668..b5b7a3c8a 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
| @@ -234,7 +234,7 @@ process_ksk_result (struct GNUNET_FS_SearchContext *sc, | |||
| 234 | } | 234 | } |
| 235 | else | 235 | else |
| 236 | { | 236 | { |
| 237 | /* FIXME: consider combining the meta data */ | 237 | GNUNET_CONTAINER_meta_data_merge (sr->meta, meta); |
| 238 | } | 238 | } |
| 239 | /* check if mandatory satisfied */ | 239 | /* check if mandatory satisfied */ |
| 240 | if (ent->mandatory) | 240 | if (ent->mandatory) |