diff -r dd03226c1a6b -r 48ca036d7d9c ucx/map.h
--- a/ucx/map.h	Thu Oct 04 19:46:10 2012 +0200
+++ b/ucx/map.h	Fri Oct 05 10:25:33 2012 +0200
@@ -66,14 +66,13 @@
 
 int ucx_map_iter_next(UcxMapIterator *i, void **elm);
 
-/* use for string maps only, values are not encoded */
-int ucx_map_load(UcxMap *map, FILE *f);
-int ucx_map_store(UcxMap *map, FILE *f);
+/* use macros for string maps only, values are not encoded */
+#define ucx_map_load(map, f) ucx_map_load_enc(map, f, NULL, NULL)
+#define ucx_map_store(map, f) ucx_map_store_enc(map, f, NULL, NULL)
 
-/* TODO:
 int ucx_map_load_enc(UcxMap *map, FILE *f, copy_func decoder, void* decdata);
+/* encoders shall provide null terminated strings*/
 int ucx_map_store_enc(UcxMap *map, FILE *f, copy_func encoder, void* encdata);
- */
 
 #ifdef	__cplusplus
 }