From af5dd76bca996577262e447fd8bff1bd0df30db7 Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Wed, 26 Oct 2005 08:29:38 +0000
Subject: 2005-10-26  Martin Hunt  <hunt@redhat.com>

	* map.c (_new_map_create, _new_map_del_node, _new_map_del_node,
	_new_map_set_int64, _new_map_set_str,_new_map_get_int64,
	_new_map_get_str, _new_map_get_stat, _new_map_set_stat):
	New internal functions for the new API.

	* map-int.c (__stp_map_set_int64): Modify to return an
	error code.
	* map-stat.c (_stp_map_add_stat): Ditto.
	* map-str (_stp_map_set_str): Ditto.

	* Doxyfile: Remove predefines NEED_STRING_VALS,
	NEED_STATS, NEED_INT64.
	* map-keys.c: Ditto.
	* list.c (_stp_list_new): Ditto. Also set map->list.
	* map-values.c: Ditto.
---
 runtime/map-str.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'runtime/map-str.c')

diff --git a/runtime/map-str.c b/runtime/map-str.c
index e5e5b5e4..96eb5b5c 100644
--- a/runtime/map-str.c
+++ b/runtime/map-str.c
@@ -20,27 +20,27 @@ void str_add(void *dest, char *val)
 	dst[len + len1] = 0;
 }
 
-void __stp_map_set_str (MAP map, char *val, int add)
+int __stp_map_set_str (MAP map, char *val, int add)
 {
 	struct map_node *m;
 
 	if (map == NULL)
-		return;
+		return -2;
 
 	if (map->create) {
-		if (val == 0 && !map->no_wrap)
-			return;
+		if (val == 0 && !map->list)
+			return 0;
 
 		m = __stp_map_create (map);
 		if (!m)
-			return;
+			return -1;
 		
 		/* set the value */
 		//dbug ("m=%lx offset=%lx\n", (long)m, (long)map->data_offset);
 		str_copy((void *)((long)m + map->data_offset), val);
 	} else {
 		if (map->key == NULL)
-			return;
+			return -2;
 		
 		if (val) {
 			if (add)
@@ -52,6 +52,7 @@ void __stp_map_set_str (MAP map, char *val, int add)
 			_stp_map_key_del(map);
 		}
 	}
+	return 0;
 }
 
 /** Set the current element's value to a string.
@@ -62,6 +63,7 @@ void __stp_map_set_str (MAP map, char *val, int add)
  * is set for the map, this function does nothing.
  * @param map
  * @param str String containing new value.
+ * @returns \li \c 0 on success \li \c -1 on overflow \li \c -2 on bad map or key
  * @sa _stp_map_set()
  * @ingroup map_set
  */
@@ -75,6 +77,7 @@ void __stp_map_set_str (MAP map, char *val, int add)
  * is set for the map, this function does nothing.
  * @param map
  * @param val String containing value to append.
+ * @returns \li \c 0 on success \li \c -1 on overflow \li \c -2 on bad map or key
  * @ingroup map_set
  */
 #define _stp_map_add_str(map,val) __stp_map_set_str(map,val,1)
@@ -107,6 +110,7 @@ char *_stp_map_get_str (MAP map)
  * is set for the map, this function does nothing.
  * @param map
  * @param str String containing new value.
+ * @returns 0 on success, -1 on error.
  * @sa _stp_map_set()
  * @ingroup map_set
  */
-- 
cgit