Fix bugs about map & set container

- Fixes typo
- Fixes wrong conditions of iteration

Change-Id: I2b7a5eba2e2f8668b727c221a49c77aaced4035b
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/idlc/gen/version2/c_body_generator_map_base_cb.hh b/idlc/gen/version2/c_body_generator_map_base_cb.hh
index 93f7680..f5b59ef 100644 (file)
--- a/idlc/gen/version2/c_body_generator_map_base_cb.hh
+++ b/idlc/gen/version2/c_body_generator_map_base_cb.hh
@@ -87,7 +87,7 @@ static gboolean __<PREFIX>_<NAME>_traverse_cb(gpointer key, gpointer value, gpoi
   snprintf(name, sizeof(name), "value-%d", info->number++);
   <MAP_UNIT_MAP_VALUE_WRITE>
 
-  return TRUE;
+  return FALSE;
 }
 
 static void __<PREFIX>_<NAME>_to(rpc_port_parcel_h parcel, void *data)
@@ -146,7 +146,7 @@ static void __<PREFIX>_<NAME>_from(rpc_port_parcel_h parcel, void *data)
 
   rpc_port_parcel_read(parcel, &map->parcelable, map);
 
-  ret = rpc_port_unit_map_read_int(parcel, "size", &size);
+  ret = rpc_port_unit_map_read_int(map, "size", &size);
   if (ret != RPC_PORT_ERROR_NONE) {
     _E("Failed to read size. error(%d)", ret);
     rpc_port_unit_map_destroy(map);
@@ -332,7 +332,7 @@ static gboolean __<PREFIX>_<NAME>_foreach_cb(gpointer key, gpointer value, gpoin
   <PREFIX>_<NAME>_foreach_info_t *info = user_data;
   <MAP_FOREACH_VARS_DEF>
 
-  return info->callback(tmp_key, tmp_value, info->user_data);
+  return !info->callback(tmp_key, tmp_value, info->user_data);
 }
 
 int <PREFIX>_<NAME>_foreach(<PREFIX>_<NAME>_h h, <PREFIX>_<NAME>_foreach_cb callback, void *user_data)
@@ -704,7 +704,7 @@ constexpr const char CB_MAP_LOOKUP_VALUE_STRING_SET[] =
 R"__c_cb(
 char *new_value = strdup((char *)data);
 if (new_value == nullptr) {
-  _E("strdup() is failed'0;
+  _E("strdup() is failed");
   return RPC_PORT_ERROR_OUT_OF_MEMORY;
 }
 

diff --git a/idlc/gen/version2/c_body_generator_set_base_cb.hh b/idlc/gen/version2/c_body_generator_set_base_cb.hh
index 2ea2554..8c06391 100644 (file)
--- a/idlc/gen/version2/c_body_generator_set_base_cb.hh
+++ b/idlc/gen/version2/c_body_generator_set_base_cb.hh
@@ -72,7 +72,7 @@ static gboolean __<PREFIX>_<NAME>_traverse_cb(gpointer key, gpointer value, gpoi
   snprintf(name, sizeof(name), "key-%d", info->number++);
   <SET_UNIT_MAP_KEY_WRITE>
 
-  return TRUE;
+  return FALSE;
 }
 
 static void __<PREFIX>_<NAME>_to(rpc_port_parcel_h parcel, void *data)
@@ -130,7 +130,7 @@ static void __<PREFIX>_<NAME>_from(rpc_port_parcel_h parcel, void *data)
 
   rpc_port_parcel_read(parcel, &map->parcelable, map);
 
-  ret = rpc_port_unit_map_read_int(parcel, "size", &size);
+  ret = rpc_port_unit_map_read_int(map, "size", &size);
   if (ret != RPC_PORT_ERROR_NONE) {
     _E("Failed to read size. error(%d)", ret);
     rpc_port_unit_map_destroy(map);
@@ -287,7 +287,7 @@ static gboolean __<PREFIX>_<NAME>_foreach_cb(gpointer key, gpointer value, gpoin
   <PREFIX>_<NAME>_foreach_info_t *info = user_data;
   <SET_FOREACH_VARS_DEF>
 
-  return info->callback(tmp_key, info->user_data);
+  return !info->callback(tmp_key, info->user_data);
 }
 
 int <PREFIX>_<NAME>_foreach(<PREFIX>_<NAME>_h h, <PREFIX>_<NAME>_foreach_cb callback, void *user_data)