diff options
Diffstat (limited to 'src/util/container_meta_data.c')
-rw-r--r-- | src/util/container_meta_data.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c index ad362408e..b66a7b258 100644 --- a/src/util/container_meta_data.c +++ b/src/util/container_meta_data.c | |||
@@ -217,9 +217,9 @@ GNUNET_CONTAINER_meta_data_create () | |||
217 | static void | 217 | static void |
218 | meta_item_free (struct MetaItem *mi) | 218 | meta_item_free (struct MetaItem *mi) |
219 | { | 219 | { |
220 | GNUNET_free_non_null (mi->plugin_name); | 220 | GNUNET_free (mi->plugin_name); |
221 | GNUNET_free_non_null (mi->mime_type); | 221 | GNUNET_free (mi->mime_type); |
222 | GNUNET_free_non_null (mi->data); | 222 | GNUNET_free (mi->data); |
223 | GNUNET_free (mi); | 223 | GNUNET_free (mi); |
224 | } | 224 | } |
225 | 225 | ||
@@ -258,7 +258,7 @@ GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md) | |||
258 | GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, pos); | 258 | GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, pos); |
259 | meta_item_free (pos); | 259 | meta_item_free (pos); |
260 | } | 260 | } |
261 | GNUNET_free_non_null (md->sbuf); | 261 | GNUNET_free (md->sbuf); |
262 | GNUNET_free (md); | 262 | GNUNET_free (md); |
263 | } | 263 | } |
264 | 264 | ||
@@ -280,7 +280,7 @@ GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md) | |||
280 | GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, mi); | 280 | GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, mi); |
281 | meta_item_free (mi); | 281 | meta_item_free (mi); |
282 | } | 282 | } |
283 | GNUNET_free_non_null (md->sbuf); | 283 | GNUNET_free (md->sbuf); |
284 | memset (md, 0, sizeof(struct GNUNET_CONTAINER_MetaData)); | 284 | memset (md, 0, sizeof(struct GNUNET_CONTAINER_MetaData)); |
285 | } | 285 | } |
286 | 286 | ||
@@ -976,7 +976,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
976 | if (NULL != pos->mime_type) | 976 | if (NULL != pos->mime_type) |
977 | left -= strlen (pos->mime_type) + 1; | 977 | left -= strlen (pos->mime_type) + 1; |
978 | 978 | ||
979 | GNUNET_free_non_null (cdata); | 979 | GNUNET_free (cdata); |
980 | cdata = NULL; | 980 | cdata = NULL; |
981 | 981 | ||
982 | i++; | 982 | i++; |
@@ -1180,7 +1180,7 @@ GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size) | |||
1180 | ntohl (ent.type), format, mime_type, | 1180 | ntohl (ent.type), format, mime_type, |
1181 | meta_data, dlen); | 1181 | meta_data, dlen); |
1182 | } | 1182 | } |
1183 | GNUNET_free_non_null (data); | 1183 | GNUNET_free (data); |
1184 | return md; | 1184 | return md; |
1185 | } | 1185 | } |
1186 | 1186 | ||