A small memory footprint AMQP implimentation

Dependents:   iothub_client_sample_amqp remote_monitoring simplesample_amqp

Revision:
19:000ab4e6a2c1
Parent:
17:923575db8b2d
Child:
20:206846c14c80
--- a/amqp_definitions.c	Fri Feb 10 17:00:55 2017 -0800
+++ b/amqp_definitions.c	Fri Feb 24 14:00:58 2017 -0800
@@ -4,6 +4,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include <stdlib.h>
+#include "azure_c_shared_utility/optimize_size.h"
 #include "azure_uamqp_c/amqpvalue.h"
 #include "azure_uamqp_c/amqp_definitions.h"
 #include "azure_uamqp_c/amqpalloc.h"
@@ -138,7 +139,7 @@
 			condition_amqp_value = amqpvalue_create_symbol(condition_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(error_instance->composite_value, 0, condition_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(condition_amqp_value);
@@ -217,7 +218,7 @@
 	*error_handle = error_instance;
 	if (*error_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -225,7 +226,7 @@
 		if (list_value == NULL)
 		{
 			error_destroy(*error_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -238,7 +239,7 @@
 				{
 					{
 						error_destroy(*error_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -248,7 +249,7 @@
 					if (amqpvalue_get_symbol(item_value, &condition) != 0)
 					{
 						error_destroy(*error_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -268,7 +269,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							error_destroy(*error_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -289,7 +290,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							error_destroy(*error_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -313,7 +314,7 @@
 
 	if (error == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -321,13 +322,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(error_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_symbol(item_value, condition_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -345,7 +346,7 @@
 
 	if (error == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -353,13 +354,13 @@
 		AMQP_VALUE condition_amqp_value = amqpvalue_create_symbol(condition_value);
 		if (condition_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(error_instance->composite_value, 0, condition_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -379,7 +380,7 @@
 
 	if (error == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -387,13 +388,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(error_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, description_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -411,7 +412,7 @@
 
 	if (error == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -419,13 +420,13 @@
 		AMQP_VALUE description_amqp_value = amqpvalue_create_string(description_value);
 		if (description_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(error_instance->composite_value, 1, description_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -445,7 +446,7 @@
 
 	if (error == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -453,13 +454,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(error_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_fields(item_value, info_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -477,7 +478,7 @@
 
 	if (error == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -485,13 +486,13 @@
 		AMQP_VALUE info_amqp_value = amqpvalue_create_fields(info_value);
 		if (info_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(error_instance->composite_value, 2, info_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -571,7 +572,7 @@
 			container_id_amqp_value = amqpvalue_create_string(container_id_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(open_instance->composite_value, 0, container_id_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(container_id_amqp_value);
@@ -650,7 +651,7 @@
 	*open_handle = open_instance;
 	if (*open_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -658,7 +659,7 @@
 		if (list_value == NULL)
 		{
 			open_destroy(*open_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -671,7 +672,7 @@
 				{
 					{
 						open_destroy(*open_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -681,7 +682,7 @@
 					if (amqpvalue_get_string(item_value, &container_id) != 0)
 					{
 						open_destroy(*open_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -701,7 +702,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -722,7 +723,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -743,7 +744,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -764,7 +765,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -787,7 +788,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -810,7 +811,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -833,7 +834,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -856,7 +857,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -877,7 +878,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							open_destroy(*open_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -901,7 +902,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -909,13 +910,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, container_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -933,7 +934,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -941,13 +942,13 @@
 		AMQP_VALUE container_id_amqp_value = amqpvalue_create_string(container_id_value);
 		if (container_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 0, container_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -967,7 +968,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -975,13 +976,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, hostname_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -999,7 +1000,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1007,13 +1008,13 @@
 		AMQP_VALUE hostname_amqp_value = amqpvalue_create_string(hostname_value);
 		if (hostname_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 1, hostname_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1033,7 +1034,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1050,7 +1051,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -1074,7 +1075,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1082,13 +1083,13 @@
 		AMQP_VALUE max_frame_size_amqp_value = amqpvalue_create_uint(max_frame_size_value);
 		if (max_frame_size_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 2, max_frame_size_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1108,7 +1109,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1125,7 +1126,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -1149,7 +1150,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1157,13 +1158,13 @@
 		AMQP_VALUE channel_max_amqp_value = amqpvalue_create_ushort(channel_max_value);
 		if (channel_max_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 3, channel_max_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1183,7 +1184,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1191,13 +1192,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 4);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_milliseconds(item_value, idle_time_out_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -1215,7 +1216,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1223,13 +1224,13 @@
 		AMQP_VALUE idle_time_out_amqp_value = amqpvalue_create_milliseconds(idle_time_out_value);
 		if (idle_time_out_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 4, idle_time_out_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1249,7 +1250,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1257,13 +1258,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 5);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, outgoing_locales_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -1281,7 +1282,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1289,13 +1290,13 @@
 		AMQP_VALUE outgoing_locales_amqp_value = amqpvalue_clone(outgoing_locales_value);
 		if (outgoing_locales_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 5, outgoing_locales_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1315,7 +1316,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1323,13 +1324,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, incoming_locales_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -1347,7 +1348,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1355,13 +1356,13 @@
 		AMQP_VALUE incoming_locales_amqp_value = amqpvalue_clone(incoming_locales_value);
 		if (incoming_locales_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 6, incoming_locales_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1381,7 +1382,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1389,13 +1390,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 7);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, offered_capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -1413,7 +1414,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1421,13 +1422,13 @@
 		AMQP_VALUE offered_capabilities_amqp_value = amqpvalue_clone(offered_capabilities_value);
 		if (offered_capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 7, offered_capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1447,7 +1448,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1455,13 +1456,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 8);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, desired_capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -1479,7 +1480,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1487,13 +1488,13 @@
 		AMQP_VALUE desired_capabilities_amqp_value = amqpvalue_clone(desired_capabilities_value);
 		if (desired_capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 8, desired_capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1513,7 +1514,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1521,13 +1522,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(open_instance->composite_value, 9);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_fields(item_value, properties_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -1545,7 +1546,7 @@
 
 	if (open == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1553,13 +1554,13 @@
 		AMQP_VALUE properties_amqp_value = amqpvalue_create_fields(properties_value);
 		if (properties_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(open_instance->composite_value, 9, properties_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1613,17 +1614,17 @@
 			next_outgoing_id_amqp_value = amqpvalue_create_transfer_number(next_outgoing_id_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(begin_instance->composite_value, 1, next_outgoing_id_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			incoming_window_amqp_value = amqpvalue_create_uint(incoming_window_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(begin_instance->composite_value, 2, incoming_window_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			outgoing_window_amqp_value = amqpvalue_create_uint(outgoing_window_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(begin_instance->composite_value, 3, outgoing_window_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(next_outgoing_id_amqp_value);
@@ -1704,7 +1705,7 @@
 	*begin_handle = begin_instance;
 	if (*begin_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1712,7 +1713,7 @@
 		if (list_value == NULL)
 		{
 			begin_destroy(*begin_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -1733,7 +1734,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							begin_destroy(*begin_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -1746,7 +1747,7 @@
 				{
 					{
 						begin_destroy(*begin_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -1756,7 +1757,7 @@
 					if (amqpvalue_get_transfer_number(item_value, &next_outgoing_id) != 0)
 					{
 						begin_destroy(*begin_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -1768,7 +1769,7 @@
 				{
 					{
 						begin_destroy(*begin_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -1778,7 +1779,7 @@
 					if (amqpvalue_get_uint(item_value, &incoming_window) != 0)
 					{
 						begin_destroy(*begin_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -1790,7 +1791,7 @@
 				{
 					{
 						begin_destroy(*begin_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -1800,7 +1801,7 @@
 					if (amqpvalue_get_uint(item_value, &outgoing_window) != 0)
 					{
 						begin_destroy(*begin_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -1820,7 +1821,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							begin_destroy(*begin_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -1843,7 +1844,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							begin_destroy(*begin_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -1866,7 +1867,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							begin_destroy(*begin_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -1887,7 +1888,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							begin_destroy(*begin_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -1911,7 +1912,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1919,13 +1920,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(begin_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_ushort(item_value, remote_channel_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -1943,7 +1944,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1951,13 +1952,13 @@
 		AMQP_VALUE remote_channel_amqp_value = amqpvalue_create_ushort(remote_channel_value);
 		if (remote_channel_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 0, remote_channel_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -1977,7 +1978,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -1985,13 +1986,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(begin_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_transfer_number(item_value, next_outgoing_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2009,7 +2010,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2017,13 +2018,13 @@
 		AMQP_VALUE next_outgoing_id_amqp_value = amqpvalue_create_transfer_number(next_outgoing_id_value);
 		if (next_outgoing_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 1, next_outgoing_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2043,7 +2044,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2051,13 +2052,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(begin_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_uint(item_value, incoming_window_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2075,7 +2076,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2083,13 +2084,13 @@
 		AMQP_VALUE incoming_window_amqp_value = amqpvalue_create_uint(incoming_window_value);
 		if (incoming_window_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 2, incoming_window_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2109,7 +2110,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2117,13 +2118,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(begin_instance->composite_value, 3);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_uint(item_value, outgoing_window_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2141,7 +2142,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2149,13 +2150,13 @@
 		AMQP_VALUE outgoing_window_amqp_value = amqpvalue_create_uint(outgoing_window_value);
 		if (outgoing_window_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 3, outgoing_window_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2175,7 +2176,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2192,7 +2193,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -2216,7 +2217,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2224,13 +2225,13 @@
 		AMQP_VALUE handle_max_amqp_value = amqpvalue_create_handle(handle_max_value);
 		if (handle_max_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 4, handle_max_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2250,7 +2251,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2258,13 +2259,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(begin_instance->composite_value, 5);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, offered_capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2282,7 +2283,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2290,13 +2291,13 @@
 		AMQP_VALUE offered_capabilities_amqp_value = amqpvalue_clone(offered_capabilities_value);
 		if (offered_capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 5, offered_capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2316,7 +2317,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2324,13 +2325,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(begin_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, desired_capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2348,7 +2349,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2356,13 +2357,13 @@
 		AMQP_VALUE desired_capabilities_amqp_value = amqpvalue_clone(desired_capabilities_value);
 		if (desired_capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 6, desired_capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2382,7 +2383,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2390,13 +2391,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(begin_instance->composite_value, 7);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_fields(item_value, properties_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2414,7 +2415,7 @@
 
 	if (begin == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2422,13 +2423,13 @@
 		AMQP_VALUE properties_amqp_value = amqpvalue_create_fields(properties_value);
 		if (properties_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(begin_instance->composite_value, 7, properties_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2482,17 +2483,17 @@
 			name_amqp_value = amqpvalue_create_string(name_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(attach_instance->composite_value, 0, name_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			handle_amqp_value = amqpvalue_create_handle(handle_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(attach_instance->composite_value, 1, handle_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			role_amqp_value = amqpvalue_create_role(role_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(attach_instance->composite_value, 2, role_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(name_amqp_value);
@@ -2573,7 +2574,7 @@
 	*attach_handle = attach_instance;
 	if (*attach_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2581,7 +2582,7 @@
 		if (list_value == NULL)
 		{
 			attach_destroy(*attach_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -2594,7 +2595,7 @@
 				{
 					{
 						attach_destroy(*attach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -2604,7 +2605,7 @@
 					if (amqpvalue_get_string(item_value, &name) != 0)
 					{
 						attach_destroy(*attach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -2616,7 +2617,7 @@
 				{
 					{
 						attach_destroy(*attach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -2626,7 +2627,7 @@
 					if (amqpvalue_get_handle(item_value, &handle) != 0)
 					{
 						attach_destroy(*attach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -2638,7 +2639,7 @@
 				{
 					{
 						attach_destroy(*attach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -2648,7 +2649,7 @@
 					if (amqpvalue_get_role(item_value, &role) != 0)
 					{
 						attach_destroy(*attach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -2668,7 +2669,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2689,7 +2690,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2730,7 +2731,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2751,7 +2752,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2772,7 +2773,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2793,7 +2794,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2816,7 +2817,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2839,7 +2840,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2860,7 +2861,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							attach_destroy(*attach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -2884,7 +2885,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2892,13 +2893,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, name_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2916,7 +2917,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2924,13 +2925,13 @@
 		AMQP_VALUE name_amqp_value = amqpvalue_create_string(name_value);
 		if (name_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 0, name_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -2950,7 +2951,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2958,13 +2959,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_handle(item_value, handle_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -2982,7 +2983,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -2990,13 +2991,13 @@
 		AMQP_VALUE handle_amqp_value = amqpvalue_create_handle(handle_value);
 		if (handle_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 1, handle_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3016,7 +3017,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3024,13 +3025,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_role(item_value, role_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -3048,7 +3049,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3056,13 +3057,13 @@
 		AMQP_VALUE role_amqp_value = amqpvalue_create_role(role_value);
 		if (role_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 2, role_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3082,7 +3083,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3099,7 +3100,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -3123,7 +3124,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3131,13 +3132,13 @@
 		AMQP_VALUE snd_settle_mode_amqp_value = amqpvalue_create_sender_settle_mode(snd_settle_mode_value);
 		if (snd_settle_mode_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 3, snd_settle_mode_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3157,7 +3158,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3174,7 +3175,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -3198,7 +3199,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3206,13 +3207,13 @@
 		AMQP_VALUE rcv_settle_mode_amqp_value = amqpvalue_create_receiver_settle_mode(rcv_settle_mode_value);
 		if (rcv_settle_mode_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 4, rcv_settle_mode_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3232,7 +3233,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3240,7 +3241,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 5);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -3258,7 +3259,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3266,13 +3267,13 @@
 		AMQP_VALUE source_amqp_value = amqpvalue_clone(source_value);
 		if (source_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 5, source_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3292,7 +3293,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3300,7 +3301,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -3318,7 +3319,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3326,13 +3327,13 @@
 		AMQP_VALUE target_amqp_value = amqpvalue_clone(target_value);
 		if (target_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 6, target_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3352,7 +3353,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3360,13 +3361,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 7);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_map(item_value, unsettled_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -3384,7 +3385,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3392,13 +3393,13 @@
 		AMQP_VALUE unsettled_amqp_value = amqpvalue_clone(unsettled_value);
 		if (unsettled_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 7, unsettled_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3418,7 +3419,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3435,7 +3436,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -3459,7 +3460,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3467,13 +3468,13 @@
 		AMQP_VALUE incomplete_unsettled_amqp_value = amqpvalue_create_boolean(incomplete_unsettled_value);
 		if (incomplete_unsettled_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 8, incomplete_unsettled_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3493,7 +3494,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3501,13 +3502,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 9);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_sequence_no(item_value, initial_delivery_count_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -3525,7 +3526,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3533,13 +3534,13 @@
 		AMQP_VALUE initial_delivery_count_amqp_value = amqpvalue_create_sequence_no(initial_delivery_count_value);
 		if (initial_delivery_count_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 9, initial_delivery_count_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3559,7 +3560,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3567,13 +3568,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 10);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_ulong(item_value, max_message_size_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -3591,7 +3592,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3599,13 +3600,13 @@
 		AMQP_VALUE max_message_size_amqp_value = amqpvalue_create_ulong(max_message_size_value);
 		if (max_message_size_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 10, max_message_size_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3625,7 +3626,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3633,13 +3634,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 11);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, offered_capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -3657,7 +3658,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3665,13 +3666,13 @@
 		AMQP_VALUE offered_capabilities_amqp_value = amqpvalue_clone(offered_capabilities_value);
 		if (offered_capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 11, offered_capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3691,7 +3692,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3699,13 +3700,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 12);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, desired_capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -3723,7 +3724,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3731,13 +3732,13 @@
 		AMQP_VALUE desired_capabilities_amqp_value = amqpvalue_clone(desired_capabilities_value);
 		if (desired_capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 12, desired_capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3757,7 +3758,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3765,13 +3766,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(attach_instance->composite_value, 13);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_fields(item_value, properties_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -3789,7 +3790,7 @@
 
 	if (attach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3797,13 +3798,13 @@
 		AMQP_VALUE properties_amqp_value = amqpvalue_create_fields(properties_value);
 		if (properties_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(attach_instance->composite_value, 13, properties_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -3857,17 +3858,17 @@
 			incoming_window_amqp_value = amqpvalue_create_uint(incoming_window_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(flow_instance->composite_value, 1, incoming_window_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			next_outgoing_id_amqp_value = amqpvalue_create_transfer_number(next_outgoing_id_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(flow_instance->composite_value, 2, next_outgoing_id_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			outgoing_window_amqp_value = amqpvalue_create_uint(outgoing_window_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(flow_instance->composite_value, 3, outgoing_window_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(incoming_window_amqp_value);
@@ -3948,7 +3949,7 @@
 	*flow_handle = flow_instance;
 	if (*flow_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -3956,7 +3957,7 @@
 		if (list_value == NULL)
 		{
 			flow_destroy(*flow_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -3977,7 +3978,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -3990,7 +3991,7 @@
 				{
 					{
 						flow_destroy(*flow_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -4000,7 +4001,7 @@
 					if (amqpvalue_get_uint(item_value, &incoming_window) != 0)
 					{
 						flow_destroy(*flow_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -4012,7 +4013,7 @@
 				{
 					{
 						flow_destroy(*flow_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -4022,7 +4023,7 @@
 					if (amqpvalue_get_transfer_number(item_value, &next_outgoing_id) != 0)
 					{
 						flow_destroy(*flow_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -4034,7 +4035,7 @@
 				{
 					{
 						flow_destroy(*flow_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -4044,7 +4045,7 @@
 					if (amqpvalue_get_uint(item_value, &outgoing_window) != 0)
 					{
 						flow_destroy(*flow_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -4064,7 +4065,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -4085,7 +4086,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -4106,7 +4107,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -4127,7 +4128,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -4148,7 +4149,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -4169,7 +4170,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -4190,7 +4191,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							flow_destroy(*flow_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -4214,7 +4215,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4222,13 +4223,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_transfer_number(item_value, next_incoming_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4246,7 +4247,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4254,13 +4255,13 @@
 		AMQP_VALUE next_incoming_id_amqp_value = amqpvalue_create_transfer_number(next_incoming_id_value);
 		if (next_incoming_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 0, next_incoming_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4280,7 +4281,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4288,13 +4289,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_uint(item_value, incoming_window_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4312,7 +4313,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4320,13 +4321,13 @@
 		AMQP_VALUE incoming_window_amqp_value = amqpvalue_create_uint(incoming_window_value);
 		if (incoming_window_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 1, incoming_window_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4346,7 +4347,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4354,13 +4355,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_transfer_number(item_value, next_outgoing_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4378,7 +4379,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4386,13 +4387,13 @@
 		AMQP_VALUE next_outgoing_id_amqp_value = amqpvalue_create_transfer_number(next_outgoing_id_value);
 		if (next_outgoing_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 2, next_outgoing_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4412,7 +4413,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4420,13 +4421,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 3);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_uint(item_value, outgoing_window_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4444,7 +4445,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4452,13 +4453,13 @@
 		AMQP_VALUE outgoing_window_amqp_value = amqpvalue_create_uint(outgoing_window_value);
 		if (outgoing_window_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 3, outgoing_window_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4478,7 +4479,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4486,13 +4487,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 4);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_handle(item_value, handle_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4510,7 +4511,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4518,13 +4519,13 @@
 		AMQP_VALUE handle_amqp_value = amqpvalue_create_handle(handle_value);
 		if (handle_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 4, handle_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4544,7 +4545,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4552,13 +4553,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 5);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_sequence_no(item_value, delivery_count_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4576,7 +4577,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4584,13 +4585,13 @@
 		AMQP_VALUE delivery_count_amqp_value = amqpvalue_create_sequence_no(delivery_count_value);
 		if (delivery_count_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 5, delivery_count_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4610,7 +4611,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4618,13 +4619,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_uint(item_value, link_credit_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4642,7 +4643,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4650,13 +4651,13 @@
 		AMQP_VALUE link_credit_amqp_value = amqpvalue_create_uint(link_credit_value);
 		if (link_credit_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 6, link_credit_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4676,7 +4677,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4684,13 +4685,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 7);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_uint(item_value, available_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4708,7 +4709,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4716,13 +4717,13 @@
 		AMQP_VALUE available_amqp_value = amqpvalue_create_uint(available_value);
 		if (available_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 7, available_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4742,7 +4743,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4759,7 +4760,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -4783,7 +4784,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4791,13 +4792,13 @@
 		AMQP_VALUE drain_amqp_value = amqpvalue_create_boolean(drain_value);
 		if (drain_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 8, drain_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4817,7 +4818,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4834,7 +4835,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -4858,7 +4859,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4866,13 +4867,13 @@
 		AMQP_VALUE echo_amqp_value = amqpvalue_create_boolean(echo_value);
 		if (echo_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 9, echo_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4892,7 +4893,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4900,13 +4901,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(flow_instance->composite_value, 10);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_fields(item_value, properties_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -4924,7 +4925,7 @@
 
 	if (flow == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -4932,13 +4933,13 @@
 		AMQP_VALUE properties_amqp_value = amqpvalue_create_fields(properties_value);
 		if (properties_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(flow_instance->composite_value, 10, properties_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -4990,7 +4991,7 @@
 			handle_amqp_value = amqpvalue_create_handle(handle_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(transfer_instance->composite_value, 0, handle_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(handle_amqp_value);
@@ -5069,7 +5070,7 @@
 	*transfer_handle = transfer_instance;
 	if (*transfer_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5077,7 +5078,7 @@
 		if (list_value == NULL)
 		{
 			transfer_destroy(*transfer_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -5090,7 +5091,7 @@
 				{
 					{
 						transfer_destroy(*transfer_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -5100,7 +5101,7 @@
 					if (amqpvalue_get_handle(item_value, &handle) != 0)
 					{
 						transfer_destroy(*transfer_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -5120,7 +5121,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5141,7 +5142,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5162,7 +5163,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5183,7 +5184,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5204,7 +5205,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5225,7 +5226,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5256,7 +5257,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5277,7 +5278,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5298,7 +5299,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							transfer_destroy(*transfer_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -5322,7 +5323,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5330,13 +5331,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(transfer_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_handle(item_value, handle_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -5354,7 +5355,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5362,13 +5363,13 @@
 		AMQP_VALUE handle_amqp_value = amqpvalue_create_handle(handle_value);
 		if (handle_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 0, handle_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5388,7 +5389,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5396,13 +5397,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(transfer_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_delivery_number(item_value, delivery_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -5420,7 +5421,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5428,13 +5429,13 @@
 		AMQP_VALUE delivery_id_amqp_value = amqpvalue_create_delivery_number(delivery_id_value);
 		if (delivery_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 1, delivery_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5454,7 +5455,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5462,13 +5463,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(transfer_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_delivery_tag(item_value, delivery_tag_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -5486,7 +5487,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5494,13 +5495,13 @@
 		AMQP_VALUE delivery_tag_amqp_value = amqpvalue_create_delivery_tag(delivery_tag_value);
 		if (delivery_tag_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 2, delivery_tag_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5520,7 +5521,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5528,13 +5529,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(transfer_instance->composite_value, 3);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_message_format(item_value, message_format_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -5552,7 +5553,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5560,13 +5561,13 @@
 		AMQP_VALUE message_format_amqp_value = amqpvalue_create_message_format(message_format_value);
 		if (message_format_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 3, message_format_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5586,7 +5587,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5594,13 +5595,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(transfer_instance->composite_value, 4);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_boolean(item_value, settled_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -5618,7 +5619,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5626,13 +5627,13 @@
 		AMQP_VALUE settled_amqp_value = amqpvalue_create_boolean(settled_value);
 		if (settled_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 4, settled_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5652,7 +5653,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5669,7 +5670,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -5693,7 +5694,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5701,13 +5702,13 @@
 		AMQP_VALUE more_amqp_value = amqpvalue_create_boolean(more_value);
 		if (more_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 5, more_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5727,7 +5728,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5735,13 +5736,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(transfer_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_receiver_settle_mode(item_value, rcv_settle_mode_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -5759,7 +5760,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5767,13 +5768,13 @@
 		AMQP_VALUE rcv_settle_mode_amqp_value = amqpvalue_create_receiver_settle_mode(rcv_settle_mode_value);
 		if (rcv_settle_mode_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 6, rcv_settle_mode_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5793,7 +5794,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5801,7 +5802,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(transfer_instance->composite_value, 7);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -5819,7 +5820,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5827,13 +5828,13 @@
 		AMQP_VALUE state_amqp_value = amqpvalue_clone(state_value);
 		if (state_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 7, state_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5853,7 +5854,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5870,7 +5871,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -5894,7 +5895,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5902,13 +5903,13 @@
 		AMQP_VALUE resume_amqp_value = amqpvalue_create_boolean(resume_value);
 		if (resume_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 8, resume_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -5928,7 +5929,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5945,7 +5946,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -5969,7 +5970,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -5977,13 +5978,13 @@
 		AMQP_VALUE aborted_amqp_value = amqpvalue_create_boolean(aborted_value);
 		if (aborted_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 9, aborted_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6003,7 +6004,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6020,7 +6021,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -6044,7 +6045,7 @@
 
 	if (transfer == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6052,13 +6053,13 @@
 		AMQP_VALUE batchable_amqp_value = amqpvalue_create_boolean(batchable_value);
 		if (batchable_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(transfer_instance->composite_value, 10, batchable_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6111,12 +6112,12 @@
 			role_amqp_value = amqpvalue_create_role(role_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(disposition_instance->composite_value, 0, role_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			first_amqp_value = amqpvalue_create_delivery_number(first_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(disposition_instance->composite_value, 1, first_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(role_amqp_value);
@@ -6196,7 +6197,7 @@
 	*disposition_handle = disposition_instance;
 	if (*disposition_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6204,7 +6205,7 @@
 		if (list_value == NULL)
 		{
 			disposition_destroy(*disposition_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -6217,7 +6218,7 @@
 				{
 					{
 						disposition_destroy(*disposition_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -6227,7 +6228,7 @@
 					if (amqpvalue_get_role(item_value, &role) != 0)
 					{
 						disposition_destroy(*disposition_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -6239,7 +6240,7 @@
 				{
 					{
 						disposition_destroy(*disposition_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -6249,7 +6250,7 @@
 					if (amqpvalue_get_delivery_number(item_value, &first) != 0)
 					{
 						disposition_destroy(*disposition_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -6269,7 +6270,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							disposition_destroy(*disposition_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -6290,7 +6291,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							disposition_destroy(*disposition_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -6321,7 +6322,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							disposition_destroy(*disposition_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -6345,7 +6346,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6353,13 +6354,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(disposition_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_role(item_value, role_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -6377,7 +6378,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6385,13 +6386,13 @@
 		AMQP_VALUE role_amqp_value = amqpvalue_create_role(role_value);
 		if (role_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(disposition_instance->composite_value, 0, role_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6411,7 +6412,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6419,13 +6420,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(disposition_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_delivery_number(item_value, first_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -6443,7 +6444,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6451,13 +6452,13 @@
 		AMQP_VALUE first_amqp_value = amqpvalue_create_delivery_number(first_value);
 		if (first_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(disposition_instance->composite_value, 1, first_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6477,7 +6478,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6485,13 +6486,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(disposition_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_delivery_number(item_value, last_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -6509,7 +6510,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6517,13 +6518,13 @@
 		AMQP_VALUE last_amqp_value = amqpvalue_create_delivery_number(last_value);
 		if (last_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(disposition_instance->composite_value, 2, last_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6543,7 +6544,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6560,7 +6561,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -6584,7 +6585,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6592,13 +6593,13 @@
 		AMQP_VALUE settled_amqp_value = amqpvalue_create_boolean(settled_value);
 		if (settled_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(disposition_instance->composite_value, 3, settled_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6618,7 +6619,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6626,7 +6627,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(disposition_instance->composite_value, 4);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -6644,7 +6645,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6652,13 +6653,13 @@
 		AMQP_VALUE state_amqp_value = amqpvalue_clone(state_value);
 		if (state_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(disposition_instance->composite_value, 4, state_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6678,7 +6679,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6695,7 +6696,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -6719,7 +6720,7 @@
 
 	if (disposition == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6727,13 +6728,13 @@
 		AMQP_VALUE batchable_amqp_value = amqpvalue_create_boolean(batchable_value);
 		if (batchable_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(disposition_instance->composite_value, 5, batchable_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -6785,7 +6786,7 @@
 			handle_amqp_value = amqpvalue_create_handle(handle_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(detach_instance->composite_value, 0, handle_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(handle_amqp_value);
@@ -6864,7 +6865,7 @@
 	*detach_handle = detach_instance;
 	if (*detach_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6872,7 +6873,7 @@
 		if (list_value == NULL)
 		{
 			detach_destroy(*detach_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -6885,7 +6886,7 @@
 				{
 					{
 						detach_destroy(*detach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -6895,7 +6896,7 @@
 					if (amqpvalue_get_handle(item_value, &handle) != 0)
 					{
 						detach_destroy(*detach_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -6915,7 +6916,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							detach_destroy(*detach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -6936,7 +6937,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							detach_destroy(*detach_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -6960,7 +6961,7 @@
 
 	if (detach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -6968,13 +6969,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(detach_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_handle(item_value, handle_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -6992,7 +6993,7 @@
 
 	if (detach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7000,13 +7001,13 @@
 		AMQP_VALUE handle_amqp_value = amqpvalue_create_handle(handle_value);
 		if (handle_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(detach_instance->composite_value, 0, handle_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -7026,7 +7027,7 @@
 
 	if (detach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7043,7 +7044,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -7067,7 +7068,7 @@
 
 	if (detach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7075,13 +7076,13 @@
 		AMQP_VALUE closed_amqp_value = amqpvalue_create_boolean(closed_value);
 		if (closed_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(detach_instance->composite_value, 1, closed_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -7101,7 +7102,7 @@
 
 	if (detach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7109,13 +7110,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(detach_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_error(item_value, error_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -7133,7 +7134,7 @@
 
 	if (detach == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7141,13 +7142,13 @@
 		AMQP_VALUE error_amqp_value = amqpvalue_create_error(error_value);
 		if (error_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(detach_instance->composite_value, 2, error_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -7265,7 +7266,7 @@
 	*end_handle = end_instance;
 	if (*end_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7273,7 +7274,7 @@
 		if (list_value == NULL)
 		{
 			end_destroy(*end_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -7294,7 +7295,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							end_destroy(*end_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -7318,7 +7319,7 @@
 
 	if (end == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7326,13 +7327,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(end_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_error(item_value, error_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -7350,7 +7351,7 @@
 
 	if (end == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7358,13 +7359,13 @@
 		AMQP_VALUE error_amqp_value = amqpvalue_create_error(error_value);
 		if (error_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(end_instance->composite_value, 0, error_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -7482,7 +7483,7 @@
 	*close_handle = close_instance;
 	if (*close_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7490,7 +7491,7 @@
 		if (list_value == NULL)
 		{
 			close_destroy(*close_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -7511,7 +7512,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							close_destroy(*close_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -7535,7 +7536,7 @@
 
 	if (close == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7543,13 +7544,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(close_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_error(item_value, error_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -7567,7 +7568,7 @@
 
 	if (close == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7575,13 +7576,13 @@
 		AMQP_VALUE error_amqp_value = amqpvalue_create_error(error_value);
 		if (error_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(close_instance->composite_value, 0, error_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -7640,7 +7641,7 @@
 			sasl_server_mechanisms_amqp_value = sasl_server_mechanisms_value;
 			if ((result == 0) && (amqpvalue_set_composite_item(sasl_mechanisms_instance->composite_value, 0, sasl_server_mechanisms_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(sasl_server_mechanisms_amqp_value);
@@ -7719,7 +7720,7 @@
 	*sasl_mechanisms_handle = sasl_mechanisms_instance;
 	if (*sasl_mechanisms_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7727,7 +7728,7 @@
 		if (list_value == NULL)
 		{
 			sasl_mechanisms_destroy(*sasl_mechanisms_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -7740,7 +7741,7 @@
 				{
 					{
 						sasl_mechanisms_destroy(*sasl_mechanisms_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -7752,7 +7753,7 @@
 						(amqpvalue_get_symbol(item_value, &sasl_server_mechanisms) != 0))
 					{
 						sasl_mechanisms_destroy(*sasl_mechanisms_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -7775,7 +7776,7 @@
 
 	if (sasl_mechanisms == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7783,13 +7784,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_mechanisms_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, sasl_server_mechanisms_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -7807,7 +7808,7 @@
 
 	if (sasl_mechanisms == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7815,13 +7816,13 @@
 		AMQP_VALUE sasl_server_mechanisms_amqp_value = amqpvalue_clone(sasl_server_mechanisms_value);
 		if (sasl_server_mechanisms_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_mechanisms_instance->composite_value, 0, sasl_server_mechanisms_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -7873,7 +7874,7 @@
 			mechanism_amqp_value = amqpvalue_create_symbol(mechanism_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(sasl_init_instance->composite_value, 0, mechanism_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(mechanism_amqp_value);
@@ -7952,7 +7953,7 @@
 	*sasl_init_handle = sasl_init_instance;
 	if (*sasl_init_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -7960,7 +7961,7 @@
 		if (list_value == NULL)
 		{
 			sasl_init_destroy(*sasl_init_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -7973,7 +7974,7 @@
 				{
 					{
 						sasl_init_destroy(*sasl_init_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -7983,7 +7984,7 @@
 					if (amqpvalue_get_symbol(item_value, &mechanism) != 0)
 					{
 						sasl_init_destroy(*sasl_init_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -8003,7 +8004,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							sasl_init_destroy(*sasl_init_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -8024,7 +8025,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							sasl_init_destroy(*sasl_init_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -8048,7 +8049,7 @@
 
 	if (sasl_init == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8056,13 +8057,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_init_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_symbol(item_value, mechanism_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -8080,7 +8081,7 @@
 
 	if (sasl_init == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8088,13 +8089,13 @@
 		AMQP_VALUE mechanism_amqp_value = amqpvalue_create_symbol(mechanism_value);
 		if (mechanism_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_init_instance->composite_value, 0, mechanism_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -8114,7 +8115,7 @@
 
 	if (sasl_init == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8122,13 +8123,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_init_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_binary(item_value, initial_response_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -8146,7 +8147,7 @@
 
 	if (sasl_init == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8154,13 +8155,13 @@
 		AMQP_VALUE initial_response_amqp_value = amqpvalue_create_binary(initial_response_value);
 		if (initial_response_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_init_instance->composite_value, 1, initial_response_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -8180,7 +8181,7 @@
 
 	if (sasl_init == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8188,13 +8189,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_init_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, hostname_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -8212,7 +8213,7 @@
 
 	if (sasl_init == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8220,13 +8221,13 @@
 		AMQP_VALUE hostname_amqp_value = amqpvalue_create_string(hostname_value);
 		if (hostname_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_init_instance->composite_value, 2, hostname_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -8278,7 +8279,7 @@
 			challenge_amqp_value = amqpvalue_create_binary(challenge_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(sasl_challenge_instance->composite_value, 0, challenge_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(challenge_amqp_value);
@@ -8357,7 +8358,7 @@
 	*sasl_challenge_handle = sasl_challenge_instance;
 	if (*sasl_challenge_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8365,7 +8366,7 @@
 		if (list_value == NULL)
 		{
 			sasl_challenge_destroy(*sasl_challenge_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -8378,7 +8379,7 @@
 				{
 					{
 						sasl_challenge_destroy(*sasl_challenge_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -8388,7 +8389,7 @@
 					if (amqpvalue_get_binary(item_value, &challenge) != 0)
 					{
 						sasl_challenge_destroy(*sasl_challenge_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -8411,7 +8412,7 @@
 
 	if (sasl_challenge == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8419,13 +8420,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_challenge_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_binary(item_value, challenge_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -8443,7 +8444,7 @@
 
 	if (sasl_challenge == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8451,13 +8452,13 @@
 		AMQP_VALUE challenge_amqp_value = amqpvalue_create_binary(challenge_value);
 		if (challenge_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_challenge_instance->composite_value, 0, challenge_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -8509,7 +8510,7 @@
 			response_amqp_value = amqpvalue_create_binary(response_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(sasl_response_instance->composite_value, 0, response_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(response_amqp_value);
@@ -8588,7 +8589,7 @@
 	*sasl_response_handle = sasl_response_instance;
 	if (*sasl_response_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8596,7 +8597,7 @@
 		if (list_value == NULL)
 		{
 			sasl_response_destroy(*sasl_response_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -8609,7 +8610,7 @@
 				{
 					{
 						sasl_response_destroy(*sasl_response_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -8619,7 +8620,7 @@
 					if (amqpvalue_get_binary(item_value, &response) != 0)
 					{
 						sasl_response_destroy(*sasl_response_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -8642,7 +8643,7 @@
 
 	if (sasl_response == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8650,13 +8651,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_response_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_binary(item_value, response_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -8674,7 +8675,7 @@
 
 	if (sasl_response == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8682,13 +8683,13 @@
 		AMQP_VALUE response_amqp_value = amqpvalue_create_binary(response_value);
 		if (response_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_response_instance->composite_value, 0, response_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -8740,7 +8741,7 @@
 			code_amqp_value = amqpvalue_create_sasl_code(code_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(sasl_outcome_instance->composite_value, 0, code_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(code_amqp_value);
@@ -8819,7 +8820,7 @@
 	*sasl_outcome_handle = sasl_outcome_instance;
 	if (*sasl_outcome_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8827,7 +8828,7 @@
 		if (list_value == NULL)
 		{
 			sasl_outcome_destroy(*sasl_outcome_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -8840,7 +8841,7 @@
 				{
 					{
 						sasl_outcome_destroy(*sasl_outcome_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -8850,7 +8851,7 @@
 					if (amqpvalue_get_sasl_code(item_value, &code) != 0)
 					{
 						sasl_outcome_destroy(*sasl_outcome_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -8870,7 +8871,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							sasl_outcome_destroy(*sasl_outcome_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -8894,7 +8895,7 @@
 
 	if (sasl_outcome == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8902,13 +8903,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_outcome_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_sasl_code(item_value, code_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -8926,7 +8927,7 @@
 
 	if (sasl_outcome == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8934,13 +8935,13 @@
 		AMQP_VALUE code_amqp_value = amqpvalue_create_sasl_code(code_value);
 		if (code_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_outcome_instance->composite_value, 0, code_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -8960,7 +8961,7 @@
 
 	if (sasl_outcome == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -8968,13 +8969,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(sasl_outcome_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_binary(item_value, additional_data_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -8992,7 +8993,7 @@
 
 	if (sasl_outcome == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9000,13 +9001,13 @@
 		AMQP_VALUE additional_data_amqp_value = amqpvalue_create_binary(additional_data_value);
 		if (additional_data_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(sasl_outcome_instance->composite_value, 1, additional_data_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9152,7 +9153,7 @@
 	*source_handle = source_instance;
 	if (*source_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9160,7 +9161,7 @@
 		if (list_value == NULL)
 		{
 			source_destroy(*source_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -9191,7 +9192,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9212,7 +9213,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9233,7 +9234,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9254,7 +9255,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9275,7 +9276,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9296,7 +9297,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9317,7 +9318,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9350,7 +9351,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9373,7 +9374,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							source_destroy(*source_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -9397,7 +9398,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9405,7 +9406,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(source_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -9423,7 +9424,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9431,13 +9432,13 @@
 		AMQP_VALUE address_amqp_value = amqpvalue_clone(address_value);
 		if (address_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 0, address_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9457,7 +9458,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9474,7 +9475,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -9498,7 +9499,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9506,13 +9507,13 @@
 		AMQP_VALUE durable_amqp_value = amqpvalue_create_terminus_durability(durable_value);
 		if (durable_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 1, durable_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9532,7 +9533,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9549,7 +9550,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -9573,7 +9574,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9581,13 +9582,13 @@
 		AMQP_VALUE expiry_policy_amqp_value = amqpvalue_create_terminus_expiry_policy(expiry_policy_value);
 		if (expiry_policy_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 2, expiry_policy_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9607,7 +9608,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9624,7 +9625,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -9648,7 +9649,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9656,13 +9657,13 @@
 		AMQP_VALUE timeout_amqp_value = amqpvalue_create_seconds(timeout_value);
 		if (timeout_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 3, timeout_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9682,7 +9683,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9699,7 +9700,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -9723,7 +9724,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9731,13 +9732,13 @@
 		AMQP_VALUE dynamic_amqp_value = amqpvalue_create_boolean(dynamic_value);
 		if (dynamic_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 4, dynamic_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9757,7 +9758,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9765,13 +9766,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(source_instance->composite_value, 5);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_node_properties(item_value, dynamic_node_properties_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -9789,7 +9790,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9797,13 +9798,13 @@
 		AMQP_VALUE dynamic_node_properties_amqp_value = amqpvalue_create_node_properties(dynamic_node_properties_value);
 		if (dynamic_node_properties_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 5, dynamic_node_properties_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9823,7 +9824,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9831,13 +9832,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(source_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_symbol(item_value, distribution_mode_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -9855,7 +9856,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9863,13 +9864,13 @@
 		AMQP_VALUE distribution_mode_amqp_value = amqpvalue_create_symbol(distribution_mode_value);
 		if (distribution_mode_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 6, distribution_mode_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9889,7 +9890,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9897,13 +9898,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(source_instance->composite_value, 7);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_filter_set(item_value, filter_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -9921,7 +9922,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9929,13 +9930,13 @@
 		AMQP_VALUE filter_amqp_value = amqpvalue_create_filter_set(filter_value);
 		if (filter_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 7, filter_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -9955,7 +9956,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9963,7 +9964,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(source_instance->composite_value, 8);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -9981,7 +9982,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -9989,13 +9990,13 @@
 		AMQP_VALUE default_outcome_amqp_value = amqpvalue_clone(default_outcome_value);
 		if (default_outcome_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 8, default_outcome_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10015,7 +10016,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10023,13 +10024,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(source_instance->composite_value, 9);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, outcomes_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -10047,7 +10048,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10055,13 +10056,13 @@
 		AMQP_VALUE outcomes_amqp_value = amqpvalue_clone(outcomes_value);
 		if (outcomes_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 9, outcomes_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10081,7 +10082,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10089,13 +10090,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(source_instance->composite_value, 10);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -10113,7 +10114,7 @@
 
 	if (source == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10121,13 +10122,13 @@
 		AMQP_VALUE capabilities_amqp_value = amqpvalue_clone(capabilities_value);
 		if (capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(source_instance->composite_value, 10, capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10245,7 +10246,7 @@
 	*target_handle = target_instance;
 	if (*target_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10253,7 +10254,7 @@
 		if (list_value == NULL)
 		{
 			target_destroy(*target_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -10284,7 +10285,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							target_destroy(*target_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -10305,7 +10306,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							target_destroy(*target_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -10326,7 +10327,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							target_destroy(*target_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -10347,7 +10348,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							target_destroy(*target_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -10368,7 +10369,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							target_destroy(*target_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -10391,7 +10392,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							target_destroy(*target_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -10415,7 +10416,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10423,7 +10424,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(target_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -10441,7 +10442,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10449,13 +10450,13 @@
 		AMQP_VALUE address_amqp_value = amqpvalue_clone(address_value);
 		if (address_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(target_instance->composite_value, 0, address_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10475,7 +10476,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10492,7 +10493,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -10516,7 +10517,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10524,13 +10525,13 @@
 		AMQP_VALUE durable_amqp_value = amqpvalue_create_terminus_durability(durable_value);
 		if (durable_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(target_instance->composite_value, 1, durable_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10550,7 +10551,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10567,7 +10568,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -10591,7 +10592,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10599,13 +10600,13 @@
 		AMQP_VALUE expiry_policy_amqp_value = amqpvalue_create_terminus_expiry_policy(expiry_policy_value);
 		if (expiry_policy_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(target_instance->composite_value, 2, expiry_policy_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10625,7 +10626,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10642,7 +10643,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -10666,7 +10667,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10674,13 +10675,13 @@
 		AMQP_VALUE timeout_amqp_value = amqpvalue_create_seconds(timeout_value);
 		if (timeout_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(target_instance->composite_value, 3, timeout_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10700,7 +10701,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10717,7 +10718,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -10741,7 +10742,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10749,13 +10750,13 @@
 		AMQP_VALUE dynamic_amqp_value = amqpvalue_create_boolean(dynamic_value);
 		if (dynamic_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(target_instance->composite_value, 4, dynamic_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10775,7 +10776,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10783,13 +10784,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(target_instance->composite_value, 5);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_node_properties(item_value, dynamic_node_properties_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -10807,7 +10808,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10815,13 +10816,13 @@
 		AMQP_VALUE dynamic_node_properties_amqp_value = amqpvalue_create_node_properties(dynamic_node_properties_value);
 		if (dynamic_node_properties_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(target_instance->composite_value, 5, dynamic_node_properties_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -10841,7 +10842,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10849,13 +10850,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(target_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_array(item_value, capabilities_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -10873,7 +10874,7 @@
 
 	if (target == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -10881,13 +10882,13 @@
 		AMQP_VALUE capabilities_amqp_value = amqpvalue_clone(capabilities_value);
 		if (capabilities_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(target_instance->composite_value, 6, capabilities_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -11047,7 +11048,7 @@
 	*header_handle = header_instance;
 	if (*header_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11055,7 +11056,7 @@
 		if (list_value == NULL)
 		{
 			header_destroy(*header_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -11076,7 +11077,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							header_destroy(*header_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -11097,7 +11098,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							header_destroy(*header_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -11118,7 +11119,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							header_destroy(*header_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -11139,7 +11140,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							header_destroy(*header_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -11160,7 +11161,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							header_destroy(*header_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -11184,7 +11185,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11201,7 +11202,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -11225,7 +11226,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11233,13 +11234,13 @@
 		AMQP_VALUE durable_amqp_value = amqpvalue_create_boolean(durable_value);
 		if (durable_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(header_instance->composite_value, 0, durable_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -11259,7 +11260,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11276,7 +11277,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -11300,7 +11301,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11308,13 +11309,13 @@
 		AMQP_VALUE priority_amqp_value = amqpvalue_create_ubyte(priority_value);
 		if (priority_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(header_instance->composite_value, 1, priority_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -11334,7 +11335,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11342,13 +11343,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(header_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_milliseconds(item_value, ttl_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -11366,7 +11367,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11374,13 +11375,13 @@
 		AMQP_VALUE ttl_amqp_value = amqpvalue_create_milliseconds(ttl_value);
 		if (ttl_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(header_instance->composite_value, 2, ttl_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -11400,7 +11401,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11417,7 +11418,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -11441,7 +11442,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11449,13 +11450,13 @@
 		AMQP_VALUE first_acquirer_amqp_value = amqpvalue_create_boolean(first_acquirer_value);
 		if (first_acquirer_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(header_instance->composite_value, 3, first_acquirer_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -11475,7 +11476,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11492,7 +11493,7 @@
 			{
                 if (amqpvalue_get_type(item_value) == AMQP_TYPE_NULL)
                 {
-    			    result = __LINE__;
+    			    result = __FAILURE__;
                 }
                 else
                 {
@@ -11516,7 +11517,7 @@
 
 	if (header == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11524,13 +11525,13 @@
 		AMQP_VALUE delivery_count_amqp_value = amqpvalue_create_uint(delivery_count_value);
 		if (delivery_count_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(header_instance->composite_value, 4, delivery_count_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -11984,7 +11985,7 @@
 	*properties_handle = properties_instance;
 	if (*properties_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -11992,7 +11993,7 @@
 		if (list_value == NULL)
 		{
 			properties_destroy(*properties_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -12023,7 +12024,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12054,7 +12055,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12095,7 +12096,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12116,7 +12117,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12137,7 +12138,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12158,7 +12159,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12179,7 +12180,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12200,7 +12201,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12221,7 +12222,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							properties_destroy(*properties_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -12245,7 +12246,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12253,7 +12254,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -12271,7 +12272,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12279,13 +12280,13 @@
 		AMQP_VALUE message_id_amqp_value = amqpvalue_clone(message_id_value);
 		if (message_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 0, message_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12305,7 +12306,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12313,13 +12314,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_binary(item_value, user_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12337,7 +12338,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12345,13 +12346,13 @@
 		AMQP_VALUE user_id_amqp_value = amqpvalue_create_binary(user_id_value);
 		if (user_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 1, user_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12371,7 +12372,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12379,7 +12380,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -12397,7 +12398,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12405,13 +12406,13 @@
 		AMQP_VALUE to_amqp_value = amqpvalue_clone(to_value);
 		if (to_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 2, to_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12431,7 +12432,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12439,13 +12440,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 3);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, subject_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12463,7 +12464,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12471,13 +12472,13 @@
 		AMQP_VALUE subject_amqp_value = amqpvalue_create_string(subject_value);
 		if (subject_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 3, subject_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12497,7 +12498,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12505,7 +12506,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 4);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -12523,7 +12524,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12531,13 +12532,13 @@
 		AMQP_VALUE reply_to_amqp_value = amqpvalue_clone(reply_to_value);
 		if (reply_to_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 4, reply_to_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12557,7 +12558,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12565,7 +12566,7 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 5);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -12583,7 +12584,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12591,13 +12592,13 @@
 		AMQP_VALUE correlation_id_amqp_value = amqpvalue_clone(correlation_id_value);
 		if (correlation_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 5, correlation_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12617,7 +12618,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12625,13 +12626,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 6);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_symbol(item_value, content_type_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12649,7 +12650,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12657,13 +12658,13 @@
 		AMQP_VALUE content_type_amqp_value = amqpvalue_create_symbol(content_type_value);
 		if (content_type_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 6, content_type_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12683,7 +12684,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12691,13 +12692,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 7);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_symbol(item_value, content_encoding_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12715,7 +12716,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12723,13 +12724,13 @@
 		AMQP_VALUE content_encoding_amqp_value = amqpvalue_create_symbol(content_encoding_value);
 		if (content_encoding_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 7, content_encoding_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12749,7 +12750,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12757,13 +12758,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 8);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_timestamp(item_value, absolute_expiry_time_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12781,7 +12782,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12789,13 +12790,13 @@
 		AMQP_VALUE absolute_expiry_time_amqp_value = amqpvalue_create_timestamp(absolute_expiry_time_value);
 		if (absolute_expiry_time_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 8, absolute_expiry_time_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12815,7 +12816,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12823,13 +12824,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 9);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_timestamp(item_value, creation_time_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12847,7 +12848,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12855,13 +12856,13 @@
 		AMQP_VALUE creation_time_amqp_value = amqpvalue_create_timestamp(creation_time_value);
 		if (creation_time_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 9, creation_time_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12881,7 +12882,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12889,13 +12890,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 10);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, group_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12913,7 +12914,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12921,13 +12922,13 @@
 		AMQP_VALUE group_id_amqp_value = amqpvalue_create_string(group_id_value);
 		if (group_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 10, group_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -12947,7 +12948,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12955,13 +12956,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 11);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_sequence_no(item_value, group_sequence_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -12979,7 +12980,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -12987,13 +12988,13 @@
 		AMQP_VALUE group_sequence_amqp_value = amqpvalue_create_sequence_no(group_sequence_value);
 		if (group_sequence_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 11, group_sequence_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -13013,7 +13014,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13021,13 +13022,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(properties_instance->composite_value, 12);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_string(item_value, reply_to_group_id_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -13045,7 +13046,7 @@
 
 	if (properties == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13053,13 +13054,13 @@
 		AMQP_VALUE reply_to_group_id_amqp_value = amqpvalue_create_string(reply_to_group_id_value);
 		if (reply_to_group_id_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(properties_instance->composite_value, 12, reply_to_group_id_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -13112,12 +13113,12 @@
 			section_number_amqp_value = amqpvalue_create_uint(section_number_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(received_instance->composite_value, 0, section_number_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			section_offset_amqp_value = amqpvalue_create_ulong(section_offset_value);
 			if ((result == 0) && (amqpvalue_set_composite_item(received_instance->composite_value, 1, section_offset_amqp_value) != 0))
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 
 			amqpvalue_destroy(section_number_amqp_value);
@@ -13197,7 +13198,7 @@
 	*received_handle = received_instance;
 	if (*received_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13205,7 +13206,7 @@
 		if (list_value == NULL)
 		{
 			received_destroy(*received_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -13218,7 +13219,7 @@
 				{
 					{
 						received_destroy(*received_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -13228,7 +13229,7 @@
 					if (amqpvalue_get_uint(item_value, &section_number) != 0)
 					{
 						received_destroy(*received_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -13240,7 +13241,7 @@
 				{
 					{
 						received_destroy(*received_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 				}
@@ -13250,7 +13251,7 @@
 					if (amqpvalue_get_ulong(item_value, &section_offset) != 0)
 					{
 						received_destroy(*received_handle);
-						result = __LINE__;
+						result = __FAILURE__;
 						break;
 					}
 
@@ -13273,7 +13274,7 @@
 
 	if (received == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13281,13 +13282,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(received_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_uint(item_value, section_number_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -13305,7 +13306,7 @@
 
 	if (received == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13313,13 +13314,13 @@
 		AMQP_VALUE section_number_amqp_value = amqpvalue_create_uint(section_number_value);
 		if (section_number_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(received_instance->composite_value, 0, section_number_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -13339,7 +13340,7 @@
 
 	if (received == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13347,13 +13348,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(received_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_ulong(item_value, section_offset_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -13371,7 +13372,7 @@
 
 	if (received == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13379,13 +13380,13 @@
 		AMQP_VALUE section_offset_amqp_value = amqpvalue_create_ulong(section_offset_value);
 		if (section_offset_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(received_instance->composite_value, 1, section_offset_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -13503,7 +13504,7 @@
 	*accepted_handle = accepted_instance;
 	if (*accepted_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13511,7 +13512,7 @@
 		if (list_value == NULL)
 		{
 			accepted_destroy(*accepted_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -13632,7 +13633,7 @@
 	*rejected_handle = rejected_instance;
 	if (*rejected_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13640,7 +13641,7 @@
 		if (list_value == NULL)
 		{
 			rejected_destroy(*rejected_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -13661,7 +13662,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							rejected_destroy(*rejected_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -13685,7 +13686,7 @@
 
 	if (rejected == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13693,13 +13694,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(rejected_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_error(item_value, error_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -13717,7 +13718,7 @@
 
 	if (rejected == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13725,13 +13726,13 @@
 		AMQP_VALUE error_amqp_value = amqpvalue_create_error(error_value);
 		if (error_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(rejected_instance->composite_value, 0, error_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -13849,7 +13850,7 @@
 	*released_handle = released_instance;
 	if (*released_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13857,7 +13858,7 @@
 		if (list_value == NULL)
 		{
 			released_destroy(*released_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -13978,7 +13979,7 @@
 	*modified_handle = modified_instance;
 	if (*modified_handle == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -13986,7 +13987,7 @@
 		if (list_value == NULL)
 		{
 			modified_destroy(*modified_handle);
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
@@ -14007,7 +14008,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							modified_destroy(*modified_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -14028,7 +14029,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							modified_destroy(*modified_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -14049,7 +14050,7 @@
 						if (amqpvalue_get_type(item_value) != AMQP_TYPE_NULL)
 						{
 							modified_destroy(*modified_handle);
-							result = __LINE__;
+							result = __FAILURE__;
 							break;
 						}
 					}
@@ -14073,7 +14074,7 @@
 
 	if (modified == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -14081,13 +14082,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(modified_instance->composite_value, 0);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_boolean(item_value, delivery_failed_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -14105,7 +14106,7 @@
 
 	if (modified == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -14113,13 +14114,13 @@
 		AMQP_VALUE delivery_failed_amqp_value = amqpvalue_create_boolean(delivery_failed_value);
 		if (delivery_failed_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(modified_instance->composite_value, 0, delivery_failed_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -14139,7 +14140,7 @@
 
 	if (modified == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -14147,13 +14148,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(modified_instance->composite_value, 1);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_boolean(item_value, undeliverable_here_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -14171,7 +14172,7 @@
 
 	if (modified == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -14179,13 +14180,13 @@
 		AMQP_VALUE undeliverable_here_amqp_value = amqpvalue_create_boolean(undeliverable_here_value);
 		if (undeliverable_here_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(modified_instance->composite_value, 1, undeliverable_here_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{
@@ -14205,7 +14206,7 @@
 
 	if (modified == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -14213,13 +14214,13 @@
 		AMQP_VALUE item_value = amqpvalue_get_composite_item_in_place(modified_instance->composite_value, 2);
 		if (item_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_get_fields(item_value, message_annotations_value) != 0)
 			{
-			    result = __LINE__;
+			    result = __FAILURE__;
 			}
 			else
 			{
@@ -14237,7 +14238,7 @@
 
 	if (modified == NULL)
 	{
-		result = __LINE__;
+		result = __FAILURE__;
 	}
 	else
 	{
@@ -14245,13 +14246,13 @@
 		AMQP_VALUE message_annotations_amqp_value = amqpvalue_create_fields(message_annotations_value);
 		if (message_annotations_amqp_value == NULL)
 		{
-			result = __LINE__;
+			result = __FAILURE__;
 		}
 		else
 		{
 			if (amqpvalue_set_composite_item(modified_instance->composite_value, 2, message_annotations_amqp_value) != 0)
 			{
-				result = __LINE__;
+				result = __FAILURE__;
 			}
 			else
 			{