A small memory footprint AMQP implimentation

Dependents:   iothub_client_sample_amqp remote_monitoring simplesample_amqp

Revision:
28:add19eb7defa
Parent:
26:64f1113cb959
Child:
29:4a11413cf217
--- a/amqpvalue.c	Fri Jun 02 15:53:07 2017 -0700
+++ b/amqpvalue.c	Fri Jun 30 10:41:22 2017 -0700
@@ -19,187 +19,187 @@
 
 typedef struct AMQP_LIST_VALUE_TAG
 {
-	AMQP_VALUE* items;
-	uint32_t count;
+    AMQP_VALUE* items;
+    uint32_t count;
 } AMQP_LIST_VALUE;
 
 typedef struct AMQP_ARRAY_VALUE_TAG
 {
-	AMQP_VALUE* items;
-	uint32_t count;
+    AMQP_VALUE* items;
+    uint32_t count;
 } AMQP_ARRAY_VALUE;
 
 typedef struct AMQP_MAP_KEY_VALUE_PAIR_TAG
 {
-	AMQP_VALUE key;
-	AMQP_VALUE value;
+    AMQP_VALUE key;
+    AMQP_VALUE value;
 } AMQP_MAP_KEY_VALUE_PAIR;
 
 typedef struct AMQP_MAP_VALUE_TAG
 {
-	AMQP_MAP_KEY_VALUE_PAIR* pairs;
-	uint32_t pair_count;
+    AMQP_MAP_KEY_VALUE_PAIR* pairs;
+    uint32_t pair_count;
 } AMQP_MAP_VALUE;
 
 typedef struct AMQP_STRING_VALUE_TAG
 {
-	char* chars;
+    char* chars;
 } AMQP_STRING_VALUE;
 
 typedef struct AMQP_SYMBOL_VALUE_TAG
 {
-	char* chars;
+    char* chars;
 } AMQP_SYMBOL_VALUE;
 
 typedef struct AMQP_BINARY_VALUE_TAG
 {
-	unsigned char* bytes;
-	uint32_t length;
+    unsigned char* bytes;
+    uint32_t length;
 } AMQP_BINARY_VALUE;
 
 typedef struct DESCRIBED_VALUE_TAG
 {
-	AMQP_VALUE descriptor;
-	AMQP_VALUE value;
+    AMQP_VALUE descriptor;
+    AMQP_VALUE value;
 } DESCRIBED_VALUE;
 
 typedef union AMQP_VALUE_UNION_TAG
 {
-	DESCRIBED_VALUE described_value;
-	unsigned char ubyte_value;
-	uint16_t ushort_value;
-	uint32_t uint_value;
-	uint64_t ulong_value;
-	char byte_value;
-	int16_t short_value;
-	int32_t int_value;
-	int64_t long_value;
-	bool bool_value;
-	float float_value;
-	double double_value;
-	uint32_t char_value;
-	int64_t timestamp_value;
-	uuid uuid_value;
-	AMQP_STRING_VALUE string_value;
-	amqp_binary binary_value;
-	AMQP_LIST_VALUE list_value;
-	AMQP_MAP_VALUE map_value;
-	AMQP_ARRAY_VALUE array_value;
-	AMQP_SYMBOL_VALUE symbol_value;
+    DESCRIBED_VALUE described_value;
+    unsigned char ubyte_value;
+    uint16_t ushort_value;
+    uint32_t uint_value;
+    uint64_t ulong_value;
+    char byte_value;
+    int16_t short_value;
+    int32_t int_value;
+    int64_t long_value;
+    bool bool_value;
+    float float_value;
+    double double_value;
+    uint32_t char_value;
+    int64_t timestamp_value;
+    uuid uuid_value;
+    AMQP_STRING_VALUE string_value;
+    amqp_binary binary_value;
+    AMQP_LIST_VALUE list_value;
+    AMQP_MAP_VALUE map_value;
+    AMQP_ARRAY_VALUE array_value;
+    AMQP_SYMBOL_VALUE symbol_value;
 } AMQP_VALUE_UNION;
 
 typedef enum DECODE_LIST_STEP_TAG
 {
-	DECODE_LIST_STEP_SIZE,
-	DECODE_LIST_STEP_COUNT,
-	DECODE_LIST_STEP_ITEMS
+    DECODE_LIST_STEP_SIZE,
+    DECODE_LIST_STEP_COUNT,
+    DECODE_LIST_STEP_ITEMS
 } DECODE_LIST_STEP;
 
 typedef enum DECODE_ARRAY_STEP_TAG
 {
-	DECODE_ARRAY_STEP_SIZE,
-	DECODE_ARRAY_STEP_COUNT,
-	DECODE_ARRAY_STEP_ITEMS
+    DECODE_ARRAY_STEP_SIZE,
+    DECODE_ARRAY_STEP_COUNT,
+    DECODE_ARRAY_STEP_ITEMS
 } DECODE_ARRAY_STEP;
 
 typedef enum DECODE_DESCRIBED_VALUE_STEP_TAG
 {
-	DECODE_DESCRIBED_VALUE_STEP_DESCRIPTOR,
-	DECODE_DESCRIBED_VALUE_STEP_VALUE
+    DECODE_DESCRIBED_VALUE_STEP_DESCRIPTOR,
+    DECODE_DESCRIBED_VALUE_STEP_VALUE
 } DECODE_DESCRIBED_VALUE_STEP;
 
 typedef enum DECODE_MAP_STEP_TAG
 {
-	DECODE_MAP_STEP_SIZE,
-	DECODE_MAP_STEP_COUNT,
-	DECODE_MAP_STEP_PAIRS
+    DECODE_MAP_STEP_SIZE,
+    DECODE_MAP_STEP_COUNT,
+    DECODE_MAP_STEP_PAIRS
 } DECODE_MAP_STEP;
 
 typedef struct DECODE_LIST_VALUE_STATE_TAG
 {
-	DECODE_LIST_STEP list_value_state;
-	uint32_t item;
+    DECODE_LIST_STEP list_value_state;
+    uint32_t item;
 } DECODE_LIST_VALUE_STATE;
 
 typedef struct DECODE_ARRAY_VALUE_STATE_TAG
 {
-	DECODE_ARRAY_STEP array_value_state;
-	uint32_t item;
-	unsigned char constructor_byte;
+    DECODE_ARRAY_STEP array_value_state;
+    uint32_t item;
+    unsigned char constructor_byte;
 } DECODE_ARRAY_VALUE_STATE;
 
 typedef struct DECODE_DESCRIBED_VALUE_STATE_TAG
 {
-	DECODE_DESCRIBED_VALUE_STEP described_value_state;
+    DECODE_DESCRIBED_VALUE_STEP described_value_state;
 } DECODE_DESCRIBED_VALUE_STATE;
 
 typedef struct DECODE_STRING_VALUE_STATE_TAG
 {
-	uint32_t length;
+    uint32_t length;
 } DECODE_STRING_VALUE_STATE;
 
 typedef struct DECODE_SYMBOL_VALUE_STATE_TAG
 {
-	uint32_t length;
+    uint32_t length;
 } DECODE_SYMBOL_VALUE_STATE;
 
 typedef struct DECODE_MAP_VALUE_STATE_TAG
 {
-	DECODE_MAP_STEP map_value_state;
-	uint32_t item;
+    DECODE_MAP_STEP map_value_state;
+    uint32_t item;
 } DECODE_MAP_VALUE_STATE;
 
 typedef union DECODE_VALUE_STATE_UNION_TAG
 {
-	DECODE_LIST_VALUE_STATE list_value_state;
-	DECODE_ARRAY_VALUE_STATE array_value_state;
-	DECODE_DESCRIBED_VALUE_STATE described_value_state;
-	DECODE_STRING_VALUE_STATE string_value_state;
-	DECODE_SYMBOL_VALUE_STATE symbol_value_state;
-	DECODE_MAP_VALUE_STATE map_value_state;
+    DECODE_LIST_VALUE_STATE list_value_state;
+    DECODE_ARRAY_VALUE_STATE array_value_state;
+    DECODE_DESCRIBED_VALUE_STATE described_value_state;
+    DECODE_STRING_VALUE_STATE string_value_state;
+    DECODE_SYMBOL_VALUE_STATE symbol_value_state;
+    DECODE_MAP_VALUE_STATE map_value_state;
 } DECODE_VALUE_STATE_UNION;
 
 typedef struct AMQP_VALUE_DATA_TAG
 {
-	AMQP_TYPE type;
-	AMQP_VALUE_UNION value;
+    AMQP_TYPE type;
+    AMQP_VALUE_UNION value;
 } AMQP_VALUE_DATA;
 
 DEFINE_REFCOUNT_TYPE(AMQP_VALUE_DATA);
 
 typedef enum DECODER_STATE_TAG
 {
-	DECODER_STATE_CONSTRUCTOR,
-	DECODER_STATE_TYPE_DATA,
-	DECODER_STATE_DONE,
-	DECODER_STATE_ERROR
+    DECODER_STATE_CONSTRUCTOR,
+    DECODER_STATE_TYPE_DATA,
+    DECODER_STATE_DONE,
+    DECODER_STATE_ERROR
 } DECODER_STATE;
 
 typedef struct INTERNAL_DECODER_DATA_TAG* INTERNAL_DECODER_HANDLE;
 
 typedef struct INTERNAL_DECODER_DATA_TAG
 {
-	ON_VALUE_DECODED on_value_decoded;
-	void* on_value_decoded_context;
-	size_t bytes_decoded;
-	DECODER_STATE decoder_state;
-	uint8_t constructor_byte;
-	AMQP_VALUE_DATA* decode_to_value;
+    ON_VALUE_DECODED on_value_decoded;
+    void* on_value_decoded_context;
+    size_t bytes_decoded;
+    DECODER_STATE decoder_state;
+    uint8_t constructor_byte;
+    AMQP_VALUE_DATA* decode_to_value;
     INTERNAL_DECODER_HANDLE inner_decoder;
-	DECODE_VALUE_STATE_UNION decode_value_state;
-	bool is_internal;
+    DECODE_VALUE_STATE_UNION decode_value_state;
+    bool is_internal;
 } INTERNAL_DECODER_DATA;
 
 typedef struct AMQPVALUE_DECODER_HANDLE_DATA_TAG
 {
-	INTERNAL_DECODER_DATA* internal_decoder;
-	AMQP_VALUE_DATA* decode_to_value;
+    INTERNAL_DECODER_DATA* internal_decoder;
+    AMQP_VALUE_DATA* decode_to_value;
 } AMQPVALUE_DECODER_HANDLE_DATA;
 
 /* Codes_SRS_AMQPVALUE_01_003: [1.6.1 null Indicates an empty value.] */
 AMQP_VALUE amqpvalue_create_null(void)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_002: [If allocating the AMQP_VALUE fails then amqpvalue_create_null shall return NULL.] */
@@ -207,118 +207,118 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_001: [amqpvalue_create_null shall return a handle to an AMQP_VALUE that stores a null value.] */
-		result->type = AMQP_TYPE_NULL;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_001: [amqpvalue_create_null shall return a handle to an AMQP_VALUE that stores a null value.] */
+        result->type = AMQP_TYPE_NULL;
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_004: [1.6.2 boolean Represents a true or false value.] */
 AMQP_VALUE amqpvalue_create_boolean(bool value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_007: [If allocating the AMQP_VALUE fails then amqpvalue_create_boolean shall return NULL.] */
         LogError("Could not allocate memory for AMQP value");
     }
     else
-	{
-		/* Codes_SRS_AMQPVALUE_01_006: [amqpvalue_create_boolean shall return a handle to an AMQP_VALUE that stores a boolean value.] */
-		result->type = AMQP_TYPE_BOOL;
-		result->value.bool_value = value;
-	}
-
-	return result;
+    {
+        /* Codes_SRS_AMQPVALUE_01_006: [amqpvalue_create_boolean shall return a handle to an AMQP_VALUE that stores a boolean value.] */
+        result->type = AMQP_TYPE_BOOL;
+        result->value.bool_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_boolean(AMQP_VALUE value, bool* bool_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_009: [If any of the arguments is NULL then amqpvalue_get_boolean shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(bool_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_009: [If any of the arguments is NULL then amqpvalue_get_boolean shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (bool_value == NULL))
+    {
         LogError("Bad arguments: value = %p, bool_value = %p",
             value, bool_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_011: [If the type of the value is not Boolean, then amqpvalue_get_boolean shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_BOOL)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_011: [If the type of the value is not Boolean, then amqpvalue_get_boolean shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_BOOL)
+        {
             LogError("Value is not of type bool");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_008: [amqpvalue_get_boolean shall fill in the bool_value argument the Boolean value stored by the AMQP value indicated by the value argument.] */
-			*bool_value = value_data->value.bool_value;
-
-			/* Codes_SRS_AMQPVALUE_01_010: [On success amqpvalue_get_boolean shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_008: [amqpvalue_get_boolean shall fill in the bool_value argument the Boolean value stored by the AMQP value indicated by the value argument.] */
+            *bool_value = value_data->value.bool_value;
+
+            /* Codes_SRS_AMQPVALUE_01_010: [On success amqpvalue_get_boolean shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_005: [1.6.3 ubyte Integer in the range 0 to 28 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_ubyte(unsigned char value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-	if (result != NULL)
-	{
-		/* Codes_SRS_AMQPVALUE_01_032: [amqpvalue_create_ubyte shall return a handle to an AMQP_VALUE that stores a unsigned char value.] */
-		result->type = AMQP_TYPE_UBYTE;
-		result->value.ubyte_value = value;
-	}
-
-	return result;
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    if (result != NULL)
+    {
+        /* Codes_SRS_AMQPVALUE_01_032: [amqpvalue_create_ubyte shall return a handle to an AMQP_VALUE that stores a unsigned char value.] */
+        result->type = AMQP_TYPE_UBYTE;
+        result->value.ubyte_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_ubyte(AMQP_VALUE value, unsigned char* ubyte_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_036: [If any of the arguments is NULL then amqpvalue_get_ubyte shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(ubyte_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_036: [If any of the arguments is NULL then amqpvalue_get_ubyte shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (ubyte_value == NULL))
+    {
         LogError("Bad arguments: value = %p, ubyte_value = %p",
             value, ubyte_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_037: [If the type of the value is not ubyte (was not created with amqpvalue_create_ubyte), then amqpvalue_get_ubyte shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_UBYTE)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_037: [If the type of the value is not ubyte (was not created with amqpvalue_create_ubyte), then amqpvalue_get_ubyte shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_UBYTE)
+        {
             LogError("Value is not of type UBYTE");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_034: [amqpvalue_get_ubyte shall fill in the ubyte_value argument the unsigned char value stored by the AMQP value indicated by the value argument.] */
-			*ubyte_value = value_data->value.ubyte_value;
-
-			/* Codes_SRS_AMQPVALUE_01_035: [On success amqpvalue_get_ubyte shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_034: [amqpvalue_get_ubyte shall fill in the ubyte_value argument the unsigned char value stored by the AMQP value indicated by the value argument.] */
+            *ubyte_value = value_data->value.ubyte_value;
+
+            /* Codes_SRS_AMQPVALUE_01_035: [On success amqpvalue_get_ubyte shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_012: [1.6.4 ushort Integer in the range 0 to 216 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_ushort(uint16_t value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_039: [If allocating the AMQP_VALUE fails then amqpvalue_create_ushort shall return NULL.] */
@@ -326,105 +326,105 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_038: [amqpvalue_create_ushort shall return a handle to an AMQP_VALUE that stores an uint16_t value.] */
-		result->type = AMQP_TYPE_USHORT;
-		result->value.ushort_value = value;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_038: [amqpvalue_create_ushort shall return a handle to an AMQP_VALUE that stores an uint16_t value.] */
+        result->type = AMQP_TYPE_USHORT;
+        result->value.ushort_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_ushort(AMQP_VALUE value, uint16_t* ushort_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_042: [If any of the arguments is NULL then amqpvalue_get_ushort shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(ushort_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_042: [If any of the arguments is NULL then amqpvalue_get_ushort shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (ushort_value == NULL))
+    {
         LogError("Bad arguments: value = %p, ushort_value = %p",
             value, ushort_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_043: [If the type of the value is not ushort (was not created with amqpvalue_create_ushort), then amqpvalue_get_ushort shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_USHORT)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_043: [If the type of the value is not ushort (was not created with amqpvalue_create_ushort), then amqpvalue_get_ushort shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_USHORT)
+        {
             LogError("Value is not of type USHORT");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_040: [amqpvalue_get_ushort shall fill in the ushort_value argument the uint16_t value stored by the AMQP value indicated by the value argument.] */
-			*ushort_value = value_data->value.ushort_value;
-
-			/* Codes_SRS_AMQPVALUE_01_041: [On success amqpvalue_get_ushort shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_040: [amqpvalue_get_ushort shall fill in the ushort_value argument the uint16_t value stored by the AMQP value indicated by the value argument.] */
+            *ushort_value = value_data->value.ushort_value;
+
+            /* Codes_SRS_AMQPVALUE_01_041: [On success amqpvalue_get_ushort shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_013: [1.6.5 uint Integer in the range 0 to 232 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_uint(uint32_t value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_045: [If allocating the AMQP_VALUE fails then amqpvalue_create_uint shall return NULL.] */
         LogError("Could not allocate memory for AMQP value");
     }
     else
-	{
-		/* Codes_SRS_AMQPVALUE_01_044: [amqpvalue_create_uint shall return a handle to an AMQP_VALUE that stores an uint32_t value.] */
-		result->type = AMQP_TYPE_UINT;
-		result->value.uint_value = value;
-	}
-
-	return result;
+    {
+        /* Codes_SRS_AMQPVALUE_01_044: [amqpvalue_create_uint shall return a handle to an AMQP_VALUE that stores an uint32_t value.] */
+        result->type = AMQP_TYPE_UINT;
+        result->value.uint_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_uint(AMQP_VALUE value, uint32_t* uint_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_079: [If any of the arguments is NULL then amqpvalue_get_uint shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(uint_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_079: [If any of the arguments is NULL then amqpvalue_get_uint shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (uint_value == NULL))
+    {
         LogError("Bad arguments: value = %p, uint_value = %p",
             value, uint_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_048: [If the type of the value is not uint (was not created with amqpvalue_create_uint), then amqpvalue_get_uint shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_UINT)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_048: [If the type of the value is not uint (was not created with amqpvalue_create_uint), then amqpvalue_get_uint shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_UINT)
+        {
             LogError("Value is not of type UINT");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_046: [amqpvalue_get_uint shall fill in the uint_value argument the uint32_t value stored by the AMQP value indicated by the value argument.] */
-			*uint_value = value_data->value.uint_value;
-
-			/* Codes_SRS_AMQPVALUE_01_047: [On success amqpvalue_get_uint shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_046: [amqpvalue_get_uint shall fill in the uint_value argument the uint32_t value stored by the AMQP value indicated by the value argument.] */
+            *uint_value = value_data->value.uint_value;
+
+            /* Codes_SRS_AMQPVALUE_01_047: [On success amqpvalue_get_uint shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_014: [1.6.6 ulong Integer in the range 0 to 264 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_ulong(uint64_t value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_050: [If allocating the AMQP_VALUE fails then amqpvalue_create_ulong shall return NULL.] */
@@ -432,105 +432,105 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_049: [amqpvalue_create_ulong shall return a handle to an AMQP_VALUE that stores an uint64_t value.] */
-		result->type = AMQP_TYPE_ULONG;
-		result->value.ulong_value = value;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_049: [amqpvalue_create_ulong shall return a handle to an AMQP_VALUE that stores an uint64_t value.] */
+        result->type = AMQP_TYPE_ULONG;
+        result->value.ulong_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_ulong(AMQP_VALUE value, uint64_t* ulong_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_053: [If any of the arguments is NULL then amqpvalue_get_ulong shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(ulong_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_053: [If any of the arguments is NULL then amqpvalue_get_ulong shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (ulong_value == NULL))
+    {
         LogError("Bad arguments: value = %p, ulong_value = %p",
             value, ulong_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_054: [If the type of the value is not ulong (was not created with amqpvalue_create_ulong), then amqpvalue_get_ulong shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_ULONG)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_054: [If the type of the value is not ulong (was not created with amqpvalue_create_ulong), then amqpvalue_get_ulong shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_ULONG)
+        {
             LogError("Value is not of type ULONG");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_051: [amqpvalue_get_ulong shall fill in the ulong_value argument the ulong64_t value stored by the AMQP value indicated by the value argument.] */
-			*ulong_value = value_data->value.ulong_value;
-
-			/* Codes_SRS_AMQPVALUE_01_052: [On success amqpvalue_get_ulong shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_051: [amqpvalue_get_ulong shall fill in the ulong_value argument the ulong64_t value stored by the AMQP value indicated by the value argument.] */
+            *ulong_value = value_data->value.ulong_value;
+
+            /* Codes_SRS_AMQPVALUE_01_052: [On success amqpvalue_get_ulong shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_015: [1.6.7 byte Integer in the range -(27) to 27 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_byte(char value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_056: [If allocating the AMQP_VALUE fails then amqpvalue_create_byte shall return NULL.] */
         LogError("Could not allocate memory for AMQP value");
     }
     else
-	{
-		/* Codes_SRS_AMQPVALUE_01_055: [amqpvalue_create_byte shall return a handle to an AMQP_VALUE that stores a char value.] */
-		result->type = AMQP_TYPE_BYTE;
-		result->value.byte_value = value;
-	}
-
-	return result;
+    {
+        /* Codes_SRS_AMQPVALUE_01_055: [amqpvalue_create_byte shall return a handle to an AMQP_VALUE that stores a char value.] */
+        result->type = AMQP_TYPE_BYTE;
+        result->value.byte_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_byte(AMQP_VALUE value, char* byte_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_059: [If any of the arguments is NULL then amqpvalue_get_byte shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(byte_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_059: [If any of the arguments is NULL then amqpvalue_get_byte shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (byte_value == NULL))
+    {
         LogError("Bad arguments: value = %p, byte_value = %p",
             value, byte_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_060: [If the type of the value is not byte (was not created with amqpvalue_create_byte), then amqpvalue_get_byte shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_BYTE)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_060: [If the type of the value is not byte (was not created with amqpvalue_create_byte), then amqpvalue_get_byte shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_BYTE)
+        {
             LogError("Value is not of type BYTE");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_057: [amqpvalue_get_byte shall fill in the byte_value argument the char value stored by the AMQP value indicated by the value argument.] */
-			*byte_value = value_data->value.byte_value;
-
-			/* Codes_SRS_AMQPVALUE_01_058: [On success amqpvalue_get_byte shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_057: [amqpvalue_get_byte shall fill in the byte_value argument the char value stored by the AMQP value indicated by the value argument.] */
+            *byte_value = value_data->value.byte_value;
+
+            /* Codes_SRS_AMQPVALUE_01_058: [On success amqpvalue_get_byte shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_016: [1.6.8 short Integer in the range -(215) to 215 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_short(int16_t value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_062: [If allocating the AMQP_VALUE fails then amqpvalue_create_short shall return NULL.] */
@@ -538,51 +538,51 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_061: [amqpvalue_create_short shall return a handle to an AMQP_VALUE that stores an int16_t value.] */
-		result->type = AMQP_TYPE_SHORT;
-		result->value.short_value = value;
-	}
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_061: [amqpvalue_create_short shall return a handle to an AMQP_VALUE that stores an int16_t value.] */
+        result->type = AMQP_TYPE_SHORT;
+        result->value.short_value = value;
+    }
+    return result;
 }
 
 int amqpvalue_get_short(AMQP_VALUE value, int16_t* short_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_065: [If any of the arguments is NULL then amqpvalue_get_short shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(short_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_065: [If any of the arguments is NULL then amqpvalue_get_short shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (short_value == NULL))
+    {
         LogError("Bad arguments: value = %p, short_value = %p",
             value, short_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_066: [If the type of the value is not short (was not created with amqpvalue_create_short), then amqpvalue_get_short shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_SHORT)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_066: [If the type of the value is not short (was not created with amqpvalue_create_short), then amqpvalue_get_short shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_SHORT)
+        {
             LogError("Value is not of type SHORT");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_063: [amqpvalue_get_short shall fill in the short_value argument the int16_t value stored by the AMQP value indicated by the value argument.] */
-			*short_value = value_data->value.short_value;
-
-			/* Codes_SRS_AMQPVALUE_01_064: [On success amqpvalue_get_short shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_063: [amqpvalue_get_short shall fill in the short_value argument the int16_t value stored by the AMQP value indicated by the value argument.] */
+            *short_value = value_data->value.short_value;
+
+            /* Codes_SRS_AMQPVALUE_01_064: [On success amqpvalue_get_short shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_017: [1.6.9 int Integer in the range -(231) to 231 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_int(int32_t value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_068: [If allocating the AMQP_VALUE fails then amqpvalue_create_int shall return NULL.] */
@@ -590,52 +590,52 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_067: [amqpvalue_create_int shall return a handle to an AMQP_VALUE that stores an int32_t value.] */
-		result->type = AMQP_TYPE_INT;
-		result->value.int_value = value;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_067: [amqpvalue_create_int shall return a handle to an AMQP_VALUE that stores an int32_t value.] */
+        result->type = AMQP_TYPE_INT;
+        result->value.int_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_int(AMQP_VALUE value, int32_t* int_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_071: [If any of the arguments is NULL then amqpvalue_get_int shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(int_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_071: [If any of the arguments is NULL then amqpvalue_get_int shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (int_value == NULL))
+    {
         LogError("Bad arguments: value = %p, int_value = %p",
             value, int_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_072: [If the type of the value is not int (was not created with amqpvalue_create_int), then amqpvalue_get_int shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_INT)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_072: [If the type of the value is not int (was not created with amqpvalue_create_int), then amqpvalue_get_int shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_INT)
+        {
             LogError("Value is not of type INT");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_069: [amqpvalue_get_int shall fill in the int_value argument the int32_t value stored by the AMQP value indicated by the value argument.] */
-			*int_value = value_data->value.int_value;
-
-			/* Codes_SRS_AMQPVALUE_01_070: [On success amqpvalue_get_int shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_069: [amqpvalue_get_int shall fill in the int_value argument the int32_t value stored by the AMQP value indicated by the value argument.] */
+            *int_value = value_data->value.int_value;
+
+            /* Codes_SRS_AMQPVALUE_01_070: [On success amqpvalue_get_int shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_018: [1.6.10 long Integer in the range -(263) to 263 - 1 inclusive.] */
 AMQP_VALUE amqpvalue_create_long(int64_t value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_074: [If allocating the AMQP_VALUE fails then amqpvalue_create_long shall return NULL.] */
@@ -643,52 +643,52 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_073: [amqpvalue_create_long shall return a handle to an AMQP_VALUE that stores an int64_t value.] */
-		result->type = AMQP_TYPE_LONG;
-		result->value.long_value = value;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_073: [amqpvalue_create_long shall return a handle to an AMQP_VALUE that stores an int64_t value.] */
+        result->type = AMQP_TYPE_LONG;
+        result->value.long_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_long(AMQP_VALUE value, int64_t* long_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_077: [If any of the arguments is NULL then amqpvalue_get_long shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(long_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_077: [If any of the arguments is NULL then amqpvalue_get_long shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (long_value == NULL))
+    {
         LogError("Bad arguments: value = %p, long_value = %p",
             value, long_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_078: [If the type of the value is not long (was not created with amqpvalue_create_long), then amqpvalue_get_long shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_LONG)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_078: [If the type of the value is not long (was not created with amqpvalue_create_long), then amqpvalue_get_long shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_LONG)
+        {
             LogError("Value is not of type LONG");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_075: [amqpvalue_get_long shall fill in the long_value argument the int64_t value stored by the AMQP value indicated by the value argument.] */
-			*long_value = value_data->value.long_value;
-
-			/* Codes_SRS_AMQPVALUE_01_076: [On success amqpvalue_get_long shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_075: [amqpvalue_get_long shall fill in the long_value argument the int64_t value stored by the AMQP value indicated by the value argument.] */
+            *long_value = value_data->value.long_value;
+
+            /* Codes_SRS_AMQPVALUE_01_076: [On success amqpvalue_get_long shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_019: [1.6.11 float 32-bit floating point number (IEEE 754-2008 binary32).]  */
 AMQP_VALUE amqpvalue_create_float(float value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_081: [If allocating the AMQP_VALUE fails then amqpvalue_create_float shall return NULL.] */
@@ -696,52 +696,52 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_080: [amqpvalue_create_float shall return a handle to an AMQP_VALUE that stores a float value.] */
-		result->type = AMQP_TYPE_FLOAT;
-		result->value.float_value = value;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_080: [amqpvalue_create_float shall return a handle to an AMQP_VALUE that stores a float value.] */
+        result->type = AMQP_TYPE_FLOAT;
+        result->value.float_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_float(AMQP_VALUE value, float* float_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_084: [If any of the arguments is NULL then amqpvalue_get_float shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(float_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_084: [If any of the arguments is NULL then amqpvalue_get_float shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (float_value == NULL))
+    {
         LogError("Bad arguments: value = %p, float_value = %p",
             value, float_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_085: [If the type of the value is not float (was not created with amqpvalue_create_float), then amqpvalue_get_float shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_FLOAT)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_085: [If the type of the value is not float (was not created with amqpvalue_create_float), then amqpvalue_get_float shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_FLOAT)
+        {
             LogError("Value is not of type FLOAT");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_082: [amqpvalue_get_float shall fill in the float_value argument the float value stored by the AMQP value indicated by the value argument.] */
-			*float_value = value_data->value.float_value;
-
-			/* Codes_SRS_AMQPVALUE_01_083: [On success amqpvalue_get_float shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_082: [amqpvalue_get_float shall fill in the float_value argument the float value stored by the AMQP value indicated by the value argument.] */
+            *float_value = value_data->value.float_value;
+
+            /* Codes_SRS_AMQPVALUE_01_083: [On success amqpvalue_get_float shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_020: [1.6.12 double 64-bit floating point number (IEEE 754-2008 binary64).] */
 AMQP_VALUE amqpvalue_create_double(double value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_087: [If allocating the AMQP_VALUE fails then amqpvalue_create_double shall return NULL.] */
@@ -749,62 +749,62 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_086: [amqpvalue_create_double shall return a handle to an AMQP_VALUE that stores a double value.] */
-		result->type = AMQP_TYPE_DOUBLE;
-		result->value.double_value = value;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_086: [amqpvalue_create_double shall return a handle to an AMQP_VALUE that stores a double value.] */
+        result->type = AMQP_TYPE_DOUBLE;
+        result->value.double_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_double(AMQP_VALUE value, double* double_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_090: [If any of the arguments is NULL then amqpvalue_get_double shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(double_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_090: [If any of the arguments is NULL then amqpvalue_get_double shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (double_value == NULL))
+    {
         LogError("Bad arguments: value = %p, double_value = %p",
             value, double_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_091: [If the type of the value is not double (was not created with amqpvalue_create_double), then amqpvalue_get_double shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_DOUBLE)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_091: [If the type of the value is not double (was not created with amqpvalue_create_double), then amqpvalue_get_double shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_DOUBLE)
+        {
             LogError("Value is not of type DOUBLE");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_088: [amqpvalue_get_double shall fill in the double_value argument the double value stored by the AMQP value indicated by the value argument.] */
-			*double_value = value_data->value.double_value;
-
-			/* Codes_SRS_AMQPVALUE_01_089: [On success amqpvalue_get_double shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_088: [amqpvalue_get_double shall fill in the double_value argument the double value stored by the AMQP value indicated by the value argument.] */
+            *double_value = value_data->value.double_value;
+
+            /* Codes_SRS_AMQPVALUE_01_089: [On success amqpvalue_get_double shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_024: [1.6.16 char A single Unicode character.] */
 AMQP_VALUE amqpvalue_create_char(uint32_t value)
 {
-	AMQP_VALUE result;
-
-	/* Codes_SRS_AMQPVALUE_01_098: [If the code point value is outside of the allowed range [0, 0x10FFFF] then amqpvalue_create_char shall return NULL.] */
-	if (value > 0x10FFFF)
-	{
+    AMQP_VALUE result;
+
+    /* Codes_SRS_AMQPVALUE_01_098: [If the code point value is outside of the allowed range [0, 0x10FFFF] then amqpvalue_create_char shall return NULL.] */
+    if (value > 0x10FFFF)
+    {
         LogError("Invalid value for a Unicode char");
-		result = NULL;
-	}
-	else
-	{
-		result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+        result = NULL;
+    }
+    else
+    {
+        result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
         if (result == NULL)
         {
             /* Codes_SRS_AMQPVALUE_01_093: [If allocating the AMQP_VALUE fails then amqpvalue_create_char shall return NULL.] */
@@ -812,53 +812,53 @@
         }
         else
         {
-			/* Codes_SRS_AMQPVALUE_01_092: [amqpvalue_create_char shall return a handle to an AMQP_VALUE that stores a single UTF-32 character value.] */
-			result->type = AMQP_TYPE_CHAR;
-			result->value.char_value = value;
-		}
-	}
-
-	return result;
+            /* Codes_SRS_AMQPVALUE_01_092: [amqpvalue_create_char shall return a handle to an AMQP_VALUE that stores a single UTF-32 character value.] */
+            result->type = AMQP_TYPE_CHAR;
+            result->value.char_value = value;
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_char(AMQP_VALUE value, uint32_t* char_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_096: [If any of the arguments is NULL then amqpvalue_get_char shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(char_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_096: [If any of the arguments is NULL then amqpvalue_get_char shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (char_value == NULL))
+    {
         LogError("Bad arguments: value = %p, double_value = %p",
             value, char_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_097: [If the type of the value is not char (was not created with amqpvalue_create_char), then amqpvalue_get_char shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_CHAR)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_097: [If the type of the value is not char (was not created with amqpvalue_create_char), then amqpvalue_get_char shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_CHAR)
+        {
             LogError("Value is not of type CHAR");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_094: [amqpvalue_get_char shall fill in the char_value argument the UTF32 char value stored by the AMQP value indicated by the value argument.] */
-			*char_value = value_data->value.char_value;
-
-			/* Codes_SRS_AMQPVALUE_01_095: [On success amqpvalue_get_char shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_094: [amqpvalue_get_char shall fill in the char_value argument the UTF32 char value stored by the AMQP value indicated by the value argument.] */
+            *char_value = value_data->value.char_value;
+
+            /* Codes_SRS_AMQPVALUE_01_095: [On success amqpvalue_get_char shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_025: [1.6.17 timestamp An absolute point in time.] */
 AMQP_VALUE amqpvalue_create_timestamp(int64_t value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_108: [If allocating the AMQP_VALUE fails then amqpvalue_create_timestamp shall return NULL.] */
@@ -866,52 +866,52 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_107: [amqpvalue_create_timestamp shall return a handle to an AMQP_VALUE that stores an uint64_t value that represents a millisecond precision Unix time.] */
-		result->type = AMQP_TYPE_TIMESTAMP;
-		result->value.timestamp_value = value;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_107: [amqpvalue_create_timestamp shall return a handle to an AMQP_VALUE that stores an uint64_t value that represents a millisecond precision Unix time.] */
+        result->type = AMQP_TYPE_TIMESTAMP;
+        result->value.timestamp_value = value;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_timestamp(AMQP_VALUE value, int64_t* timestamp_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_111: [If any of the arguments is NULL then amqpvalue_get_timestamp shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(timestamp_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_111: [If any of the arguments is NULL then amqpvalue_get_timestamp shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (timestamp_value == NULL))
+    {
         LogError("Bad arguments: value = %p, timestamp_value = %p",
             value, timestamp_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_112: [If the type of the value is not timestamp (was not created with amqpvalue_create_timestamp), then amqpvalue_get_timestamp shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_TIMESTAMP)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_112: [If the type of the value is not timestamp (was not created with amqpvalue_create_timestamp), then amqpvalue_get_timestamp shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_TIMESTAMP)
+        {
             LogError("Value is not of type TIMESTAMP");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_109: [amqpvalue_get_timestamp shall fill in the timestamp_value argument the timestamp value stored by the AMQP value indicated by the value argument.] */
-			*timestamp_value = value_data->value.timestamp_value;
-
-			/* Codes_SRS_AMQPVALUE_01_110: [On success amqpvalue_get_timestamp shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_109: [amqpvalue_get_timestamp shall fill in the timestamp_value argument the timestamp value stored by the AMQP value indicated by the value argument.] */
+            *timestamp_value = value_data->value.timestamp_value;
+
+            /* Codes_SRS_AMQPVALUE_01_110: [On success amqpvalue_get_timestamp shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_026: [1.6.18 uuid A universally unique identifier as defined by RFC-4122 section 4.1.2 .] */
 AMQP_VALUE amqpvalue_create_uuid(uuid value)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_114: [If allocating the AMQP_VALUE fails then amqpvalue_create_uuid shall return NULL.] */
@@ -919,62 +919,62 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_113: [amqpvalue_create_uuid shall return a handle to an AMQP_VALUE that stores an uuid value that represents a unique identifier per RFC-4122 section 4.1.2.] */
-		result->type = AMQP_TYPE_UUID;
-		(void)memcpy(&result->value.uuid_value, value, 16);
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_113: [amqpvalue_create_uuid shall return a handle to an AMQP_VALUE that stores an uuid value that represents a unique identifier per RFC-4122 section 4.1.2.] */
+        result->type = AMQP_TYPE_UUID;
+        (void)memcpy(&result->value.uuid_value, value, 16);
+    }
+
+    return result;
 }
 
 int amqpvalue_get_uuid(AMQP_VALUE value, uuid* uuid_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_117: [If any of the arguments is NULL then amqpvalue_get_uuid shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(uuid_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_117: [If any of the arguments is NULL then amqpvalue_get_uuid shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (uuid_value == NULL))
+    {
         LogError("Bad arguments: value = %p, uuid_value = %p",
             value, uuid_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_118: [If the type of the value is not uuid (was not created with amqpvalue_create_uuid), then amqpvalue_get_uuid shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_UUID)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_118: [If the type of the value is not uuid (was not created with amqpvalue_create_uuid), then amqpvalue_get_uuid shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_UUID)
+        {
             LogError("Value is not of type UUID");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_115: [amqpvalue_get_uuid shall fill in the uuid_value argument the uuid value stored by the AMQP value indicated by the value argument.] */
-			(void)memcpy(*uuid_value, value_data->value.uuid_value, 16);
-
-			/* Codes_SRS_AMQPVALUE_01_116: [On success amqpvalue_get_uuid shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_115: [amqpvalue_get_uuid shall fill in the uuid_value argument the uuid value stored by the AMQP value indicated by the value argument.] */
+            (void)memcpy(*uuid_value, value_data->value.uuid_value, 16);
+
+            /* Codes_SRS_AMQPVALUE_01_116: [On success amqpvalue_get_uuid shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_027: [1.6.19 binary A sequence of octets.] */
 AMQP_VALUE amqpvalue_create_binary(amqp_binary value)
 {
-	AMQP_VALUE result;
-	if ((value.bytes == NULL) &&
-		(value.length > 0))
-	{
-		/* Codes_SRS_AMQPVALUE_01_129: [If value.data is NULL and value.length is positive then amqpvalue_create_binary shall return NULL.] */
+    AMQP_VALUE result;
+    if ((value.bytes == NULL) &&
+        (value.length > 0))
+    {
+        /* Codes_SRS_AMQPVALUE_01_129: [If value.data is NULL and value.length is positive then amqpvalue_create_binary shall return NULL.] */
         LogError("NULL bytes with non-zero length");
-		result = NULL;
-	}
-	else
-	{
-		result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+        result = NULL;
+    }
+    else
+    {
+        result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
         if (result == NULL)
         {
             /* Codes_SRS_AMQPVALUE_01_128: [If allocating the AMQP_VALUE fails then amqpvalue_create_binary shall return NULL.] */
@@ -982,88 +982,88 @@
         }
         else
         {
-			/* Codes_SRS_AMQPVALUE_01_127: [amqpvalue_create_binary shall return a handle to an AMQP_VALUE that stores a sequence of bytes.] */
-			result->type = AMQP_TYPE_BINARY;
-			if (value.length > 0)
-			{
-				result->value.binary_value.bytes = malloc(value.length);
-			}
-			else
-			{
-				result->value.binary_value.bytes = NULL;
-			}
-
-			result->value.binary_value.length = value.length;
-
-			if ((result->value.binary_value.bytes == NULL) && (value.length > 0))
-			{
-				/* Codes_SRS_AMQPVALUE_01_128: [If allocating the AMQP_VALUE fails then amqpvalue_create_binary shall return NULL.] */
+            /* Codes_SRS_AMQPVALUE_01_127: [amqpvalue_create_binary shall return a handle to an AMQP_VALUE that stores a sequence of bytes.] */
+            result->type = AMQP_TYPE_BINARY;
+            if (value.length > 0)
+            {
+                result->value.binary_value.bytes = malloc(value.length);
+            }
+            else
+            {
+                result->value.binary_value.bytes = NULL;
+            }
+
+            result->value.binary_value.length = value.length;
+
+            if ((result->value.binary_value.bytes == NULL) && (value.length > 0))
+            {
+                /* Codes_SRS_AMQPVALUE_01_128: [If allocating the AMQP_VALUE fails then amqpvalue_create_binary shall return NULL.] */
                 LogError("Could not allocate memory for binary payload of AMQP value");
                 free(result);
-				result = NULL;
-			}
-			else
-			{
-				if (value.length > 0)
-				{
-					(void)memcpy((void*)result->value.binary_value.bytes, value.bytes, value.length);
-				}
-			}
-		}
-	}
-
-	return result;
+                result = NULL;
+            }
+            else
+            {
+                if (value.length > 0)
+                {
+                    (void)memcpy((void*)result->value.binary_value.bytes, value.bytes, value.length);
+                }
+            }
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_binary(AMQP_VALUE value, amqp_binary* binary_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_132: [If any of the arguments is NULL then amqpvalue_get_binary shall return NULL.] */
-	if ((value == NULL) ||
-		(binary_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_132: [If any of the arguments is NULL then amqpvalue_get_binary shall return NULL.] */
+    if ((value == NULL) ||
+        (binary_value == NULL))
+    {
         LogError("Bad arguments: value = %p, binary_value = %p",
             value, binary_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		/* Codes_SRS_AMQPVALUE_01_133: [If the type of the value is not binary (was not created with amqpvalue_create_binary), then amqpvalue_get_binary shall return NULL.] */
-		if (value_data->type != AMQP_TYPE_BINARY)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        /* Codes_SRS_AMQPVALUE_01_133: [If the type of the value is not binary (was not created with amqpvalue_create_binary), then amqpvalue_get_binary shall return NULL.] */
+        if (value_data->type != AMQP_TYPE_BINARY)
+        {
             LogError("Value is not of type BINARY");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_131: [amqpvalue_get_binary shall yield a pointer to the sequence of bytes held by the AMQP_VALUE in binary_value.data and fill in the binary_value.length argument the number of bytes held in the binary value.] */
-			binary_value->length = value_data->value.binary_value.length;
-			binary_value->bytes = value_data->value.binary_value.bytes;
-
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_131: [amqpvalue_get_binary shall yield a pointer to the sequence of bytes held by the AMQP_VALUE in binary_value.data and fill in the binary_value.length argument the number of bytes held in the binary value.] */
+            binary_value->length = value_data->value.binary_value.length;
+            binary_value->bytes = value_data->value.binary_value.bytes;
+
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_135: [amqpvalue_create_string shall return a handle to an AMQP_VALUE that stores a sequence of Unicode characters.] */
 /* Codes_SRS_AMQPVALUE_01_028: [1.6.20 string A sequence of Unicode characters.] */
 AMQP_VALUE amqpvalue_create_string(const char* value)
 {
-	AMQP_VALUE result;
-	if (value == NULL)
-	{
+    AMQP_VALUE result;
+    if (value == NULL)
+    {
         LogError("NULL argument value");
         result = NULL;
-	}
-	else
-	{
-		size_t length = strlen(value);
-		
-		result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    }
+    else
+    {
+        size_t length = strlen(value);
+        
+        result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
         if (result == NULL)
         {
             /* Codes_SRS_AMQPVALUE_01_136: [If allocating the AMQP_VALUE fails then amqpvalue_create_string shall return NULL.] */
@@ -1071,72 +1071,72 @@
         }
         else
         {
-			result->type = AMQP_TYPE_STRING;
-			result->value.string_value.chars = (char*)malloc(length + 1);
-			if (result->value.string_value.chars == NULL)
-			{
-				/* Codes_SRS_AMQPVALUE_01_136: [If allocating the AMQP_VALUE fails then amqpvalue_create_string shall return NULL.] */
+            result->type = AMQP_TYPE_STRING;
+            result->value.string_value.chars = (char*)malloc(length + 1);
+            if (result->value.string_value.chars == NULL)
+            {
+                /* Codes_SRS_AMQPVALUE_01_136: [If allocating the AMQP_VALUE fails then amqpvalue_create_string shall return NULL.] */
                 LogError("Could not allocate memory for string AMQP value");
                 free(result);
-				result = NULL;
-			}
-			else
-			{
-				(void)memcpy(result->value.string_value.chars, value, length + 1);
-			}
-		}
-	}
-
-	return result;
+                result = NULL;
+            }
+            else
+            {
+                (void)memcpy(result->value.string_value.chars, value, length + 1);
+            }
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_string(AMQP_VALUE value, const char** string_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_139: [If any of the arguments is NULL then amqpvalue_get_string shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(string_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_139: [If any of the arguments is NULL then amqpvalue_get_string shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (string_value == NULL))
+    {
         LogError("Bad arguments: value = %p, string_value = %p",
             value, string_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-
-		/* Codes_SRS_AMQPVALUE_01_140: [If the type of the value is not string (was not created with amqpvalue_create_string), then amqpvalue_get_string shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_STRING)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+
+        /* Codes_SRS_AMQPVALUE_01_140: [If the type of the value is not string (was not created with amqpvalue_create_string), then amqpvalue_get_string shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_STRING)
+        {
             LogError("Value is not of type STRING");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_138: [amqpvalue_get_string shall yield a pointer to the sequence of bytes held by the AMQP_VALUE in string_value.] */
-			*string_value = value_data->value.string_value.chars;
-
-			/* Codes_SRS_AMQPVALUE_01_141: [On success, amqpvalue_get_string shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_138: [amqpvalue_get_string shall yield a pointer to the sequence of bytes held by the AMQP_VALUE in string_value.] */
+            *string_value = value_data->value.string_value.chars;
+
+            /* Codes_SRS_AMQPVALUE_01_141: [On success, amqpvalue_get_string shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_029: [1.6.21 symbol Symbolic values from a constrained domain.] */
 AMQP_VALUE amqpvalue_create_symbol(const char* value)
 {
-	AMQP_VALUE result;
-	if (value == NULL)
-	{
-		/* Codes_SRS_AMQPVALUE_01_400: [If value is NULL, amqpvalue_create_symbol shall fail and return NULL.] */
+    AMQP_VALUE result;
+    if (value == NULL)
+    {
+        /* Codes_SRS_AMQPVALUE_01_400: [If value is NULL, amqpvalue_create_symbol shall fail and return NULL.] */
         LogError("NULL argument");
-		result = NULL;
-	}
-	else
-	{
+        result = NULL;
+    }
+    else
+    {
         size_t length = strlen(value);
         if (length > UINT32_MAX)
         {
@@ -1147,7 +1147,7 @@
         else
         {
             /* Codes_SRS_AMQPVALUE_01_143: [If allocating the AMQP_VALUE fails then amqpvalue_create_symbol shall return NULL.] */
-			result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+            result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
             if (result == NULL)
             {
                 LogError("Cannot allocate memory for AMQP value");
@@ -1169,51 +1169,51 @@
                     (void)memcpy(result->value.symbol_value.chars, value, length + 1);
                 }
             }
-		}
-	}
-
-	return result;
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_symbol(AMQP_VALUE value, const char** symbol_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_147: [If any of the arguments is NULL then amqpvalue_get_symbol shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(symbol_value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_147: [If any of the arguments is NULL then amqpvalue_get_symbol shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (symbol_value == NULL))
+    {
         LogError("Bad arguments: value = %p, symbol_value = %p",
             value, symbol_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-
-		/* Codes_SRS_AMQPVALUE_01_148: [If the type of the value is not symbol (was not created with amqpvalue_create_symbol), then amqpvalue_get_symbol shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_SYMBOL)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+
+        /* Codes_SRS_AMQPVALUE_01_148: [If the type of the value is not symbol (was not created with amqpvalue_create_symbol), then amqpvalue_get_symbol shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_SYMBOL)
+        {
             LogError("Value is not of type SYMBOL");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_145: [amqpvalue_get_symbol shall fill in the symbol_value the symbol value string held by the AMQP_VALUE.] */
-			*symbol_value = value_data->value.symbol_value.chars;
-
-			/* Codes_SRS_AMQPVALUE_01_146: [On success, amqpvalue_get_symbol shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_145: [amqpvalue_get_symbol shall fill in the symbol_value the symbol value string held by the AMQP_VALUE.] */
+            *symbol_value = value_data->value.symbol_value.chars;
+
+            /* Codes_SRS_AMQPVALUE_01_146: [On success, amqpvalue_get_symbol shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_030: [1.6.22 list A sequence of polymorphic values.] */
 AMQP_VALUE amqpvalue_create_list(void)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_150: [If allocating the AMQP_VALUE fails then amqpvalue_create_list shall return NULL.] */
@@ -1221,262 +1221,262 @@
     }
     else
     {
-		/* Codes_SRS_AMQPVALUE_01_149: [amqpvalue_create_list shall return a handle to an AMQP_VALUE that stores a list.] */
-		result->type = AMQP_TYPE_LIST;
-
-		/* Codes_SRS_AMQPVALUE_01_151: [The list shall have an initial size of zero.] */
-		result->value.list_value.count = 0;
-		result->value.list_value.items = NULL;
-	}
-
-	return result;
+        /* Codes_SRS_AMQPVALUE_01_149: [amqpvalue_create_list shall return a handle to an AMQP_VALUE that stores a list.] */
+        result->type = AMQP_TYPE_LIST;
+
+        /* Codes_SRS_AMQPVALUE_01_151: [The list shall have an initial size of zero.] */
+        result->value.list_value.count = 0;
+        result->value.list_value.items = NULL;
+    }
+
+    return result;
 }
 
 int amqpvalue_set_list_item_count(AMQP_VALUE value, uint32_t list_size)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_155: [If the value argument is NULL, amqpvalue_set_list_item_count shall return a non-zero value.] */
-	if (value == NULL)
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_155: [If the value argument is NULL, amqpvalue_set_list_item_count shall return a non-zero value.] */
+    if (value == NULL)
+    {
         LogError("NULL list value");
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if (value_data->type != AMQP_TYPE_LIST)
-		{
-			/* Codes_SRS_AMQPVALUE_01_156: [If the value is not of type list, then amqpvalue_set_list_item_count shall return a non-zero value.] */
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if (value_data->type != AMQP_TYPE_LIST)
+        {
+            /* Codes_SRS_AMQPVALUE_01_156: [If the value is not of type list, then amqpvalue_set_list_item_count shall return a non-zero value.] */
             LogError("Value is not of type LIST");
             result = __FAILURE__;
-		}
-		else
-		{
-			if (value_data->value.list_value.count < list_size)
-			{
-				AMQP_VALUE* new_list;
-
-				/* Codes_SRS_AMQPVALUE_01_152: [amqpvalue_set_list_item_count shall resize an AMQP list.] */
-				new_list = (AMQP_VALUE*)realloc(value_data->value.list_value.items, list_size * sizeof(AMQP_VALUE));
-				if (new_list == NULL)
-				{
-					/* Codes_SRS_AMQPVALUE_01_154: [If allocating memory for the list according to the new size fails, then amqpvalue_set_list_item_count shall return a non-zero value, while preserving the existing list contents.] */
+        }
+        else
+        {
+            if (value_data->value.list_value.count < list_size)
+            {
+                AMQP_VALUE* new_list;
+
+                /* Codes_SRS_AMQPVALUE_01_152: [amqpvalue_set_list_item_count shall resize an AMQP list.] */
+                new_list = (AMQP_VALUE*)realloc(value_data->value.list_value.items, list_size * sizeof(AMQP_VALUE));
+                if (new_list == NULL)
+                {
+                    /* Codes_SRS_AMQPVALUE_01_154: [If allocating memory for the list according to the new size fails, then amqpvalue_set_list_item_count shall return a non-zero value, while preserving the existing list contents.] */
                     LogError("Could not reallocate list memory");
                     result = __FAILURE__;
-				}
-				else
-				{
-					uint32_t i;
-					value_data->value.list_value.items = new_list;
-
-					/* Codes_SRS_AMQPVALUE_01_162: [When a list is grown a null AMQP_VALUE shall be inserted as new list items to fill the list up to the new size.] */
-					for (i = value_data->value.list_value.count; i < list_size; i++)
-					{
-						new_list[i] = amqpvalue_create_null();
-						if (new_list[i] == NULL)
-						{
+                }
+                else
+                {
+                    uint32_t i;
+                    value_data->value.list_value.items = new_list;
+
+                    /* Codes_SRS_AMQPVALUE_01_162: [When a list is grown a null AMQP_VALUE shall be inserted as new list items to fill the list up to the new size.] */
+                    for (i = value_data->value.list_value.count; i < list_size; i++)
+                    {
+                        new_list[i] = amqpvalue_create_null();
+                        if (new_list[i] == NULL)
+                        {
                             LogError("Could not create NULL AMQP value to be inserted in list");
                             break;
-						}
-					}
-
-					if (i < list_size)
-					{
-						/* Codes_SRS_AMQPVALUE_01_154: [If allocating memory for the list according to the new size fails, then amqpvalue_set_list_item_count shall return a non-zero value, while preserving the existing list contents.] */
-						uint32_t j;
-						for (j = value_data->value.list_value.count; j < i; j++)
-						{
-							amqpvalue_destroy(new_list[j]);
-						}
-
-						result = __FAILURE__;
-					}
-					else
-					{
-						value_data->value.list_value.count = list_size;
-
-						/* Codes_SRS_AMQPVALUE_01_153: [On success amqpvalue_set_list_item_count shall return 0.] */
-						result = 0;
-					}
-				}
-			}
-			else if (value_data->value.list_value.count > list_size)
-			{
-				uint32_t i;
-
-				/* Codes_SRS_AMQPVALUE_01_161: [When the list is shrunk, the extra items shall be freed by using amqp_value_destroy.] */
-				for (i = list_size; i < value_data->value.list_value.count; i++)
-				{
-					amqpvalue_destroy(value_data->value.list_value.items[i]);
-				}
-
-				value_data->value.list_value.count = list_size;
-
-				/* Codes_SRS_AMQPVALUE_01_153: [On success amqpvalue_set_list_item_count shall return 0.] */
-				result = 0;
-			}
-			else
-			{
-				/* Codes_SRS_AMQPVALUE_01_153: [On success amqpvalue_set_list_item_count shall return 0.] */
-				result = 0;
-			}
-		}
-	}
-	
-	return result;
+                        }
+                    }
+
+                    if (i < list_size)
+                    {
+                        /* Codes_SRS_AMQPVALUE_01_154: [If allocating memory for the list according to the new size fails, then amqpvalue_set_list_item_count shall return a non-zero value, while preserving the existing list contents.] */
+                        uint32_t j;
+                        for (j = value_data->value.list_value.count; j < i; j++)
+                        {
+                            amqpvalue_destroy(new_list[j]);
+                        }
+
+                        result = __FAILURE__;
+                    }
+                    else
+                    {
+                        value_data->value.list_value.count = list_size;
+
+                        /* Codes_SRS_AMQPVALUE_01_153: [On success amqpvalue_set_list_item_count shall return 0.] */
+                        result = 0;
+                    }
+                }
+            }
+            else if (value_data->value.list_value.count > list_size)
+            {
+                uint32_t i;
+
+                /* Codes_SRS_AMQPVALUE_01_161: [When the list is shrunk, the extra items shall be freed by using amqp_value_destroy.] */
+                for (i = list_size; i < value_data->value.list_value.count; i++)
+                {
+                    amqpvalue_destroy(value_data->value.list_value.items[i]);
+                }
+
+                value_data->value.list_value.count = list_size;
+
+                /* Codes_SRS_AMQPVALUE_01_153: [On success amqpvalue_set_list_item_count shall return 0.] */
+                result = 0;
+            }
+            else
+            {
+                /* Codes_SRS_AMQPVALUE_01_153: [On success amqpvalue_set_list_item_count shall return 0.] */
+                result = 0;
+            }
+        }
+    }
+    
+    return result;
 }
 
 int amqpvalue_get_list_item_count(AMQP_VALUE value, uint32_t* size)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_159: [If any of the arguments are NULL, amqpvalue_get_list_item_count shall return a non-zero value.] */
-	if ((value == NULL) ||
-		(size == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_159: [If any of the arguments are NULL, amqpvalue_get_list_item_count shall return a non-zero value.] */
+    if ((value == NULL) ||
+        (size == NULL))
+    {
         LogError("Bad arguments: value = %p, size = %p",
             value, size);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-
-		/* Codes_SRS_AMQPVALUE_01_160: [If the AMQP_VALUE is not a list then amqpvalue_get_list_item_count shall return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_LIST)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+
+        /* Codes_SRS_AMQPVALUE_01_160: [If the AMQP_VALUE is not a list then amqpvalue_get_list_item_count shall return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_LIST)
+        {
             LogError("Value is not of type LIST");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_157: [amqpvalue_get_list_item_count shall fill in the size argument the number of items held by the AMQP list.] */
-			*size = value_data->value.list_value.count;
-
-			/* Codes_SRS_AMQPVALUE_01_158: [On success amqpvalue_get_list_item_count shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_157: [amqpvalue_get_list_item_count shall fill in the size argument the number of items held by the AMQP list.] */
+            *size = value_data->value.list_value.count;
+
+            /* Codes_SRS_AMQPVALUE_01_158: [On success amqpvalue_get_list_item_count shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_set_list_item(AMQP_VALUE value, uint32_t index, AMQP_VALUE list_item_value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_165: [If value or list_item_value is NULL, amqpvalue_set_list_item shall fail and return a non-zero value.] */
-	if (value == NULL)
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_165: [If value or list_item_value is NULL, amqpvalue_set_list_item shall fail and return a non-zero value.] */
+    if (value == NULL)
+    {
         LogError("NULL list value");
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if (value_data->type != AMQP_TYPE_LIST)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if (value_data->type != AMQP_TYPE_LIST)
+        {
             LogError("Value is not of type LIST");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_168: [The item stored at the index-th position in the list shall be a clone of list_item_value.] */
-			AMQP_VALUE cloned_item = amqpvalue_clone(list_item_value);
-			if (cloned_item == NULL)
-			{
-				/* Codes_SRS_AMQPVALUE_01_170: [When amqpvalue_set_list_item fails due to not being able to clone the item or grow the list, the list shall not be altered.] */
-				/* Codes_SRS_AMQPVALUE_01_169: [If cloning the item fails, amqpvalue_set_list_item shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_168: [The item stored at the index-th position in the list shall be a clone of list_item_value.] */
+            AMQP_VALUE cloned_item = amqpvalue_clone(list_item_value);
+            if (cloned_item == NULL)
+            {
+                /* Codes_SRS_AMQPVALUE_01_170: [When amqpvalue_set_list_item fails due to not being able to clone the item or grow the list, the list shall not be altered.] */
+                /* Codes_SRS_AMQPVALUE_01_169: [If cloning the item fails, amqpvalue_set_list_item shall fail and return a non-zero value.] */
                 LogError("Could not clone list item");
                 result = __FAILURE__;
-			}
-			else
-			{
-				if (index >= value_data->value.list_value.count)
-				{
-					AMQP_VALUE* new_list = (AMQP_VALUE*)realloc(value_data->value.list_value.items, (index + 1) * sizeof(AMQP_VALUE));
-					if (new_list == NULL)
-					{
-						/* Codes_SRS_AMQPVALUE_01_170: [When amqpvalue_set_list_item fails due to not being able to clone the item or grow the list, the list shall not be altered.] */
+            }
+            else
+            {
+                if (index >= value_data->value.list_value.count)
+                {
+                    AMQP_VALUE* new_list = (AMQP_VALUE*)realloc(value_data->value.list_value.items, (index + 1) * sizeof(AMQP_VALUE));
+                    if (new_list == NULL)
+                    {
+                        /* Codes_SRS_AMQPVALUE_01_170: [When amqpvalue_set_list_item fails due to not being able to clone the item or grow the list, the list shall not be altered.] */
                         LogError("Could not reallocate list storage");
                         amqpvalue_destroy(cloned_item);
-						result = __FAILURE__;
-					}
-					else
-					{
-						uint32_t i;
-
-						value_data->value.list_value.items = new_list;
-
-						for (i = value_data->value.list_value.count; i < index; i++)
-						{
-							new_list[i] = amqpvalue_create_null();
-							if (new_list[i] == NULL)
-							{
+                        result = __FAILURE__;
+                    }
+                    else
+                    {
+                        uint32_t i;
+
+                        value_data->value.list_value.items = new_list;
+
+                        for (i = value_data->value.list_value.count; i < index; i++)
+                        {
+                            new_list[i] = amqpvalue_create_null();
+                            if (new_list[i] == NULL)
+                            {
                                 LogError("Could not allocate NULL value for list entries");
                                 break;
-							}
-						}
-
-						if (i < index)
-						{
-							/* Codes_SRS_AMQPVALUE_01_170: [When amqpvalue_set_list_item fails due to not being able to clone the item or grow the list, the list shall not be altered.] */
-							uint32_t j;
-
-							for (j = value_data->value.list_value.count; j < i; j++)
-							{
-								amqpvalue_destroy(new_list[j]);
-							}
-
-							amqpvalue_destroy(cloned_item);
-
-							/* Codes_SRS_AMQPVALUE_01_172: [If growing the list fails, then amqpvalue_set_list_item shall fail and return a non-zero value.] */
-							result = __FAILURE__;
-						}
-						else
-						{
-							value_data->value.list_value.count = index + 1;
-							value_data->value.list_value.items[index] = cloned_item;
-
-							/* Codes_SRS_AMQPVALUE_01_164: [On success amqpvalue_set_list_item shall return 0.] */
-							result = 0;
-						}
-					}
-				}
-				else
-				{
-					/* Codes_SRS_AMQPVALUE_01_167: [Any previous value stored at the position index in the list shall be freed by using amqpvalue_destroy.] */
-					amqpvalue_destroy(value_data->value.list_value.items[index]);
-
-					/* Codes_SRS_AMQPVALUE_01_163: [amqpvalue_set_list_item shall replace the item at the 0 based index-th position in the list identified by the value argument with the AMQP_VALUE specified by list_item_value.] */
-					value_data->value.list_value.items[index] = cloned_item;
-
-					/* Codes_SRS_AMQPVALUE_01_164: [On success amqpvalue_set_list_item shall return 0.] */
-					result = 0;
-				}
-			}
-		}
-	}
-
-	return result;
+                            }
+                        }
+
+                        if (i < index)
+                        {
+                            /* Codes_SRS_AMQPVALUE_01_170: [When amqpvalue_set_list_item fails due to not being able to clone the item or grow the list, the list shall not be altered.] */
+                            uint32_t j;
+
+                            for (j = value_data->value.list_value.count; j < i; j++)
+                            {
+                                amqpvalue_destroy(new_list[j]);
+                            }
+
+                            amqpvalue_destroy(cloned_item);
+
+                            /* Codes_SRS_AMQPVALUE_01_172: [If growing the list fails, then amqpvalue_set_list_item shall fail and return a non-zero value.] */
+                            result = __FAILURE__;
+                        }
+                        else
+                        {
+                            value_data->value.list_value.count = index + 1;
+                            value_data->value.list_value.items[index] = cloned_item;
+
+                            /* Codes_SRS_AMQPVALUE_01_164: [On success amqpvalue_set_list_item shall return 0.] */
+                            result = 0;
+                        }
+                    }
+                }
+                else
+                {
+                    /* Codes_SRS_AMQPVALUE_01_167: [Any previous value stored at the position index in the list shall be freed by using amqpvalue_destroy.] */
+                    amqpvalue_destroy(value_data->value.list_value.items[index]);
+
+                    /* Codes_SRS_AMQPVALUE_01_163: [amqpvalue_set_list_item shall replace the item at the 0 based index-th position in the list identified by the value argument with the AMQP_VALUE specified by list_item_value.] */
+                    value_data->value.list_value.items[index] = cloned_item;
+
+                    /* Codes_SRS_AMQPVALUE_01_164: [On success amqpvalue_set_list_item shall return 0.] */
+                    result = 0;
+                }
+            }
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_get_list_item(AMQP_VALUE value, size_t index)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
-		/* Codes_SRS_AMQPVALUE_01_174: [If the value argument is NULL, amqpvalue_get_list_item shall fail and return NULL.] */
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
+        /* Codes_SRS_AMQPVALUE_01_174: [If the value argument is NULL, amqpvalue_get_list_item shall fail and return NULL.] */
         LogError("NULL list value");
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-
-		/* Codes_SRS_AMQPVALUE_01_177: [If value is not a list then amqpvalue_get_list_item shall fail and return NULL.] */
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+
+        /* Codes_SRS_AMQPVALUE_01_177: [If value is not a list then amqpvalue_get_list_item shall fail and return NULL.] */
         if (value_data->type != AMQP_TYPE_LIST)
         {
             LogError("Value is not of type LIST");
@@ -1484,26 +1484,26 @@
         }
         /* Codes_SRS_AMQPVALUE_01_175: [If index is greater or equal to the number of items in the list then amqpvalue_get_list_item shall fail and return NULL.] */
         else if (value_data->value.list_value.count <= index)
-		{
+        {
             LogError("Bad index value %u", (unsigned int)index);
             result = NULL;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_173: [amqpvalue_get_list_item shall return a copy of the AMQP_VALUE stored at the 0 based position index in the list identified by value.] */
-			/* Codes_SRS_AMQPVALUE_01_176: [If cloning the item at position index fails, then amqpvalue_get_list_item shall fail and return NULL.] */
-			result = amqpvalue_clone(value_data->value.list_value.items[index]);
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_173: [amqpvalue_get_list_item shall return a copy of the AMQP_VALUE stored at the 0 based position index in the list identified by value.] */
+            /* Codes_SRS_AMQPVALUE_01_176: [If cloning the item at position index fails, then amqpvalue_get_list_item shall fail and return NULL.] */
+            result = amqpvalue_clone(value_data->value.list_value.items[index]);
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_178: [amqpvalue_create_map shall create an AMQP value that holds a map and return a handle to it.] */
 /* Codes_SRS_AMQPVALUE_01_031: [1.6.23 map A polymorphic mapping from distinct keys to values.] */
 AMQP_VALUE amqpvalue_create_map(void)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         /* Codes_SRS_AMQPVALUE_01_179: [If allocating memory for the map fails, then amqpvalue_create_map shall return NULL.] */
@@ -1511,411 +1511,413 @@
     }
     else
     {
-		result->type = AMQP_TYPE_MAP;
-
-		/* Codes_SRS_AMQPVALUE_01_180: [The number of key/value pairs in the newly created map shall be zero.] */
-		result->value.map_value.pairs = NULL;
-		result->value.map_value.pair_count = 0;
-	}
-
-	return result;
+        result->type = AMQP_TYPE_MAP;
+
+        /* Codes_SRS_AMQPVALUE_01_180: [The number of key/value pairs in the newly created map shall be zero.] */
+        result->value.map_value.pairs = NULL;
+        result->value.map_value.pair_count = 0;
+    }
+
+    return result;
 }
 
 int amqpvalue_set_map_value(AMQP_VALUE map, AMQP_VALUE key, AMQP_VALUE value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_183: [If any of the arguments are NULL, amqpvalue_set_map_value shall fail and return a non-zero value.] */
-	if ((map == NULL) ||
-		(key == NULL) ||
-		(value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_183: [If any of the arguments are NULL, amqpvalue_set_map_value shall fail and return a non-zero value.] */
+    if ((map == NULL) ||
+        (key == NULL) ||
+        (value == NULL))
+    {
         LogError("Bad arguments: map = %p, key = %p, value = %p",
             map, key, value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
-
-		/* Codes_SRS_AMQPVALUE_01_196: [If the map argument is not an AMQP value created with the amqpvalue_create_map function than amqpvalue_set_map_value shall fail and return a non-zero value.] */
-		if (value_data->type != AMQP_TYPE_MAP)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
+
+        /* Codes_SRS_AMQPVALUE_01_196: [If the map argument is not an AMQP value created with the amqpvalue_create_map function than amqpvalue_set_map_value shall fail and return a non-zero value.] */
+        if (value_data->type != AMQP_TYPE_MAP)
+        {
             LogError("Value is not of type MAP");
             result = __FAILURE__;
-		}
-		else
-		{
-			AMQP_VALUE cloned_value;
-
-			/* Codes_SRS_AMQPVALUE_01_185: [When storing the key or value, their contents shall be cloned.] */
-			cloned_value = amqpvalue_clone(value);
-			if (cloned_value == NULL)
-			{
-				/* Codes_SRS_AMQPVALUE_01_188: [If cloning the value fails, amqpvalue_set_map_value shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            AMQP_VALUE cloned_value;
+
+            /* Codes_SRS_AMQPVALUE_01_185: [When storing the key or value, their contents shall be cloned.] */
+            cloned_value = amqpvalue_clone(value);
+            if (cloned_value == NULL)
+            {
+                /* Codes_SRS_AMQPVALUE_01_188: [If cloning the value fails, amqpvalue_set_map_value shall fail and return a non-zero value.] */
                 LogError("Could not clone value to set in the map");
                 result = __FAILURE__;
-			}
-			else
-			{
-				uint32_t i;
-				AMQP_VALUE cloned_key;
-
-				for (i = 0; i < value_data->value.map_value.pair_count; i++)
-				{
-					if (amqpvalue_are_equal(value_data->value.map_value.pairs[i].key, key))
-					{
+            }
+            else
+            {
+                uint32_t i;
+                AMQP_VALUE cloned_key;
+
+                for (i = 0; i < value_data->value.map_value.pair_count; i++)
+                {
+                    if (amqpvalue_are_equal(value_data->value.map_value.pairs[i].key, key))
+                    {
                         LogError("Could not allocate NULL value for map entries");
                         break;
-					}
-				}
-
-				if (i < value_data->value.map_value.pair_count)
-				{
-					/* Codes_SRS_AMQPVALUE_01_184: [If the key already exists in the map, its value shall be replaced with the value provided by the value argument.] */
+                    }
+                }
+
+                if (i < value_data->value.map_value.pair_count)
+                {
+                    /* Codes_SRS_AMQPVALUE_01_184: [If the key already exists in the map, its value shall be replaced with the value provided by the value argument.] */
                     /* Codes_SRS_AMQPVALUE_01_125: [A map in which there exist two identical key values is invalid.] */
-					amqpvalue_destroy(value_data->value.map_value.pairs[i].value);
-					value_data->value.map_value.pairs[i].value = cloned_value;
-
-					/* Codes_SRS_AMQPVALUE_01_182: [On success amqpvalue_set_map_value shall return 0.] */
-					result = 0;
-				}
-				else
-				{
-					/* Codes_SRS_AMQPVALUE_01_185: [When storing the key or value, their contents shall be cloned.] */
-					cloned_key = amqpvalue_clone(key);
-					if (cloned_key == NULL)
-					{
-						/* Codes_SRS_AMQPVALUE_01_187: [If cloning the key fails, amqpvalue_set_map_value shall fail and return a non-zero value.] */
-						amqpvalue_destroy(cloned_value);
+                    amqpvalue_destroy(value_data->value.map_value.pairs[i].value);
+                    value_data->value.map_value.pairs[i].value = cloned_value;
+
+                    /* Codes_SRS_AMQPVALUE_01_182: [On success amqpvalue_set_map_value shall return 0.] */
+                    result = 0;
+                }
+                else
+                {
+                    /* Codes_SRS_AMQPVALUE_01_185: [When storing the key or value, their contents shall be cloned.] */
+                    cloned_key = amqpvalue_clone(key);
+                    if (cloned_key == NULL)
+                    {
+                        /* Codes_SRS_AMQPVALUE_01_187: [If cloning the key fails, amqpvalue_set_map_value shall fail and return a non-zero value.] */
+                        amqpvalue_destroy(cloned_value);
                         LogError("Could not clone key for map");
                         result = __FAILURE__;
-					}
-					else
-					{
-						AMQP_MAP_KEY_VALUE_PAIR* new_pairs = (AMQP_MAP_KEY_VALUE_PAIR*)realloc(value_data->value.map_value.pairs, (value_data->value.map_value.pair_count + 1) * sizeof(AMQP_MAP_KEY_VALUE_PAIR));
-						if (new_pairs == NULL)
-						{
-							/* Codes_SRS_AMQPVALUE_01_186: [If allocating memory to hold a new key/value pair fails, amqpvalue_set_map_value shall fail and return a non-zero value.] */
-							amqpvalue_destroy(cloned_key);
-							amqpvalue_destroy(cloned_value);
+                    }
+                    else
+                    {
+                        AMQP_MAP_KEY_VALUE_PAIR* new_pairs = (AMQP_MAP_KEY_VALUE_PAIR*)realloc(value_data->value.map_value.pairs, (value_data->value.map_value.pair_count + 1) * sizeof(AMQP_MAP_KEY_VALUE_PAIR));
+                        if (new_pairs == NULL)
+                        {
+                            /* Codes_SRS_AMQPVALUE_01_186: [If allocating memory to hold a new key/value pair fails, amqpvalue_set_map_value shall fail and return a non-zero value.] */
+                            amqpvalue_destroy(cloned_key);
+                            amqpvalue_destroy(cloned_value);
                             LogError("Could not reallocate memory for map");
                             result = __FAILURE__;
-						}
-						else
-						{
-							value_data->value.map_value.pairs = new_pairs;
-
-							/* Codes_SRS_AMQPVALUE_01_181: [amqpvalue_set_map_value shall set the value in the map identified by the map argument for a key/value pair identified by the key argument.] */
-							value_data->value.map_value.pairs[value_data->value.map_value.pair_count].key = cloned_key;
-							value_data->value.map_value.pairs[value_data->value.map_value.pair_count].value = cloned_value;
-							value_data->value.map_value.pair_count++;
-
-							/* Codes_SRS_AMQPVALUE_01_182: [On success amqpvalue_set_map_value shall return 0.] */
-							result = 0;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return result;
+                        }
+                        else
+                        {
+                            value_data->value.map_value.pairs = new_pairs;
+
+                            /* Codes_SRS_AMQPVALUE_01_181: [amqpvalue_set_map_value shall set the value in the map identified by the map argument for a key/value pair identified by the key argument.] */
+                            value_data->value.map_value.pairs[value_data->value.map_value.pair_count].key = cloned_key;
+                            value_data->value.map_value.pairs[value_data->value.map_value.pair_count].value = cloned_value;
+                            value_data->value.map_value.pair_count++;
+
+                            /* Codes_SRS_AMQPVALUE_01_182: [On success amqpvalue_set_map_value shall return 0.] */
+                            result = 0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_get_map_value(AMQP_VALUE map, AMQP_VALUE key)
 {
-	AMQP_VALUE result;
-
-	/* Codes_SRS_AMQPVALUE_01_190: [If any argument is NULL, amqpvalue_get_map_value shall return NULL.] */
-	if ((map == NULL) ||
-		(key == NULL))
-	{
+    AMQP_VALUE result;
+
+    /* Codes_SRS_AMQPVALUE_01_190: [If any argument is NULL, amqpvalue_get_map_value shall return NULL.] */
+    if ((map == NULL) ||
+        (key == NULL))
+    {
         LogError("Bad arguments: map = %p, key = %p",
             map, key);
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
-
-		/* Codes_SRS_AMQPVALUE_01_197: [If the map argument is not an AMQP value created with the amqpvalue_create_map function than amqpvalue_get_map_value shall return NULL.] */
-		if (value_data->type != AMQP_TYPE_MAP)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
+
+        /* Codes_SRS_AMQPVALUE_01_197: [If the map argument is not an AMQP value created with the amqpvalue_create_map function than amqpvalue_get_map_value shall return NULL.] */
+        if (value_data->type != AMQP_TYPE_MAP)
+        {
             LogError("Value is not of type MAP");
             result = NULL;
-		}
-		else
-		{
-			uint32_t i;
-
-			for (i = 0; i < value_data->value.map_value.pair_count; i++)
-			{
-				if (amqpvalue_are_equal(value_data->value.map_value.pairs[i].key, key))
-				{
+        }
+        else
+        {
+            uint32_t i;
+
+            for (i = 0; i < value_data->value.map_value.pair_count; i++)
+            {
+                if (amqpvalue_are_equal(value_data->value.map_value.pairs[i].key, key))
+                {
                     break;
-				}
-			}
-
-			if (i == value_data->value.map_value.pair_count)
-			{
-				/* Codes_SRS_AMQPVALUE_01_191: [If the key cannot be found, amqpvalue_get_map_value shall return NULL.] */
-				result = NULL;
-			}
-			else
-			{
-				/* Codes_SRS_AMQPVALUE_01_189: [amqpvalue_get_map_value shall return the value whose key is identified by the key argument.] */
-				/* Codes_SRS_AMQPVALUE_01_192: [The returned value shall be a clone of the actual value stored in the map.] */
-				result = amqpvalue_clone(value_data->value.map_value.pairs[i].value);
-			}
-		}
-	}
-
-	return result;
+                }
+            }
+
+            if (i == value_data->value.map_value.pair_count)
+            {
+                /* Codes_SRS_AMQPVALUE_01_191: [If the key cannot be found, amqpvalue_get_map_value shall return NULL.] */
+                result = NULL;
+            }
+            else
+            {
+                /* Codes_SRS_AMQPVALUE_01_189: [amqpvalue_get_map_value shall return the value whose key is identified by the key argument.] */
+                /* Codes_SRS_AMQPVALUE_01_192: [The returned value shall be a clone of the actual value stored in the map.] */
+                result = amqpvalue_clone(value_data->value.map_value.pairs[i].value);
+            }
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_map_pair_count(AMQP_VALUE map, uint32_t* pair_count)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_195: [If any of the arguments is NULL, amqpvalue_get_map_pair_count shall fail and return a non-zero value.] */
-	if ((map == NULL) ||
-		(pair_count == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_195: [If any of the arguments is NULL, amqpvalue_get_map_pair_count shall fail and return a non-zero value.] */
+    if ((map == NULL) ||
+        (pair_count == NULL))
+    {
         LogError("Bad arguments: map = %p, pair_count = %p",
             map, pair_count);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
-
-		if (value_data->type != AMQP_TYPE_MAP)
-		{
-			/* Codes_SRS_AMQPVALUE_01_198: [If the map argument is not an AMQP value created with the amqpvalue_create_map function then amqpvalue_get_map_pair_count shall fail and return a non-zero value.] */
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
+
+        if (value_data->type != AMQP_TYPE_MAP)
+        {
+            /* Codes_SRS_AMQPVALUE_01_198: [If the map argument is not an AMQP value created with the amqpvalue_create_map function then amqpvalue_get_map_pair_count shall fail and return a non-zero value.] */
             LogError("Value is not of type MAP");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_193: [amqpvalue_get_map_pair_count shall fill in the number of key/value pairs in the map in the pair_count argument.] */
-			*pair_count = value_data->value.map_value.pair_count;
-
-			/* Codes_SRS_AMQPVALUE_01_194: [On success amqpvalue_get_map_pair_count shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_193: [amqpvalue_get_map_pair_count shall fill in the number of key/value pairs in the map in the pair_count argument.] */
+            *pair_count = value_data->value.map_value.pair_count;
+
+            /* Codes_SRS_AMQPVALUE_01_194: [On success amqpvalue_get_map_pair_count shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_map_key_value_pair(AMQP_VALUE map, uint32_t index, AMQP_VALUE* key, AMQP_VALUE* value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_201: [If any of the map, key or value arguments is NULL, amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
-	if ((map == NULL) ||
-		(key == NULL) ||
-		(value == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_201: [If any of the map, key or value arguments is NULL, amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
+    if ((map == NULL) ||
+        (key == NULL) ||
+        (value == NULL))
+    {
         LogError("Bad arguments: map = %p, key = %p, value = %p",
             map, key, value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
-
-		if (value_data->type != AMQP_TYPE_MAP)
-		{
-			/* Codes_SRS_AMQPVALUE_01_205: [If the map argument is not an AMQP value created with the amqpvalue_create_map function then amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)map;
+
+        if (value_data->type != AMQP_TYPE_MAP)
+        {
+            /* Codes_SRS_AMQPVALUE_01_205: [If the map argument is not an AMQP value created with the amqpvalue_create_map function then amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
             LogError("Value is not of type MAP");
             result = __FAILURE__;
-		}
-		else if (value_data->value.map_value.pair_count <= index)
-		{
-			/* Codes_SRS_AMQPVALUE_01_204: [If the index argument is greater or equal to the number of key/value pairs in the map then amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
+        }
+        else if (value_data->value.map_value.pair_count <= index)
+        {
+            /* Codes_SRS_AMQPVALUE_01_204: [If the index argument is greater or equal to the number of key/value pairs in the map then amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
             LogError("Index out of range: %u", (unsigned int)index);
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_199: [amqpvalue_get_map_key_value_pair shall fill in the key and value arguments copies of the key/value pair on the 0 based position index in a map.] */
-			*key = amqpvalue_clone(value_data->value.map_value.pairs[index].key);
-			if (*key == NULL)
-			{
-				/* Codes_SRS_AMQPVALUE_01_202: [If cloning the key fails, amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_199: [amqpvalue_get_map_key_value_pair shall fill in the key and value arguments copies of the key/value pair on the 0 based position index in a map.] */
+            *key = amqpvalue_clone(value_data->value.map_value.pairs[index].key);
+            if (*key == NULL)
+            {
+                /* Codes_SRS_AMQPVALUE_01_202: [If cloning the key fails, amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
                 LogError("Could not clone index %u key", (unsigned int)index);
                 result = __FAILURE__;
-			}
-			else
-			{
-				*value = amqpvalue_clone(value_data->value.map_value.pairs[index].value);
-				if (*value == NULL)
-				{
-					/* Codes_SRS_AMQPVALUE_01_203: [If cloning the value fails, amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
-					amqpvalue_destroy(*key);
+            }
+            else
+            {
+                *value = amqpvalue_clone(value_data->value.map_value.pairs[index].value);
+                if (*value == NULL)
+                {
+                    /* Codes_SRS_AMQPVALUE_01_203: [If cloning the value fails, amqpvalue_get_map_key_value_pair shall fail and return a non-zero value.] */
+                    amqpvalue_destroy(*key);
                     LogError("Could not clone index %u value", (unsigned int)index);
                     result = __FAILURE__;
-				}
-				else
-				{
-					/* Codes_SRS_AMQPVALUE_01_200: [On success amqpvalue_get_map_key_value_pair shall return 0.] */
-					result = 0;
-				}
-			}
-		}
-	}
-
-	return result;
+                }
+                else
+                {
+                    /* Codes_SRS_AMQPVALUE_01_200: [On success amqpvalue_get_map_key_value_pair shall return 0.] */
+                    result = 0;
+                }
+            }
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_map(AMQP_VALUE value, AMQP_VALUE* map_value)
 {
-	int result;
-
-	if ((value == NULL) ||
-		(map_value == NULL))
-	{
+    int result;
+
+    if ((value == NULL) ||
+        (map_value == NULL))
+    {
         LogError("Bad arguments: value = %p, map_value = %p",
             value, map_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if (value_data->type != AMQP_TYPE_MAP)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if (value_data->type != AMQP_TYPE_MAP)
+        {
             LogError("Value is not of type MAP");
             result = __FAILURE__;
-		}
-		else
-		{
-			*map_value = value;
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            *map_value = value;
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_create_array(void)
 {
-	AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE result = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         LogError("Could not allocate memory for AMQP value");
     }
     else
     {
-		result->type = AMQP_TYPE_ARRAY;
-	}
-
-	return result;
+        result->type = AMQP_TYPE_ARRAY;
+        result->value.array_value.items = NULL;
+        result->value.array_value.count = 0;
+    }
+
+    return result;
 }
 
 int amqpvalue_get_array_item_count(AMQP_VALUE value, uint32_t* size)
 {
-	int result;
-
-	if ((value == NULL) ||
-		(size == NULL))
-	{
+    int result;
+
+    if ((value == NULL) ||
+        (size == NULL))
+    {
         LogError("Bad arguments: value = %p, size = %p",
             value, size);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-
-		if (value_data->type != AMQP_TYPE_ARRAY)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+
+        if (value_data->type != AMQP_TYPE_ARRAY)
+        {
             LogError("Value is not of type ARRAY");
             result = __FAILURE__;
-		}
-		else
-		{
-			*size = value_data->value.array_value.count;
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            *size = value_data->value.array_value.count;
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_add_array_item(AMQP_VALUE value, AMQP_VALUE array_item_value)
 {
-	int result;
-
-	if (value == NULL)
-	{
+    int result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if (value_data->type != AMQP_TYPE_ARRAY)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if (value_data->type != AMQP_TYPE_ARRAY)
+        {
             LogError("Value is not of type ARRAY");
             result = __FAILURE__;
-		}
-		else
-		{
-			AMQP_VALUE_DATA* array_item_value_data = (AMQP_VALUE_DATA*)array_item_value;
-			if ((value_data->value.array_value.count > 0) &&
-				(array_item_value_data->type != value_data->value.array_value.items[0]->type))
-			{
+        }
+        else
+        {
+            AMQP_VALUE_DATA* array_item_value_data = (AMQP_VALUE_DATA*)array_item_value;
+            if ((value_data->value.array_value.count > 0) &&
+                (array_item_value_data->type != value_data->value.array_value.items[0]->type))
+            {
                 LogError("Cannot put different types in the same array");
                 result = __FAILURE__;
-			}
-			else
-			{
-				AMQP_VALUE cloned_item = amqpvalue_clone(array_item_value);
-				if (cloned_item == NULL)
-				{
+            }
+            else
+            {
+                AMQP_VALUE cloned_item = amqpvalue_clone(array_item_value);
+                if (cloned_item == NULL)
+                {
                     LogError("Cannot clone value to put in the array");
                     result = __FAILURE__;
-				}
-				else
-				{
-					AMQP_VALUE* new_array = (AMQP_VALUE*)realloc(value_data->value.array_value.items, (value_data->value.array_value.count + 1) * sizeof(AMQP_VALUE));
-					if (new_array == NULL)
-					{
-						amqpvalue_destroy(cloned_item);
+                }
+                else
+                {
+                    AMQP_VALUE* new_array = (AMQP_VALUE*)realloc(value_data->value.array_value.items, (value_data->value.array_value.count + 1) * sizeof(AMQP_VALUE));
+                    if (new_array == NULL)
+                    {
+                        amqpvalue_destroy(cloned_item);
                         LogError("Cannot resize array");
                         result = __FAILURE__;
-					}
-					else
-					{
-						value_data->value.array_value.items = new_array;
-
-						value_data->value.array_value.items[value_data->value.array_value.count] = cloned_item;
-						value_data->value.array_value.count++;
-
-						result = 0;
-					}
-				}
-			}
-		}
-	}
-
-	return result;
+                    }
+                    else
+                    {
+                        value_data->value.array_value.items = new_array;
+
+                        value_data->value.array_value.items[value_data->value.array_value.count] = cloned_item;
+                        value_data->value.array_value.count++;
+
+                        result = 0;
+                    }
+                }
+            }
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_get_array_item(AMQP_VALUE value, uint32_t index)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
 
         if (value_data->type != AMQP_TYPE_ARRAY)
         {
@@ -1923,631 +1925,631 @@
             result = NULL;
         }
         else if (value_data->value.array_value.count <= index)
-		{
+        {
             LogError("Index out of range: %u", (unsigned int)index);
             result = NULL;
-		}
-		else
-		{
-			result = amqpvalue_clone(value_data->value.array_value.items[index]);
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            result = amqpvalue_clone(value_data->value.array_value.items[index]);
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_array(AMQP_VALUE value, AMQP_VALUE* array_value)
 {
-	int result;
-
-	if ((value == NULL) ||
-		(array_value == NULL))
-	{
+    int result;
+
+    if ((value == NULL) ||
+        (array_value == NULL))
+    {
         LogError("Bad arguments: value = %p, array_value = %p",
             value, array_value);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if (value_data->type != AMQP_TYPE_ARRAY)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if (value_data->type != AMQP_TYPE_ARRAY)
+        {
             LogError("Value is not of type ARRAY");
             result = __FAILURE__;
-		}
-		else
-		{
-			*array_value = value;
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            *array_value = value;
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_206: [amqpvalue_are_equal shall return true if the contents of value1 and value2 are equal.] */
 bool amqpvalue_are_equal(AMQP_VALUE value1, AMQP_VALUE value2)
 {
-	bool result;
-
-	/* Codes_SRS_AMQPVALUE_01_207: [If value1 and value2 are NULL, amqpvalue_are_equal shall return true.] */
-	if ((value1 == NULL) &&
-		(value2 == NULL))
-	{
+    bool result;
+
+    /* Codes_SRS_AMQPVALUE_01_207: [If value1 and value2 are NULL, amqpvalue_are_equal shall return true.] */
+    if ((value1 == NULL) &&
+        (value2 == NULL))
+    {
         LogError("Bad arguments: value1 = %p, value2 = %p",
             value1, value2);
         result = true;
-	}
-	/* Codes_SRS_AMQPVALUE_01_208: [If one of the arguments is NULL and the other is not, amqpvalue_are_equal shall return false.] */
-	else if ((value1 != value2) && ((value1 == NULL) || (value2 == NULL)))
-	{
-		result = false;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value1_data = (AMQP_VALUE_DATA*)value1;
-		AMQP_VALUE_DATA* value2_data = (AMQP_VALUE_DATA*)value2;
-
-		/* Codes_SRS_AMQPVALUE_01_209: [If the types for value1 and value2 are different amqpvalue_are_equal shall return false.] */
+    }
+    /* Codes_SRS_AMQPVALUE_01_208: [If one of the arguments is NULL and the other is not, amqpvalue_are_equal shall return false.] */
+    else if ((value1 != value2) && ((value1 == NULL) || (value2 == NULL)))
+    {
+        result = false;
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value1_data = (AMQP_VALUE_DATA*)value1;
+        AMQP_VALUE_DATA* value2_data = (AMQP_VALUE_DATA*)value2;
+
+        /* Codes_SRS_AMQPVALUE_01_209: [If the types for value1 and value2 are different amqpvalue_are_equal shall return false.] */
 #if _MSC_VER
 #pragma warning(suppress: 28182) /* The compiler states that value2_data can be NULL, but it cannot. And there are tests for it. */
 #endif
-		if (value1_data->type != value2_data->type)
-		{
-			result = false;
-		}
-		else
-		{
-			switch (value1_data->type)
-			{
-			default:
-				result = false;
-				break;
-
-			case AMQP_TYPE_NULL:
-				/* Codes_SRS_AMQPVALUE_01_210: [- null: always equal.] */
-				result = true;
-				break;
-
-			case AMQP_TYPE_BOOL:
-				/* Codes_SRS_AMQPVALUE_01_211: [- boolean: compare the bool content.] */
-				result = (value1_data->value.bool_value == value2_data->value.bool_value);
-				break;
-
-			case AMQP_TYPE_UBYTE:
-				/* Codes_SRS_AMQPVALUE_01_212: [- ubyte: compare the unsigned char content.] */
-				result = (value1_data->value.ubyte_value == value2_data->value.ubyte_value);
-				break;
-
-			case AMQP_TYPE_USHORT:
-				/* Codes_SRS_AMQPVALUE_01_213: [- ushort: compare the uint16_t content.] */
-				result = (value1_data->value.ushort_value == value2_data->value.ushort_value);
-				break;
-
-			case AMQP_TYPE_UINT:
-				/* Codes_SRS_AMQPVALUE_01_214: [- uint: compare the uint32_t content.] */
-				result = (value1_data->value.uint_value == value2_data->value.uint_value);
-				break;
-
-			case AMQP_TYPE_ULONG:
-				/* Codes_SRS_AMQPVALUE_01_215: [- ulong: compare the uint64_t content.] */
-				result = (value1_data->value.ulong_value == value2_data->value.ulong_value);
-				break;
-
-			case AMQP_TYPE_BYTE:
-				/* Codes_SRS_AMQPVALUE_01_216: [- byte: compare the char content.] */
-				result = (value1_data->value.byte_value == value2_data->value.byte_value);
-				break;
-
-			case AMQP_TYPE_SHORT:
-				/* Codes_SRS_AMQPVALUE_01_217: [- short: compare the int16_t content.] */
-				result = (value1_data->value.short_value == value2_data->value.short_value);
-				break;
-
-			case AMQP_TYPE_INT:
-				/* Codes_SRS_AMQPVALUE_01_218: [- int: compare the int32_t content.] */
-				result = (value1_data->value.int_value == value2_data->value.int_value);
-				break;
-
-			case AMQP_TYPE_LONG:
-				/* Codes_SRS_AMQPVALUE_01_219: [- long: compare the int64_t content.] */
-				result = (value1_data->value.long_value == value2_data->value.long_value);
-				break;
-
-			case AMQP_TYPE_FLOAT:
-				/* Codes_SRS_AMQPVALUE_01_224: [- float: compare the float content.] */
-				result = (value1_data->value.float_value == value2_data->value.float_value);
-				break;
-
-			case AMQP_TYPE_DOUBLE:
-				/* Codes_SRS_AMQPVALUE_01_225: [- double: compare the double content.] */
-				result = (value1_data->value.double_value == value2_data->value.double_value);
-				break;
-
-			case AMQP_TYPE_CHAR:
-				/* Codes_SRS_AMQPVALUE_01_226: [- char: compare the UNICODE character.] */
-				result = (value1_data->value.char_value == value2_data->value.char_value);
-				break;
-
-			case AMQP_TYPE_TIMESTAMP:
-				/* Codes_SRS_AMQPVALUE_01_227: [- timestamp: compare the underlying 64 bit integer.] */
-				result = (value1_data->value.timestamp_value == value2_data->value.timestamp_value);
-				break;
-
-			case AMQP_TYPE_UUID:
-				/* Codes_SRS_AMQPVALUE_01_228: [- uuid: compare all uuid bytes.] */
-				result = (memcmp(value1_data->value.uuid_value, value2_data->value.uuid_value, sizeof(value1_data->value.uuid_value)) == 0);
-				break;
-
-			case AMQP_TYPE_BINARY:
-				/* Codes_SRS_AMQPVALUE_01_229: [- binary: compare all binary bytes.] */
-				result = (value1_data->value.binary_value.length == value2_data->value.binary_value.length) &&
-					(memcmp(value1_data->value.binary_value.bytes, value2_data->value.binary_value.bytes, value1_data->value.binary_value.length) == 0);
-				break;
-
-			case AMQP_TYPE_STRING:
-				/* Codes_SRS_AMQPVALUE_01_230: [- string: compare all string characters.] */
-				result = (strcmp(value1_data->value.string_value.chars, value2_data->value.string_value.chars) == 0);
-				break;
-
-			case AMQP_TYPE_SYMBOL:
-				/* Codes_SRS_AMQPVALUE_01_263: [- symbol: compare all symbol characters.] */
-				result = (strcmp(value1_data->value.symbol_value.chars, value2_data->value.symbol_value.chars) == 0);
-				break;
-
-			case AMQP_TYPE_LIST:
-			{
-				/* Codes_SRS_AMQPVALUE_01_231: [- list: compare list item count and each element.] */
-				if (value1_data->value.list_value.count != value2_data->value.list_value.count)
-				{
-					result = false;
-				}
-				else
-				{
-					uint32_t i;
-
-					for (i = 0; i < value1_data->value.list_value.count; i++)
-					{
-						/* Codes_SRS_AMQPVALUE_01_232: [Nesting shall be considered in comparison.] */
-						if (!amqpvalue_are_equal(value1_data->value.list_value.items[i], value2_data->value.list_value.items[i]))
-						{
-							break;
-						}
-					}
-
-					result = (i == value1_data->value.list_value.count);
-				}
-
-				break;
-			}
-			case AMQP_TYPE_MAP:
-			{
-				/* Codes_SRS_AMQPVALUE_01_233: [- map: compare map pair count and each key/value pair.] */
-				if (value1_data->value.map_value.pair_count != value2_data->value.map_value.pair_count)
-				{
-					result = false;
-				}
-				else
-				{
-					uint32_t i;
-
-					/* Codes_SRS_AMQPVALUE_01_126: [Unless known to be otherwise, maps MUST be considered to be ordered, that is, the order of the key-value pairs is semantically important and two maps which are different only in the order in which their key-value pairs are encoded are not equal.] */
-					for (i = 0; i < value1_data->value.map_value.pair_count; i++)
-					{
-						/* Codes_SRS_AMQPVALUE_01_234: [Nesting shall be considered in comparison.] */
-						if ((!amqpvalue_are_equal(value1_data->value.map_value.pairs[i].key, value2_data->value.map_value.pairs[i].key)) ||
-							(!amqpvalue_are_equal(value1_data->value.map_value.pairs[i].value, value2_data->value.map_value.pairs[i].value)))
-						{
-							break;
-						}
-					}
-
-					result = (i == value1_data->value.map_value.pair_count);
-				}
-
-				break;
-			}
-			}
-		}
-	}
-
-	return result;
+        if (value1_data->type != value2_data->type)
+        {
+            result = false;
+        }
+        else
+        {
+            switch (value1_data->type)
+            {
+            default:
+                result = false;
+                break;
+
+            case AMQP_TYPE_NULL:
+                /* Codes_SRS_AMQPVALUE_01_210: [- null: always equal.] */
+                result = true;
+                break;
+
+            case AMQP_TYPE_BOOL:
+                /* Codes_SRS_AMQPVALUE_01_211: [- boolean: compare the bool content.] */
+                result = (value1_data->value.bool_value == value2_data->value.bool_value);
+                break;
+
+            case AMQP_TYPE_UBYTE:
+                /* Codes_SRS_AMQPVALUE_01_212: [- ubyte: compare the unsigned char content.] */
+                result = (value1_data->value.ubyte_value == value2_data->value.ubyte_value);
+                break;
+
+            case AMQP_TYPE_USHORT:
+                /* Codes_SRS_AMQPVALUE_01_213: [- ushort: compare the uint16_t content.] */
+                result = (value1_data->value.ushort_value == value2_data->value.ushort_value);
+                break;
+
+            case AMQP_TYPE_UINT:
+                /* Codes_SRS_AMQPVALUE_01_214: [- uint: compare the uint32_t content.] */
+                result = (value1_data->value.uint_value == value2_data->value.uint_value);
+                break;
+
+            case AMQP_TYPE_ULONG:
+                /* Codes_SRS_AMQPVALUE_01_215: [- ulong: compare the uint64_t content.] */
+                result = (value1_data->value.ulong_value == value2_data->value.ulong_value);
+                break;
+
+            case AMQP_TYPE_BYTE:
+                /* Codes_SRS_AMQPVALUE_01_216: [- byte: compare the char content.] */
+                result = (value1_data->value.byte_value == value2_data->value.byte_value);
+                break;
+
+            case AMQP_TYPE_SHORT:
+                /* Codes_SRS_AMQPVALUE_01_217: [- short: compare the int16_t content.] */
+                result = (value1_data->value.short_value == value2_data->value.short_value);
+                break;
+
+            case AMQP_TYPE_INT:
+                /* Codes_SRS_AMQPVALUE_01_218: [- int: compare the int32_t content.] */
+                result = (value1_data->value.int_value == value2_data->value.int_value);
+                break;
+
+            case AMQP_TYPE_LONG:
+                /* Codes_SRS_AMQPVALUE_01_219: [- long: compare the int64_t content.] */
+                result = (value1_data->value.long_value == value2_data->value.long_value);
+                break;
+
+            case AMQP_TYPE_FLOAT:
+                /* Codes_SRS_AMQPVALUE_01_224: [- float: compare the float content.] */
+                result = (value1_data->value.float_value == value2_data->value.float_value);
+                break;
+
+            case AMQP_TYPE_DOUBLE:
+                /* Codes_SRS_AMQPVALUE_01_225: [- double: compare the double content.] */
+                result = (value1_data->value.double_value == value2_data->value.double_value);
+                break;
+
+            case AMQP_TYPE_CHAR:
+                /* Codes_SRS_AMQPVALUE_01_226: [- char: compare the UNICODE character.] */
+                result = (value1_data->value.char_value == value2_data->value.char_value);
+                break;
+
+            case AMQP_TYPE_TIMESTAMP:
+                /* Codes_SRS_AMQPVALUE_01_227: [- timestamp: compare the underlying 64 bit integer.] */
+                result = (value1_data->value.timestamp_value == value2_data->value.timestamp_value);
+                break;
+
+            case AMQP_TYPE_UUID:
+                /* Codes_SRS_AMQPVALUE_01_228: [- uuid: compare all uuid bytes.] */
+                result = (memcmp(value1_data->value.uuid_value, value2_data->value.uuid_value, sizeof(value1_data->value.uuid_value)) == 0);
+                break;
+
+            case AMQP_TYPE_BINARY:
+                /* Codes_SRS_AMQPVALUE_01_229: [- binary: compare all binary bytes.] */
+                result = (value1_data->value.binary_value.length == value2_data->value.binary_value.length) &&
+                    (memcmp(value1_data->value.binary_value.bytes, value2_data->value.binary_value.bytes, value1_data->value.binary_value.length) == 0);
+                break;
+
+            case AMQP_TYPE_STRING:
+                /* Codes_SRS_AMQPVALUE_01_230: [- string: compare all string characters.] */
+                result = (strcmp(value1_data->value.string_value.chars, value2_data->value.string_value.chars) == 0);
+                break;
+
+            case AMQP_TYPE_SYMBOL:
+                /* Codes_SRS_AMQPVALUE_01_263: [- symbol: compare all symbol characters.] */
+                result = (strcmp(value1_data->value.symbol_value.chars, value2_data->value.symbol_value.chars) == 0);
+                break;
+
+            case AMQP_TYPE_LIST:
+            {
+                /* Codes_SRS_AMQPVALUE_01_231: [- list: compare list item count and each element.] */
+                if (value1_data->value.list_value.count != value2_data->value.list_value.count)
+                {
+                    result = false;
+                }
+                else
+                {
+                    uint32_t i;
+
+                    for (i = 0; i < value1_data->value.list_value.count; i++)
+                    {
+                        /* Codes_SRS_AMQPVALUE_01_232: [Nesting shall be considered in comparison.] */
+                        if (!amqpvalue_are_equal(value1_data->value.list_value.items[i], value2_data->value.list_value.items[i]))
+                        {
+                            break;
+                        }
+                    }
+
+                    result = (i == value1_data->value.list_value.count);
+                }
+
+                break;
+            }
+            case AMQP_TYPE_MAP:
+            {
+                /* Codes_SRS_AMQPVALUE_01_233: [- map: compare map pair count and each key/value pair.] */
+                if (value1_data->value.map_value.pair_count != value2_data->value.map_value.pair_count)
+                {
+                    result = false;
+                }
+                else
+                {
+                    uint32_t i;
+
+                    /* Codes_SRS_AMQPVALUE_01_126: [Unless known to be otherwise, maps MUST be considered to be ordered, that is, the order of the key-value pairs is semantically important and two maps which are different only in the order in which their key-value pairs are encoded are not equal.] */
+                    for (i = 0; i < value1_data->value.map_value.pair_count; i++)
+                    {
+                        /* Codes_SRS_AMQPVALUE_01_234: [Nesting shall be considered in comparison.] */
+                        if ((!amqpvalue_are_equal(value1_data->value.map_value.pairs[i].key, value2_data->value.map_value.pairs[i].key)) ||
+                            (!amqpvalue_are_equal(value1_data->value.map_value.pairs[i].value, value2_data->value.map_value.pairs[i].value)))
+                        {
+                            break;
+                        }
+                    }
+
+                    result = (i == value1_data->value.map_value.pair_count);
+                }
+
+                break;
+            }
+            }
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_clone(AMQP_VALUE value)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
-		/* Codes_SRS_AMQPVALUE_01_402: [ If `value` is NULL, `amqpvalue_clone` shall return NULL. ]*/
-		LogError("NULL value");
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
+        /* Codes_SRS_AMQPVALUE_01_402: [ If `value` is NULL, `amqpvalue_clone` shall return NULL. ]*/
+        LogError("NULL value");
         result = NULL;
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_235: [amqpvalue_clone shall clone the value passed as argument and return a new non-NULL handle to the cloned AMQP value.] */
-		INC_REF(AMQP_VALUE_DATA, value);
-		result = value;
-	}
-
-	return result;
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_235: [amqpvalue_clone shall clone the value passed as argument and return a new non-NULL handle to the cloned AMQP value.] */
+        INC_REF(AMQP_VALUE_DATA, value);
+        result = value;
+    }
+
+    return result;
 }
 
 AMQP_TYPE amqpvalue_get_type(AMQP_VALUE value)
 {
-	AMQP_VALUE_DATA* amqpvalue_data = (AMQP_VALUE_DATA*)value;
-	return amqpvalue_data->type;
+    AMQP_VALUE_DATA* amqpvalue_data = (AMQP_VALUE_DATA*)value;
+    return amqpvalue_data->type;
 }
 
 static int output_byte(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, unsigned char b)
 {
-	int result;
-
-	if (encoder_output != NULL)
-	{
-		/* Codes_SRS_AMQPVALUE_01_267: [amqpvalue_encode shall pass the encoded bytes to the encoder_output function.] */
-		/* Codes_SRS_AMQPVALUE_01_268: [On each call to the encoder_output function, amqpvalue_encode shall also pass the context argument.] */
-		result = encoder_output(context, &b, 1);
-	}
-	else
-	{
-		result = 0;
-	}
-
-	return result;
+    int result;
+
+    if (encoder_output != NULL)
+    {
+        /* Codes_SRS_AMQPVALUE_01_267: [amqpvalue_encode shall pass the encoded bytes to the encoder_output function.] */
+        /* Codes_SRS_AMQPVALUE_01_268: [On each call to the encoder_output function, amqpvalue_encode shall also pass the context argument.] */
+        result = encoder_output(context, &b, 1);
+    }
+    else
+    {
+        result = 0;
+    }
+
+    return result;
 }
 
 static int output_bytes(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, const void* bytes, size_t length)
 {
-	int result;
-
-	if (encoder_output != NULL)
-	{
-		/* Codes_SRS_AMQPVALUE_01_267: [amqpvalue_encode shall pass the encoded bytes to the encoder_output function.] */
-		/* Codes_SRS_AMQPVALUE_01_268: [On each call to the encoder_output function, amqpvalue_encode shall also pass the context argument.] */
-		result = encoder_output(context, (const unsigned char*)bytes, length);
-	}
-	else
-	{
-		result = 0;
-	}
-
-	return result;
+    int result;
+
+    if (encoder_output != NULL)
+    {
+        /* Codes_SRS_AMQPVALUE_01_267: [amqpvalue_encode shall pass the encoded bytes to the encoder_output function.] */
+        /* Codes_SRS_AMQPVALUE_01_268: [On each call to the encoder_output function, amqpvalue_encode shall also pass the context argument.] */
+        result = encoder_output(context, (const unsigned char*)bytes, length);
+    }
+    else
+    {
+        result = 0;
+    }
+
+    return result;
 }
 
 static int encode_boolean(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, bool value)
 {
-	int result;
-
-	if (value == false)
-	{
-		/* Codes_SRS_AMQPVALUE_01_273: [<encoding name="false" code="0x42" category="fixed" width="0" label="the boolean value false"/>] */
-		if (output_byte(encoder_output, context, 0x42) != 0)
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    if (value == false)
+    {
+        /* Codes_SRS_AMQPVALUE_01_273: [<encoding name="false" code="0x42" category="fixed" width="0" label="the boolean value false"/>] */
+        if (output_byte(encoder_output, context, 0x42) != 0)
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding boolean");
             result = __FAILURE__;
-		}
-		else
-		{
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_272: [<encoding name="true" code="0x41" category="fixed" width="0" label="the boolean value true"/>] */
-		if (output_byte(encoder_output, context, 0x41) != 0)
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_272: [<encoding name="true" code="0x41" category="fixed" width="0" label="the boolean value true"/>] */
+        if (output_byte(encoder_output, context, 0x41) != 0)
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding boolean");
             result = __FAILURE__;
-		}
-		else
-		{
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_ubyte(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, unsigned char value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_275: [<encoding code="0x50" category="fixed" width="1" label="8-bit unsigned integer"/>] */
-	if ((output_byte(encoder_output, context, 0x50) != 0) ||
-		(output_byte(encoder_output, context, value) != 0))
-	{
-		/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_275: [<encoding code="0x50" category="fixed" width="1" label="8-bit unsigned integer"/>] */
+    if ((output_byte(encoder_output, context, 0x50) != 0) ||
+        (output_byte(encoder_output, context, value) != 0))
+    {
+        /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
         LogError("Failed encoding ubyte");
         result = __FAILURE__;
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-		result = 0;
-	}
-
-	return result;
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+        result = 0;
+    }
+
+    return result;
 }
 
 static int encode_ushort(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, uint16_t value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_276: [<encoding code="0x60" category="fixed" width="2" label="16-bit unsigned integer in network byte order"/>] */
-	if ((output_byte(encoder_output, context, 0x60) != 0) ||
-		(output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value & 0xFF)) != 0))
-	{
-		/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_276: [<encoding code="0x60" category="fixed" width="2" label="16-bit unsigned integer in network byte order"/>] */
+    if ((output_byte(encoder_output, context, 0x60) != 0) ||
+        (output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value & 0xFF)) != 0))
+    {
+        /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
         LogError("Failed encoding ushort");
         result = __FAILURE__;
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-		result = 0;
-	}
-
-	return result;
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+        result = 0;
+    }
+
+    return result;
 }
 
 static int encode_uint(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, uint32_t value)
 {
-	int result;
-
-	if (value == 0)
-	{
-		/* uint0 */
-		/* Codes_SRS_AMQPVALUE_01_279: [<encoding name="uint0" code="0x43" category="fixed" width="0" label="the uint value 0"/>] */
-		if (output_byte(encoder_output, context, 0x43) != 0)
-		{
+    int result;
+
+    if (value == 0)
+    {
+        /* uint0 */
+        /* Codes_SRS_AMQPVALUE_01_279: [<encoding name="uint0" code="0x43" category="fixed" width="0" label="the uint value 0"/>] */
+        if (output_byte(encoder_output, context, 0x43) != 0)
+        {
             LogError("Failed encoding uint");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else if (value <= 255)
-	{
-		/* smalluint */
-		/* Codes_SRS_AMQPVALUE_01_278: [<encoding name="smalluint" code="0x52" category="fixed" width="1" label="unsigned integer value in the range 0 to 255 inclusive"/>] */
-		if ((output_byte(encoder_output, context, 0x52) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else if (value <= 255)
+    {
+        /* smalluint */
+        /* Codes_SRS_AMQPVALUE_01_278: [<encoding name="smalluint" code="0x52" category="fixed" width="1" label="unsigned integer value in the range 0 to 255 inclusive"/>] */
+        if ((output_byte(encoder_output, context, 0x52) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding uint");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_277: [<encoding code="0x70" category="fixed" width="4" label="32-bit unsigned integer in network byte order"/>] */
-		if ((output_byte(encoder_output, context, 0x70) != 0) ||
-			(output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_277: [<encoding code="0x70" category="fixed" width="4" label="32-bit unsigned integer in network byte order"/>] */
+        if ((output_byte(encoder_output, context, 0x70) != 0) ||
+            (output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding uint");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_ulong(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, uint64_t value)
 {
-	int result;
-	if (value == 0)
-	{
-		/* ulong0 */
-		/* Codes_SRS_AMQPVALUE_01_282: [<encoding name="ulong0" code="0x44" category="fixed" width="0" label="the ulong value 0"/>] */
-		if (output_byte(encoder_output, context, 0x44) != 0)
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+    if (value == 0)
+    {
+        /* ulong0 */
+        /* Codes_SRS_AMQPVALUE_01_282: [<encoding name="ulong0" code="0x44" category="fixed" width="0" label="the ulong value 0"/>] */
+        if (output_byte(encoder_output, context, 0x44) != 0)
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding ulong");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else if (value <= 255)
-	{
-		/* smallulong */
-		/* Codes_SRS_AMQPVALUE_01_281: [<encoding name="smallulong" code="0x53" category="fixed" width="1" label="unsigned long value in the range 0 to 255 inclusive"/>] */
-		if ((output_byte(encoder_output, context, 0x53) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else if (value <= 255)
+    {
+        /* smallulong */
+        /* Codes_SRS_AMQPVALUE_01_281: [<encoding name="smallulong" code="0x53" category="fixed" width="1" label="unsigned long value in the range 0 to 255 inclusive"/>] */
+        if ((output_byte(encoder_output, context, 0x53) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding ulong");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_280: [<encoding code="0x80" category="fixed" width="8" label="64-bit unsigned integer in network byte order"/>] */
-		if ((output_byte(encoder_output, context, 0x80) != 0) ||
-			(output_byte(encoder_output, context, (value >> 56) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 48) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 40) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 32) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_280: [<encoding code="0x80" category="fixed" width="8" label="64-bit unsigned integer in network byte order"/>] */
+        if ((output_byte(encoder_output, context, 0x80) != 0) ||
+            (output_byte(encoder_output, context, (value >> 56) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 48) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 40) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 32) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding ulong");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_byte(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, char value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_283: [<encoding code="0x51" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-	if ((output_byte(encoder_output, context, 0x51) != 0) ||
-		(output_byte(encoder_output, context, value) != 0))
-	{
-		/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_283: [<encoding code="0x51" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+    if ((output_byte(encoder_output, context, 0x51) != 0) ||
+        (output_byte(encoder_output, context, value) != 0))
+    {
+        /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
         LogError("Failed encoding byte");
         result = __FAILURE__;
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-		result = 0;
-	}
-
-	return result;
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+        result = 0;
+    }
+
+    return result;
 }
 
 static int encode_short(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, int16_t value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_284: [<encoding code="0x61" category="fixed" width="2" label="16-bit two's-complement integer in network byte order"/>] */
-	if ((output_byte(encoder_output, context, 0x61) != 0) ||
-		(output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value & 0xFF)) != 0))
-	{
-		/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_284: [<encoding code="0x61" category="fixed" width="2" label="16-bit two's-complement integer in network byte order"/>] */
+    if ((output_byte(encoder_output, context, 0x61) != 0) ||
+        (output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value & 0xFF)) != 0))
+    {
+        /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
         LogError("Failed encoding short");
         result = __FAILURE__;
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-		result = 0;
-	}
-
-	return result;
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+        result = 0;
+    }
+
+    return result;
 }
 
 static int encode_int(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, int32_t value)
 {
-	int result;
-
-	if ((value <= 127) && (value >= -128))
-	{
-		/* Codes_SRS_AMQPVALUE_01_286: [<encoding name="smallint" code="0x54" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-		if ((output_byte(encoder_output, context, 0x54) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    if ((value <= 127) && (value >= -128))
+    {
+        /* Codes_SRS_AMQPVALUE_01_286: [<encoding name="smallint" code="0x54" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+        if ((output_byte(encoder_output, context, 0x54) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding int");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_285: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
-		if ((output_byte(encoder_output, context, 0x71) != 0) ||
-			(output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_285: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
+        if ((output_byte(encoder_output, context, 0x71) != 0) ||
+            (output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding int");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_long(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, int64_t value)
 {
-	int result;
-
-	if ((value <= 127) && (value >= -128))
-	{
-		/* Codes_SRS_AMQPVALUE_01_288: [<encoding name="smalllong" code="0x55" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-		if ((output_byte(encoder_output, context, 0x55) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    if ((value <= 127) && (value >= -128))
+    {
+        /* Codes_SRS_AMQPVALUE_01_288: [<encoding name="smalllong" code="0x55" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+        if ((output_byte(encoder_output, context, 0x55) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding long");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_287: [<encoding code="0x81" category="fixed" width="8" label="64-bit two's-complement integer in network byte order"/>] */
-		if ((output_byte(encoder_output, context, 0x81) != 0) ||
-			(output_byte(encoder_output, context, (value >> 56) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 48) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 40) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 32) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, value & 0xFF) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_287: [<encoding code="0x81" category="fixed" width="8" label="64-bit two's-complement integer in network byte order"/>] */
+        if ((output_byte(encoder_output, context, 0x81) != 0) ||
+            (output_byte(encoder_output, context, (value >> 56) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 48) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 40) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 32) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, value & 0xFF) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding long");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_float(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, float value)
@@ -2606,223 +2608,223 @@
 
 static int encode_timestamp(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, int64_t value)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_295: [<encoding name="ms64" code="0x83" category="fixed" width="8" label="64-bit two's-complement integer representing milliseconds since the unix epoch"/>] */
-	if ((output_byte(encoder_output, context, 0x83) != 0) ||
-		(output_byte(encoder_output, context, (value >> 56) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value >> 48) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value >> 40) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value >> 32) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
-		(output_byte(encoder_output, context, value & 0xFF) != 0))
-	{
-		/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_295: [<encoding name="ms64" code="0x83" category="fixed" width="8" label="64-bit two's-complement integer representing milliseconds since the unix epoch"/>] */
+    if ((output_byte(encoder_output, context, 0x83) != 0) ||
+        (output_byte(encoder_output, context, (value >> 56) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value >> 48) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value >> 40) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value >> 32) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value >> 24) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value >> 16) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, (value >> 8) & 0xFF) != 0) ||
+        (output_byte(encoder_output, context, value & 0xFF) != 0))
+    {
+        /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
         LogError("Failed encoding timestamp");
         result = __FAILURE__;
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-		result = 0;
-	}
-
-	return result;
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+        result = 0;
+    }
+
+    return result;
 }
 
 static int encode_uuid(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, uuid uuid)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_296: [<encoding code="0x98" category="fixed" width="16" label="UUID as defined in section 4.1.2 of RFC-4122"/>] */
-	if ((output_byte(encoder_output, context, 0x98) != 0) ||
-		(output_bytes(encoder_output, context, uuid, 16)  != 0))
-	{
-		/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_296: [<encoding code="0x98" category="fixed" width="16" label="UUID as defined in section 4.1.2 of RFC-4122"/>] */
+    if ((output_byte(encoder_output, context, 0x98) != 0) ||
+        (output_bytes(encoder_output, context, uuid, 16)  != 0))
+    {
+        /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
         LogError("Failed encoding uuid");
         result = __FAILURE__;
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-		result = 0;
-	}
-
-	return result;
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+        result = 0;
+    }
+
+    return result;
 }
 
 static int encode_binary(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, const unsigned char* value, uint32_t length)
 {
-	int result;
-	if (length <= 255)
-	{
-		/* Codes_SRS_AMQPVALUE_01_297: [<encoding name="vbin8" code="0xa0" category="variable" width="1" label="up to 2^8 - 1 octets of binary data"/>] */
-		if ((output_byte(encoder_output, context, 0xA0) != 0) ||
-			(output_byte(encoder_output, context, (unsigned char)length) != 0) ||
-			((length > 0) && (output_bytes(encoder_output, context, value, length) != 0)))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+    if (length <= 255)
+    {
+        /* Codes_SRS_AMQPVALUE_01_297: [<encoding name="vbin8" code="0xa0" category="variable" width="1" label="up to 2^8 - 1 octets of binary data"/>] */
+        if ((output_byte(encoder_output, context, 0xA0) != 0) ||
+            (output_byte(encoder_output, context, (unsigned char)length) != 0) ||
+            ((length > 0) && (output_bytes(encoder_output, context, value, length) != 0)))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding binary");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_298: [<encoding name="vbin32" code="0xb0" category="variable" width="4" label="up to 2^32 - 1 octets of binary data"/>] */
-		if ((output_byte(encoder_output, context, 0xB0) != 0) ||
-			(output_byte(encoder_output, context, (length >> 24) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (length >> 16) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (length >> 8) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, length & 0xFF) != 0) ||
-			(output_bytes(encoder_output, context, value, length) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_298: [<encoding name="vbin32" code="0xb0" category="variable" width="4" label="up to 2^32 - 1 octets of binary data"/>] */
+        if ((output_byte(encoder_output, context, 0xB0) != 0) ||
+            (output_byte(encoder_output, context, (length >> 24) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (length >> 16) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (length >> 8) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, length & 0xFF) != 0) ||
+            (output_bytes(encoder_output, context, value, length) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding binary");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_string(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, const char* value)
 {
-	int result;
-	size_t length = strlen(value);
-
-	if (length <= 255)
-	{
-		/* Codes_SRS_AMQPVALUE_01_299: [<encoding name="str8-utf8" code="0xa1" category="variable" width="1" label="up to 2^8 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
-		if ((output_byte(encoder_output, context, (unsigned char)0xA1) != 0) ||
-			(output_byte(encoder_output, context, (unsigned char)length) != 0) ||
-			(output_bytes(encoder_output, context, value, length) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+    size_t length = strlen(value);
+
+    if (length <= 255)
+    {
+        /* Codes_SRS_AMQPVALUE_01_299: [<encoding name="str8-utf8" code="0xa1" category="variable" width="1" label="up to 2^8 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
+        if ((output_byte(encoder_output, context, (unsigned char)0xA1) != 0) ||
+            (output_byte(encoder_output, context, (unsigned char)length) != 0) ||
+            (output_bytes(encoder_output, context, value, length) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding string");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_300: [<encoding name="str32-utf8" code="0xb1" category="variable" width="4" label="up to 2^32 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
-		if ((output_byte(encoder_output, context, 0xB1) != 0) ||
-			(output_byte(encoder_output, context, (length >> 24) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (length >> 16) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (length >> 8) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, length & 0xFF) != 0) ||
-			(output_bytes(encoder_output, context, value, length) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_300: [<encoding name="str32-utf8" code="0xb1" category="variable" width="4" label="up to 2^32 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
+        if ((output_byte(encoder_output, context, 0xB1) != 0) ||
+            (output_byte(encoder_output, context, (length >> 24) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (length >> 16) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (length >> 8) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, length & 0xFF) != 0) ||
+            (output_bytes(encoder_output, context, value, length) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding string");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_symbol(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, const char* value)
 {
-	int result;
-	size_t length = strlen(value);
-
-	if (length <= 255)
-	{
-		/* Codes_SRS_AMQPVALUE_01_301: [<encoding name="sym8" code="0xa3" category="variable" width="1" label="up to 2^8 - 1 seven bit ASCII characters representing a symbolic value"/>] */
-		if ((output_byte(encoder_output, context, (unsigned char)0xA3) != 0) ||
-			(output_byte(encoder_output, context, (unsigned char)length) != 0) ||
-			(output_bytes(encoder_output, context, value, length) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    int result;
+    size_t length = strlen(value);
+
+    if (length <= 255)
+    {
+        /* Codes_SRS_AMQPVALUE_01_301: [<encoding name="sym8" code="0xa3" category="variable" width="1" label="up to 2^8 - 1 seven bit ASCII characters representing a symbolic value"/>] */
+        if ((output_byte(encoder_output, context, (unsigned char)0xA3) != 0) ||
+            (output_byte(encoder_output, context, (unsigned char)length) != 0) ||
+            (output_bytes(encoder_output, context, value, length) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding symbol");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		/* Codes_SRS_AMQPVALUE_01_302: [<encoding name="sym32" code="0xb3" category="variable" width="4" label="up to 2^32 - 1 seven bit ASCII characters representing a symbolic value"/>] */
-		if ((output_byte(encoder_output, context, 0xB3) != 0) ||
-			(output_byte(encoder_output, context, (length >> 24) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (length >> 16) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, (length >> 8) & 0xFF) != 0) ||
-			(output_byte(encoder_output, context, length & 0xFF) != 0) ||
-			/* Codes_SRS_AMQPVALUE_01_122: [Symbols are encoded as ASCII characters [ASCII].] */
-			(output_bytes(encoder_output, context, value, length) != 0))
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        /* Codes_SRS_AMQPVALUE_01_302: [<encoding name="sym32" code="0xb3" category="variable" width="4" label="up to 2^32 - 1 seven bit ASCII characters representing a symbolic value"/>] */
+        if ((output_byte(encoder_output, context, 0xB3) != 0) ||
+            (output_byte(encoder_output, context, (length >> 24) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (length >> 16) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, (length >> 8) & 0xFF) != 0) ||
+            (output_byte(encoder_output, context, length & 0xFF) != 0) ||
+            /* Codes_SRS_AMQPVALUE_01_122: [Symbols are encoded as ASCII characters [ASCII].] */
+            (output_bytes(encoder_output, context, value, length) != 0))
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Failed encoding symbol");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 static int encode_list(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, uint32_t count, AMQP_VALUE* items)
 {
-	size_t i;
-	int result;
-
-	if (count == 0)
-	{
-		/* Codes_SRS_AMQPVALUE_01_303: [<encoding name="list0" code="0x45" category="fixed" width="0" label="the empty list (i.e. the list with no elements)"/>] */
-		if (output_byte(encoder_output, context, 0x45) != 0)
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+    size_t i;
+    int result;
+
+    if (count == 0)
+    {
+        /* Codes_SRS_AMQPVALUE_01_303: [<encoding name="list0" code="0x45" category="fixed" width="0" label="the empty list (i.e. the list with no elements)"/>] */
+        if (output_byte(encoder_output, context, 0x45) != 0)
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
             LogError("Could not output list constructor byte");
-			result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = 0;
-		}
-	}
-	else
-	{
-		uint32_t size = 0;
-
-		/* get the size of all items in the list */
-		for (i = 0; i < count; i++)
-		{
-			size_t item_size;
-			if (amqpvalue_get_encoded_size(items[i], &item_size) != 0)
-			{
+            result = __FAILURE__;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = 0;
+        }
+    }
+    else
+    {
+        uint32_t size = 0;
+
+        /* get the size of all items in the list */
+        for (i = 0; i < count; i++)
+        {
+            size_t item_size;
+            if (amqpvalue_get_encoded_size(items[i], &item_size) != 0)
+            {
                 LogError("Could not get encoded size for element %u of the list", (unsigned int)i);
-				break;
-			}
+                break;
+            }
 
             if ((item_size > UINT32_MAX) ||
                 size + (uint32_t)item_size < size)
@@ -2834,107 +2836,107 @@
             size = (uint32_t)(size + item_size);
         }
 
-		if (i < count)
-		{
-			/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
-			result = __FAILURE__;
-		}
-		else
-		{
-			if ((count <= 255) && (size < 255))
-			{
-				size++;
-
-				/* Codes_SRS_AMQPVALUE_01_304: [<encoding name="list8" code="0xc0" category="compound" width="1" label="up to 2^8 - 1 list elements with total size less than 2^8 octets"/>] */
-				if ((output_byte(encoder_output, context, 0xC0) != 0) ||
-					/* size */
-					(output_byte(encoder_output, context, (size & 0xFF)) != 0) ||
-					/* count */
-					(output_byte(encoder_output, context, (count & 0xFF)) != 0))
-				{
-					/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        if (i < count)
+        {
+            /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+            result = __FAILURE__;
+        }
+        else
+        {
+            if ((count <= 255) && (size < 255))
+            {
+                size++;
+
+                /* Codes_SRS_AMQPVALUE_01_304: [<encoding name="list8" code="0xc0" category="compound" width="1" label="up to 2^8 - 1 list elements with total size less than 2^8 octets"/>] */
+                if ((output_byte(encoder_output, context, 0xC0) != 0) ||
+                    /* size */
+                    (output_byte(encoder_output, context, (size & 0xFF)) != 0) ||
+                    /* count */
+                    (output_byte(encoder_output, context, (count & 0xFF)) != 0))
+                {
+                    /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
                     LogError("Failed encoding list");
-					result = __FAILURE__;
-				}
-				else
-				{
-					/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-					result = 0;
-				}
-			}
-			else
-			{
-				size += 4;
-
-				/* Codes_SRS_AMQPVALUE_01_305: [<encoding name="list32" code="0xd0" category="compound" width="4" label="up to 2^32 - 1 list elements with total size less than 2^32 octets"/>] */
-				if ((output_byte(encoder_output, context, 0xD0) != 0) ||
-					/* size */
-					(output_byte(encoder_output, context, (size >> 24) & 0xFF) != 0) ||
-					(output_byte(encoder_output, context, (size >> 16) & 0xFF) != 0) ||
-					(output_byte(encoder_output, context, (size >> 8) & 0xFF) != 0) ||
-					(output_byte(encoder_output, context, size & 0xFF) != 0) ||
-					/* count */
-					(output_byte(encoder_output, context, (count >> 24) & 0xFF) != 0) ||
-					(output_byte(encoder_output, context, (count >> 16) & 0xFF) != 0) ||
-					(output_byte(encoder_output, context, (count >> 8) & 0xFF) != 0) ||
-					(output_byte(encoder_output, context, count & 0xFF) != 0))
-				{
-					/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+                    result = __FAILURE__;
+                }
+                else
+                {
+                    /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+                    result = 0;
+                }
+            }
+            else
+            {
+                size += 4;
+
+                /* Codes_SRS_AMQPVALUE_01_305: [<encoding name="list32" code="0xd0" category="compound" width="4" label="up to 2^32 - 1 list elements with total size less than 2^32 octets"/>] */
+                if ((output_byte(encoder_output, context, 0xD0) != 0) ||
+                    /* size */
+                    (output_byte(encoder_output, context, (size >> 24) & 0xFF) != 0) ||
+                    (output_byte(encoder_output, context, (size >> 16) & 0xFF) != 0) ||
+                    (output_byte(encoder_output, context, (size >> 8) & 0xFF) != 0) ||
+                    (output_byte(encoder_output, context, size & 0xFF) != 0) ||
+                    /* count */
+                    (output_byte(encoder_output, context, (count >> 24) & 0xFF) != 0) ||
+                    (output_byte(encoder_output, context, (count >> 16) & 0xFF) != 0) ||
+                    (output_byte(encoder_output, context, (count >> 8) & 0xFF) != 0) ||
+                    (output_byte(encoder_output, context, count & 0xFF) != 0))
+                {
+                    /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
                     LogError("Failed encoding list");
-					result = __FAILURE__;
-				}
-				else
-				{
-					/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-					result = 0;
-				}
-			}
-
-			if (result == 0)
-			{
-				for (i = 0; i < count; i++)
-				{
-					if (amqpvalue_encode(items[i], encoder_output, context) != 0)
-					{
+                    result = __FAILURE__;
+                }
+                else
+                {
+                    /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+                    result = 0;
+                }
+            }
+
+            if (result == 0)
+            {
+                for (i = 0; i < count; i++)
+                {
+                    if (amqpvalue_encode(items[i], encoder_output, context) != 0)
+                    {
                         break;
-					}
-				}
-
-				if (i < count)
-				{
+                    }
+                }
+
+                if (i < count)
+                {
                     LogError("Failed encoding element %u of the list", (unsigned int)i);
-					result = __FAILURE__;
-				}
-				else
-				{
-					result = 0;
-				}
-			}
-		}
-	}
-
-	return result;
+                    result = __FAILURE__;
+                }
+                else
+                {
+                    result = 0;
+                }
+            }
+        }
+    }
+
+    return result;
 }
 
 static int encode_map(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context, uint32_t count, AMQP_MAP_KEY_VALUE_PAIR* pairs)
 {
-	size_t i;
-	int result;
-
-	uint32_t size = 0;
+    size_t i;
+    int result;
+
+    uint32_t size = 0;
 
     /* Codes_SRS_AMQPVALUE_01_124: [Map encodings MUST contain an even number of items (i.e. an equal number of keys and values).] */
     uint32_t elements = count * 2;
 
-	/* get the size of all items in the list */
-	for (i = 0; i < count; i++)
-	{
-		size_t item_size;
-		if (amqpvalue_get_encoded_size(pairs[i].key, &item_size) != 0)
-		{
+    /* get the size of all items in the list */
+    for (i = 0; i < count; i++)
+    {
+        size_t item_size;
+        if (amqpvalue_get_encoded_size(pairs[i].key, &item_size) != 0)
+        {
             LogError("Could not get encoded size for key element %u of the map", (unsigned int)i);
-			break;
-		}
+            break;
+        }
 
         if ((item_size > UINT32_MAX) ||
             size + (uint32_t)item_size < size)
@@ -2945,11 +2947,11 @@
         
         size = (uint32_t)(size + item_size);
 
-		if (amqpvalue_get_encoded_size(pairs[i].value, &item_size) != 0)
-		{
+        if (amqpvalue_get_encoded_size(pairs[i].value, &item_size) != 0)
+        {
             LogError("Could not get encoded size for value element %u of the map", (unsigned int)i);
-			break;
-		}
+            break;
+        }
 
         if ((item_size > UINT32_MAX) ||
             size + (uint32_t)item_size < size)
@@ -2958,96 +2960,96 @@
             break;
         }
 
-		size = (uint32_t)(size + item_size);
-	}
-
-	if (i < count)
-	{
-		/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
-		result = __FAILURE__;
-	}
-	else
-	{
+        size = (uint32_t)(size + item_size);
+    }
+
+    if (i < count)
+    {
+        /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+        result = __FAILURE__;
+    }
+    else
+    {
         if ((elements <= 255) && (size < 255))
-		{
-			size++;
-
-			/* Codes_SRS_AMQPVALUE_01_306: [<encoding name="map8" code="0xc1" category="compound" width="1" label="up to 2^8 - 1 octets of encoded map data"/>] */
-			if ((output_byte(encoder_output, context, 0xC1) != 0) ||
-				/* size */
-				(output_byte(encoder_output, context, (size & 0xFF)) != 0) ||
-				/* count */
+        {
+            size++;
+
+            /* Codes_SRS_AMQPVALUE_01_306: [<encoding name="map8" code="0xc1" category="compound" width="1" label="up to 2^8 - 1 octets of encoded map data"/>] */
+            if ((output_byte(encoder_output, context, 0xC1) != 0) ||
+                /* size */
+                (output_byte(encoder_output, context, (size & 0xFF)) != 0) ||
+                /* count */
                 (output_byte(encoder_output, context, (elements & 0xFF)) != 0))
-			{
-				/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+            {
+                /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
                 LogError("Could not encode map header");
-				result = __FAILURE__;
-			}
-			else
-			{
-				/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-				result = 0;
-			}
-		}
-		else
-		{
-			size += 4;
-
-			/* Codes_SRS_AMQPVALUE_01_307: [<encoding name="map32" code="0xd1" category="compound" width="4" label="up to 2^32 - 1 octets of encoded map data"/>] */
-			if ((output_byte(encoder_output, context, 0xD1) != 0) ||
-				/* size */
-				(output_byte(encoder_output, context, (size >> 24) & 0xFF) != 0) ||
-				(output_byte(encoder_output, context, (size >> 16) & 0xFF) != 0) ||
-				(output_byte(encoder_output, context, (size >> 8) & 0xFF) != 0) ||
-				(output_byte(encoder_output, context, size & 0xFF) != 0) ||
-				/* count */
+                result = __FAILURE__;
+            }
+            else
+            {
+                /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+                result = 0;
+            }
+        }
+        else
+        {
+            size += 4;
+
+            /* Codes_SRS_AMQPVALUE_01_307: [<encoding name="map32" code="0xd1" category="compound" width="4" label="up to 2^32 - 1 octets of encoded map data"/>] */
+            if ((output_byte(encoder_output, context, 0xD1) != 0) ||
+                /* size */
+                (output_byte(encoder_output, context, (size >> 24) & 0xFF) != 0) ||
+                (output_byte(encoder_output, context, (size >> 16) & 0xFF) != 0) ||
+                (output_byte(encoder_output, context, (size >> 8) & 0xFF) != 0) ||
+                (output_byte(encoder_output, context, size & 0xFF) != 0) ||
+                /* count */
                 (output_byte(encoder_output, context, (elements >> 24) & 0xFF) != 0) ||
                 (output_byte(encoder_output, context, (elements >> 16) & 0xFF) != 0) ||
                 (output_byte(encoder_output, context, (elements >> 8) & 0xFF) != 0) ||
                 (output_byte(encoder_output, context, elements & 0xFF) != 0))
-			{
-				/* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
+            {
+                /* Codes_SRS_AMQPVALUE_01_274: [When the encoder output function fails, amqpvalue_encode shall fail and return a non-zero value.] */
                 LogError("Could not encode map header");
-				result = __FAILURE__;
-			}
-			else
-			{
-				/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-				result = 0;
-			}
-		}
-
-		if (result == 0)
-		{
+                result = __FAILURE__;
+            }
+            else
+            {
+                /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+                result = 0;
+            }
+        }
+
+        if (result == 0)
+        {
             /* Codes_SRS_AMQPVALUE_01_123: [A map is encoded as a compound value where the constituent elements form alternating key value pairs.] */
             for (i = 0; i < count; i++)
-			{
-				if ((amqpvalue_encode(pairs[i].key, encoder_output, context) != 0) ||
-					(amqpvalue_encode(pairs[i].value, encoder_output, context) != 0))
-				{
+            {
+                if ((amqpvalue_encode(pairs[i].key, encoder_output, context) != 0) ||
+                    (amqpvalue_encode(pairs[i].value, encoder_output, context) != 0))
+                {
                     LogError("Failed encoding map element %u", (unsigned int)i);
                     break;
-				}
-			}
-
-			if (i < count)
-			{
+                }
+            }
+
+            if (i < count)
+            {
                 LogError("Could not encode map");
-				result = __FAILURE__;
-			}
-			else
-			{
-				result = 0;
-			}
-		}
-	}
-
-	return result;
+                result = __FAILURE__;
+            }
+            else
+            {
+                result = 0;
+            }
+        }
+    }
+
+    return result;
 }
 
 static int encode_descriptor_header(AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context)
 {
-	int result;
+    int result;
 
     if (output_byte(encoder_output, context, 0x00) != 0)
     {
@@ -3059,75 +3061,75 @@
         result = 0;
     }
 
-	return result;
+    return result;
 }
 
 /* Codes_SRS_AMQPVALUE_01_265: [amqpvalue_encode shall encode the value per the ISO.] */
 int amqpvalue_encode(AMQP_VALUE value, AMQPVALUE_ENCODER_OUTPUT encoder_output, void* context)
 {
-	int result;
-
-	/* Codes_SRS_AMQPVALUE_01_269: [If value or encoder_output are NULL, amqpvalue_encode shall fail and return a non-zero value.] */
-	if ((value == NULL) ||
-		(encoder_output == NULL))
-	{
+    int result;
+
+    /* Codes_SRS_AMQPVALUE_01_269: [If value or encoder_output are NULL, amqpvalue_encode shall fail and return a non-zero value.] */
+    if ((value == NULL) ||
+        (encoder_output == NULL))
+    {
         LogError("Bad arguments: value = %p, encoder_output = %p",
             value, encoder_output);
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-
-		switch (value_data->type)
-		{
-		default:
-			/* Codes_SRS_AMQPVALUE_01_271: [If encoding fails due to any error not specifically mentioned here, it shall return a non-zero value.] */
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+
+        switch (value_data->type)
+        {
+        default:
+            /* Codes_SRS_AMQPVALUE_01_271: [If encoding fails due to any error not specifically mentioned here, it shall return a non-zero value.] */
             LogError("Invalid type: %d", (int)value_data->type);
             result = __FAILURE__;
-			break;
-
-		case AMQP_TYPE_NULL:
-			/* Codes_SRS_AMQPVALUE_01_264: [<encoding code="0x40" category="fixed" width="0" label="the null value"/>] */
-			/* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
-			result = output_byte(encoder_output, context, (unsigned char)0x40);
-			break;
-
-		case AMQP_TYPE_BOOL:
-			result = encode_boolean(encoder_output, context, value_data->value.bool_value);
-			break;
-
-		case AMQP_TYPE_UBYTE:
-			result = encode_ubyte(encoder_output, context, value_data->value.ubyte_value);
-			break;
-
-		case AMQP_TYPE_USHORT:
-			result = encode_ushort(encoder_output, context, value_data->value.ushort_value);
-			break;
-
-		case AMQP_TYPE_UINT:
-			result = encode_uint(encoder_output, context, value_data->value.uint_value);
-			break;
-
-		case AMQP_TYPE_ULONG:
-			result = encode_ulong(encoder_output, context, value_data->value.ulong_value);
-			break;
-
-		case AMQP_TYPE_BYTE:
-			result = encode_byte(encoder_output, context, value_data->value.byte_value);
-			break;
-
-		case AMQP_TYPE_SHORT:
-			result = encode_short(encoder_output, context, value_data->value.short_value);
-			break;
-
-		case AMQP_TYPE_INT:
-			result = encode_int(encoder_output, context, value_data->value.int_value);
-			break;
-
-		case AMQP_TYPE_LONG:
-			result = encode_long(encoder_output, context, value_data->value.long_value);
-			break;
+            break;
+
+        case AMQP_TYPE_NULL:
+            /* Codes_SRS_AMQPVALUE_01_264: [<encoding code="0x40" category="fixed" width="0" label="the null value"/>] */
+            /* Codes_SRS_AMQPVALUE_01_266: [On success amqpvalue_encode shall return 0.] */
+            result = output_byte(encoder_output, context, (unsigned char)0x40);
+            break;
+
+        case AMQP_TYPE_BOOL:
+            result = encode_boolean(encoder_output, context, value_data->value.bool_value);
+            break;
+
+        case AMQP_TYPE_UBYTE:
+            result = encode_ubyte(encoder_output, context, value_data->value.ubyte_value);
+            break;
+
+        case AMQP_TYPE_USHORT:
+            result = encode_ushort(encoder_output, context, value_data->value.ushort_value);
+            break;
+
+        case AMQP_TYPE_UINT:
+            result = encode_uint(encoder_output, context, value_data->value.uint_value);
+            break;
+
+        case AMQP_TYPE_ULONG:
+            result = encode_ulong(encoder_output, context, value_data->value.ulong_value);
+            break;
+
+        case AMQP_TYPE_BYTE:
+            result = encode_byte(encoder_output, context, value_data->value.byte_value);
+            break;
+
+        case AMQP_TYPE_SHORT:
+            result = encode_short(encoder_output, context, value_data->value.short_value);
+            break;
+
+        case AMQP_TYPE_INT:
+            result = encode_int(encoder_output, context, value_data->value.int_value);
+            break;
+
+        case AMQP_TYPE_LONG:
+            result = encode_long(encoder_output, context, value_data->value.long_value);
+            break;
 
         case AMQP_TYPE_FLOAT:
             result = encode_float(encoder_output, context, value_data->value.float_value);
@@ -3137,61 +3139,61 @@
             result = encode_double(encoder_output, context, value_data->value.double_value);
             break;
 
-		case AMQP_TYPE_TIMESTAMP:
-			result = encode_timestamp(encoder_output, context, value_data->value.timestamp_value);
-			break;
-
-		case AMQP_TYPE_UUID:
-			result = encode_uuid(encoder_output, context, value_data->value.uuid_value);
-			break;
-
-		case AMQP_TYPE_BINARY:
-			result = encode_binary(encoder_output, context, (const unsigned char*)value_data->value.binary_value.bytes, value_data->value.binary_value.length);
-			break;
-
-		case AMQP_TYPE_STRING:
-			result = encode_string(encoder_output, context, value_data->value.string_value.chars);
-			break;
-
-		case AMQP_TYPE_SYMBOL:
-			result = encode_symbol(encoder_output, context, value_data->value.symbol_value.chars);
-			break;
-
-		case AMQP_TYPE_LIST:
-			result = encode_list(encoder_output, context, value_data->value.list_value.count, value_data->value.list_value.items);
-			break;
-
-		case AMQP_TYPE_MAP:
-			result = encode_map(encoder_output, context, value_data->value.map_value.pair_count, value_data->value.map_value.pairs);
-			break;
-
-		case AMQP_TYPE_COMPOSITE:
-		case AMQP_TYPE_DESCRIBED:
-		{
-			if ((encode_descriptor_header(encoder_output, context) != 0) ||
-				(amqpvalue_encode(value_data->value.described_value.descriptor, encoder_output, context) != 0) ||
-				(amqpvalue_encode(value_data->value.described_value.value, encoder_output, context) != 0))
-			{
+        case AMQP_TYPE_TIMESTAMP:
+            result = encode_timestamp(encoder_output, context, value_data->value.timestamp_value);
+            break;
+
+        case AMQP_TYPE_UUID:
+            result = encode_uuid(encoder_output, context, value_data->value.uuid_value);
+            break;
+
+        case AMQP_TYPE_BINARY:
+            result = encode_binary(encoder_output, context, (const unsigned char*)value_data->value.binary_value.bytes, value_data->value.binary_value.length);
+            break;
+
+        case AMQP_TYPE_STRING:
+            result = encode_string(encoder_output, context, value_data->value.string_value.chars);
+            break;
+
+        case AMQP_TYPE_SYMBOL:
+            result = encode_symbol(encoder_output, context, value_data->value.symbol_value.chars);
+            break;
+
+        case AMQP_TYPE_LIST:
+            result = encode_list(encoder_output, context, value_data->value.list_value.count, value_data->value.list_value.items);
+            break;
+
+        case AMQP_TYPE_MAP:
+            result = encode_map(encoder_output, context, value_data->value.map_value.pair_count, value_data->value.map_value.pairs);
+            break;
+
+        case AMQP_TYPE_COMPOSITE:
+        case AMQP_TYPE_DESCRIBED:
+        {
+            if ((encode_descriptor_header(encoder_output, context) != 0) ||
+                (amqpvalue_encode(value_data->value.described_value.descriptor, encoder_output, context) != 0) ||
+                (amqpvalue_encode(value_data->value.described_value.value, encoder_output, context) != 0))
+            {
                 LogError("Failed encoding described or composite type");
                 result = __FAILURE__;
-			}
-			else
-			{
-				result = 0;
-			}
-
-			break;
-		}
-		}
-	}
-
-	return result;
+            }
+            else
+            {
+                result = 0;
+            }
+
+            break;
+        }
+        }
+    }
+
+    return result;
 }
 
 static int count_bytes(void* context, const unsigned char* bytes, size_t length)
 {
-	size_t* byte_count;
-	(void)bytes;
+    size_t* byte_count;
+    (void)bytes;
 
     byte_count = (size_t*)context;
     *byte_count += length;
@@ -3222,170 +3224,170 @@
 
 static void amqpvalue_clear(AMQP_VALUE_DATA* value_data)
 {
-	switch (value_data->type)
-	{
-	default:
+    switch (value_data->type)
+    {
+    default:
+        break;
+
+    case AMQP_TYPE_BINARY:
+        if (value_data->value.binary_value.bytes != NULL)
+        {
+            free((void*)value_data->value.binary_value.bytes);
+        }
+        break;
+    case AMQP_TYPE_STRING:
+        if (value_data->value.string_value.chars != NULL)
+        {
+            free(value_data->value.string_value.chars);
+        }
+        break;
+    case AMQP_TYPE_SYMBOL:
+        if (value_data->value.symbol_value.chars != NULL)
+        {
+            free(value_data->value.symbol_value.chars);
+        }
+        break;
+    case AMQP_TYPE_LIST:
+    {
+        size_t i;
+        for (i = 0; i < value_data->value.list_value.count; i++)
+        {
+            amqpvalue_destroy(value_data->value.list_value.items[i]);
+        }
+
+        free(value_data->value.list_value.items);
+        value_data->value.list_value.items = NULL;
         break;
-
-	case AMQP_TYPE_BINARY:
-		if (value_data->value.binary_value.bytes != NULL)
-		{
-			free((void*)value_data->value.binary_value.bytes);
-		}
-		break;
-	case AMQP_TYPE_STRING:
-		if (value_data->value.string_value.chars != NULL)
-		{
-			free(value_data->value.string_value.chars);
-		}
-		break;
-	case AMQP_TYPE_SYMBOL:
-		if (value_data->value.symbol_value.chars != NULL)
-		{
-			free(value_data->value.symbol_value.chars);
-		}
-		break;
-	case AMQP_TYPE_LIST:
-	{
-		size_t i;
-		for (i = 0; i < value_data->value.list_value.count; i++)
-		{
-			amqpvalue_destroy(value_data->value.list_value.items[i]);
-		}
-
-		free(value_data->value.list_value.items);
-		value_data->value.list_value.items = NULL;
-		break;
-	}
-	case AMQP_TYPE_MAP:
-	{
-		size_t i;
-		for (i = 0; i < value_data->value.map_value.pair_count; i++)
-		{
-			amqpvalue_destroy(value_data->value.map_value.pairs[i].key);
-			amqpvalue_destroy(value_data->value.map_value.pairs[i].value);
-		}
-
-		free(value_data->value.map_value.pairs);
-		value_data->value.map_value.pairs = NULL;
-		break;
-	}
-	case AMQP_TYPE_ARRAY:
-	{
-		size_t i;
-		for (i = 0; i < value_data->value.array_value.count; i++)
-		{
-			amqpvalue_destroy(value_data->value.array_value.items[i]);
-		}
-
-		free(value_data->value.array_value.items);
-		value_data->value.array_value.items = NULL;
-		break;
-	}
-	case AMQP_TYPE_COMPOSITE:
-	case AMQP_TYPE_DESCRIBED:
-		amqpvalue_destroy(value_data->value.described_value.descriptor);
-		amqpvalue_destroy(value_data->value.described_value.value);
-		break;
-	}
-
-	value_data->type = AMQP_TYPE_UNKNOWN;
+    }
+    case AMQP_TYPE_MAP:
+    {
+        size_t i;
+        for (i = 0; i < value_data->value.map_value.pair_count; i++)
+        {
+            amqpvalue_destroy(value_data->value.map_value.pairs[i].key);
+            amqpvalue_destroy(value_data->value.map_value.pairs[i].value);
+        }
+
+        free(value_data->value.map_value.pairs);
+        value_data->value.map_value.pairs = NULL;
+        break;
+    }
+    case AMQP_TYPE_ARRAY:
+    {
+        size_t i;
+        for (i = 0; i < value_data->value.array_value.count; i++)
+        {
+            amqpvalue_destroy(value_data->value.array_value.items[i]);
+        }
+
+        free(value_data->value.array_value.items);
+        value_data->value.array_value.items = NULL;
+        break;
+    }
+    case AMQP_TYPE_COMPOSITE:
+    case AMQP_TYPE_DESCRIBED:
+        amqpvalue_destroy(value_data->value.described_value.descriptor);
+        amqpvalue_destroy(value_data->value.described_value.value);
+        break;
+    }
+
+    value_data->type = AMQP_TYPE_UNKNOWN;
 }
 
 void amqpvalue_destroy(AMQP_VALUE value)
 {
-	/* Codes_SRS_AMQPVALUE_01_315: [If the value argument is NULL, amqpvalue_destroy shall do nothing.] */
+    /* Codes_SRS_AMQPVALUE_01_315: [If the value argument is NULL, amqpvalue_destroy shall do nothing.] */
     if (value == NULL)
     {
         LogError("NULL value");
     }
     else
     {
-		if (DEC_REF(AMQP_VALUE_DATA, value) == DEC_RETURN_ZERO)
-		{
-			/* Codes_SRS_AMQPVALUE_01_314: [amqpvalue_destroy shall free all resources allocated by any of the amqpvalue_create_xxx functions or amqpvalue_clone.] */
-			AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-			amqpvalue_clear(value_data);
-			free(value);
-		}
-	}
+        if (DEC_REF(AMQP_VALUE_DATA, value) == DEC_RETURN_ZERO)
+        {
+            /* Codes_SRS_AMQPVALUE_01_314: [amqpvalue_destroy shall free all resources allocated by any of the amqpvalue_create_xxx functions or amqpvalue_clone.] */
+            AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+            amqpvalue_clear(value_data);
+            free(value);
+        }
+    }
 }
 
 static INTERNAL_DECODER_DATA* internal_decoder_create(ON_VALUE_DECODED on_value_decoded, void* callback_context, AMQP_VALUE_DATA* value_data, bool is_internal)
 {
-	INTERNAL_DECODER_DATA* internal_decoder_data = (INTERNAL_DECODER_DATA*)malloc(sizeof(INTERNAL_DECODER_DATA));
-	if (internal_decoder_data == NULL)
+    INTERNAL_DECODER_DATA* internal_decoder_data = (INTERNAL_DECODER_DATA*)malloc(sizeof(INTERNAL_DECODER_DATA));
+    if (internal_decoder_data == NULL)
     {
         LogError("Cannot allocate memory for internal decoder structure");
     }
     else
     {
-		internal_decoder_data->is_internal = is_internal;
-		internal_decoder_data->on_value_decoded = on_value_decoded;
-		internal_decoder_data->on_value_decoded_context = callback_context;
-		internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-		internal_decoder_data->inner_decoder = NULL;
-		internal_decoder_data->decode_to_value = value_data;
-	}
-
-	return internal_decoder_data;
+        internal_decoder_data->is_internal = is_internal;
+        internal_decoder_data->on_value_decoded = on_value_decoded;
+        internal_decoder_data->on_value_decoded_context = callback_context;
+        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+        internal_decoder_data->inner_decoder = NULL;
+        internal_decoder_data->decode_to_value = value_data;
+    }
+
+    return internal_decoder_data;
 }
 
 static void internal_decoder_destroy(INTERNAL_DECODER_DATA* internal_decoder)
 {
-	if (internal_decoder != NULL)
-	{
-		internal_decoder_destroy(internal_decoder->inner_decoder);
-		free(internal_decoder);
-	}
+    if (internal_decoder != NULL)
+    {
+        internal_decoder_destroy(internal_decoder->inner_decoder);
+        free(internal_decoder);
+    }
 }
 
 static void inner_decoder_callback(void* context, AMQP_VALUE decoded_value)
 {
     /* API issue: the decoded_value should be removed completely:
     TODO: uAMQP: inner_decoder_callback in amqpvalue.c could probably do without the decoded_value ... */
-	INTERNAL_DECODER_DATA* internal_decoder_data = (INTERNAL_DECODER_DATA*)context;
-	INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
+    INTERNAL_DECODER_DATA* internal_decoder_data = (INTERNAL_DECODER_DATA*)context;
+    INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
     (void)decoded_value;
-	inner_decoder->decoder_state = DECODER_STATE_DONE;
+    inner_decoder->decoder_state = DECODER_STATE_DONE;
 }
 
 static int internal_decoder_decode_bytes(INTERNAL_DECODER_DATA* internal_decoder_data, const unsigned char* buffer, size_t size, size_t* used_bytes)
 {
-	int result;
-	size_t initial_size = size;
-
-	if (internal_decoder_data == NULL)
-	{
+    int result;
+    size_t initial_size = size;
+
+    if (internal_decoder_data == NULL)
+    {
         /* TODO: investigate if this check is even needed */
         LogError("NULL internal_decoder_data");
         result = __FAILURE__;
-	}
-	else
-	{
-		result = 0;
-		/* Codes_SRS_AMQPVALUE_01_322: [amqpvalue_decode_bytes shall process the bytes byte by byte, as a stream.] */
-		while ((size > 0) && (internal_decoder_data->decoder_state != DECODER_STATE_DONE))
-		{
-			switch (internal_decoder_data->decoder_state)
-			{
-			default:
+    }
+    else
+    {
+        result = 0;
+        /* Codes_SRS_AMQPVALUE_01_322: [amqpvalue_decode_bytes shall process the bytes byte by byte, as a stream.] */
+        while ((size > 0) && (internal_decoder_data->decoder_state != DECODER_STATE_DONE))
+        {
+            switch (internal_decoder_data->decoder_state)
+            {
+            default:
                 LogError("Invalid decoder state: %d", (int)internal_decoder_data->decoder_state);
-				result = __FAILURE__;
-				break;
-
-			case DECODER_STATE_CONSTRUCTOR:
-			{
-				if ((internal_decoder_data->decode_to_value != NULL) && (!internal_decoder_data->is_internal))
-				{
-					amqpvalue_destroy(internal_decoder_data->decode_to_value);
-					internal_decoder_data->decode_to_value = NULL;
-				}
-
-				if (internal_decoder_data->decode_to_value == NULL)
-				{
-					internal_decoder_data->decode_to_value = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-				}
+                result = __FAILURE__;
+                break;
+
+            case DECODER_STATE_CONSTRUCTOR:
+            {
+                if ((internal_decoder_data->decode_to_value != NULL) && (!internal_decoder_data->is_internal))
+                {
+                    amqpvalue_destroy(internal_decoder_data->decode_to_value);
+                    internal_decoder_data->decode_to_value = NULL;
+                }
+
+                if (internal_decoder_data->decode_to_value == NULL)
+                {
+                    internal_decoder_data->decode_to_value = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+                }
 
                 if (internal_decoder_data->decode_to_value == NULL)
                 {
@@ -3394,23 +3396,23 @@
                     break;
                 }
 
-				internal_decoder_data->constructor_byte = buffer[0];
-				buffer++;
-				size--;
-
-				switch (internal_decoder_data->constructor_byte)
-				{
-				default:
-					internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                internal_decoder_data->constructor_byte = buffer[0];
+                buffer++;
+                size--;
+
+                switch (internal_decoder_data->constructor_byte)
+                {
+                default:
+                    internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                     LogError("Invalid constructor byte: 0x%02x", internal_decoder_data->constructor_byte);
                     result = __FAILURE__;
-					break;
-
-				case 0x00: /* descriptor */
+                    break;
+
+                case 0x00: /* descriptor */
                 {
-					AMQP_VALUE_DATA* descriptor;
+                    AMQP_VALUE_DATA* descriptor;
                     internal_decoder_data->decode_to_value->type = AMQP_TYPE_DESCRIBED;
-					descriptor = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+                    descriptor = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
                     if (descriptor == NULL)
                     {
                         internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
@@ -3439,76 +3441,76 @@
                     break;
                 }
 
-				/* Codes_SRS_AMQPVALUE_01_329: [<encoding code="0x40" category="fixed" width="0" label="the null value"/>] */
-				case 0x40:
-				{
-					/* Codes_SRS_AMQPVALUE_01_328: [1.6.1 null Indicates an empty value.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_NULL;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-
-					break;
-				}
-
-				/* Codes_SRS_AMQPVALUE_01_331: [<encoding code="0x56" category="fixed" width="1" label="boolean with the octet 0x00 being false and octet 0x01 being true"/>] */
-				case 0x56:
-				{
-					/* Codes_SRS_AMQPVALUE_01_330: [1.6.2 boolean Represents a true or false value.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_BOOL;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->bytes_decoded = 0;
-				
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_332: [<encoding name="true" code="0x41" category="fixed" width="0" label="the boolean value true"/>] */
-				case 0x41:
-				{
-					/* Codes_SRS_AMQPVALUE_01_330: [1.6.2 boolean Represents a true or false value.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_BOOL;
-					internal_decoder_data->decode_to_value->value.bool_value = true;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_333: [<encoding name="false" code="0x42" category="fixed" width="0" label="the boolean value false"/>] */
-				case 0x42:
-				{
-					/* Codes_SRS_AMQPVALUE_01_330: [1.6.2 boolean Represents a true or false value.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_BOOL;
-					internal_decoder_data->decode_to_value->value.bool_value = false;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_335: [<encoding code="0x50" category="fixed" width="1" label="8-bit unsigned integer"/>] */
-				case 0x50:
-				{
-					/* Codes_SRS_AMQPVALUE_01_334: [1.6.3 ubyte Integer in the range 0 to 28 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_UBYTE;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.ubyte_value = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
+                /* Codes_SRS_AMQPVALUE_01_329: [<encoding code="0x40" category="fixed" width="0" label="the null value"/>] */
+                case 0x40:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_328: [1.6.1 null Indicates an empty value.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_NULL;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+
+                    break;
+                }
+
+                /* Codes_SRS_AMQPVALUE_01_331: [<encoding code="0x56" category="fixed" width="1" label="boolean with the octet 0x00 being false and octet 0x01 being true"/>] */
+                case 0x56:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_330: [1.6.2 boolean Represents a true or false value.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_BOOL;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->bytes_decoded = 0;
+                
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_332: [<encoding name="true" code="0x41" category="fixed" width="0" label="the boolean value true"/>] */
+                case 0x41:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_330: [1.6.2 boolean Represents a true or false value.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_BOOL;
+                    internal_decoder_data->decode_to_value->value.bool_value = true;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_333: [<encoding name="false" code="0x42" category="fixed" width="0" label="the boolean value false"/>] */
+                case 0x42:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_330: [1.6.2 boolean Represents a true or false value.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_BOOL;
+                    internal_decoder_data->decode_to_value->value.bool_value = false;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_335: [<encoding code="0x50" category="fixed" width="1" label="8-bit unsigned integer"/>] */
+                case 0x50:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_334: [1.6.3 ubyte Integer in the range 0 to 28 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_UBYTE;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.ubyte_value = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
                 /* Codes_SRS_AMQPVALUE_01_337: [<encoding code="0x60" category="fixed" width="2" label="16-bit unsigned integer in network byte order"/>] */
                 case 0x60:
                 {
@@ -3522,151 +3524,151 @@
                     result = 0;
                     break;
                 }
-				/* Codes_SRS_AMQPVALUE_01_339: [<encoding code="0x70" category="fixed" width="4" label="32-bit unsigned integer in network byte order"/>] */
-				case 0x70:
-				/* Codes_SRS_AMQPVALUE_01_340: [<encoding name="smalluint" code="0x52" category="fixed" width="1" label="unsigned integer value in the range 0 to 255 inclusive"/>] */
-				case 0x52:
-				{
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_UINT;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.uint_value = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_341: [<encoding name="uint0" code="0x43" category="fixed" width="0" label="the uint value 0"/>] */
-				case 0x43:
+                /* Codes_SRS_AMQPVALUE_01_339: [<encoding code="0x70" category="fixed" width="4" label="32-bit unsigned integer in network byte order"/>] */
+                case 0x70:
+                /* Codes_SRS_AMQPVALUE_01_340: [<encoding name="smalluint" code="0x52" category="fixed" width="1" label="unsigned integer value in the range 0 to 255 inclusive"/>] */
+                case 0x52:
                 {
-					/* Codes_SRS_AMQPVALUE_01_338: [1.6.5 uint Integer in the range 0 to 232 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_UINT;
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_UINT;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.uint_value = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_341: [<encoding name="uint0" code="0x43" category="fixed" width="0" label="the uint value 0"/>] */
+                case 0x43:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_338: [1.6.5 uint Integer in the range 0 to 232 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_UINT;
                     internal_decoder_data->decode_to_value->value.uint_value = 0;
                     internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-					
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_343: [<encoding code="0x80" category="fixed" width="8" label="64-bit unsigned integer in network byte order"/>] */
+                case 0x80:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_342: [1.6.6 ulong Integer in the range 0 to 264 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_ULONG;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.ulong_value = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    internal_decoder_data->bytes_decoded = 0;
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_344: [<encoding name="smallulong" code="0x53" category="fixed" width="1" label="unsigned long value in the range 0 to 255 inclusive"/>] */
+                case 0x53:
+                {
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_ULONG;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.ulong_value = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    internal_decoder_data->bytes_decoded = 0;
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_345: [<encoding name="ulong0" code="0x44" category="fixed" width="0" label="the ulong value 0"/>] */
+                case 0x44:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_342: [1.6.6 ulong Integer in the range 0 to 264 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_ULONG;
+                    internal_decoder_data->decode_to_value->value.ulong_value = 0;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
                     result = 0;
                     break;
                 }
-				/* Codes_SRS_AMQPVALUE_01_343: [<encoding code="0x80" category="fixed" width="8" label="64-bit unsigned integer in network byte order"/>] */
-				case 0x80:
-				{
-					/* Codes_SRS_AMQPVALUE_01_342: [1.6.6 ulong Integer in the range 0 to 264 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_ULONG;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.ulong_value = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					internal_decoder_data->bytes_decoded = 0;
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_344: [<encoding name="smallulong" code="0x53" category="fixed" width="1" label="unsigned long value in the range 0 to 255 inclusive"/>] */
-				case 0x53:
-				{
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_ULONG;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.ulong_value = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					internal_decoder_data->bytes_decoded = 0;
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_345: [<encoding name="ulong0" code="0x44" category="fixed" width="0" label="the ulong value 0"/>] */
-				case 0x44:
-				{
-					/* Codes_SRS_AMQPVALUE_01_342: [1.6.6 ulong Integer in the range 0 to 264 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_ULONG;
-					internal_decoder_data->decode_to_value->value.ulong_value = 0;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_347: [<encoding code="0x51" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-				case 0x51:
-				{
-					/* Codes_SRS_AMQPVALUE_01_346: [1.6.7 byte Integer in the range -(27) to 27 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_BYTE;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.byte_value = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_349: [<encoding code="0x61" category="fixed" width="2" label="16-bit two's-complement integer in network byte order"/>] */
-				case 0x61:
-				{
-					/* Codes_SRS_AMQPVALUE_01_348: [1.6.8 short Integer in the range -(215) to 215 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_SHORT;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.short_value = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_351: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
-				case 0x71:
-				{
-					/* Codes_SRS_AMQPVALUE_01_350: [1.6.9 int Integer in the range -(231) to 231 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_INT;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.int_value = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_352: [<encoding name="smallint" code="0x54" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-				case 0x54:
-				{
-					/* Codes_SRS_AMQPVALUE_01_350: [1.6.9 int Integer in the range -(231) to 231 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_INT;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.int_value = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_354: [<encoding code="0x81" category="fixed" width="8" label="64-bit two's-complement integer in network byte order"/>] */
-				case 0x81:
-				{
-					/* Codes_SRS_AMQPVALUE_01_353: [1.6.10 long Integer in the range -(263) to 263 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_LONG;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.long_value = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_355: [<encoding name="smalllong" code="0x55" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-				case 0x55:
-				{
-					/* Codes_SRS_AMQPVALUE_01_353: [1.6.10 long Integer in the range -(263) to 263 - 1 inclusive.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_LONG;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.long_value = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
+                /* Codes_SRS_AMQPVALUE_01_347: [<encoding code="0x51" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+                case 0x51:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_346: [1.6.7 byte Integer in the range -(27) to 27 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_BYTE;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.byte_value = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_349: [<encoding code="0x61" category="fixed" width="2" label="16-bit two's-complement integer in network byte order"/>] */
+                case 0x61:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_348: [1.6.8 short Integer in the range -(215) to 215 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_SHORT;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.short_value = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_351: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
+                case 0x71:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_350: [1.6.9 int Integer in the range -(231) to 231 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_INT;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.int_value = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_352: [<encoding name="smallint" code="0x54" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+                case 0x54:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_350: [1.6.9 int Integer in the range -(231) to 231 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_INT;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.int_value = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_354: [<encoding code="0x81" category="fixed" width="8" label="64-bit two's-complement integer in network byte order"/>] */
+                case 0x81:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_353: [1.6.10 long Integer in the range -(263) to 263 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_LONG;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.long_value = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_355: [<encoding name="smalllong" code="0x55" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+                case 0x55:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_353: [1.6.10 long Integer in the range -(263) to 263 - 1 inclusive.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_LONG;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.long_value = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
                 /* Codes_SRS_AMQPVALUE_01_289: [\<encoding name="ieee-754" code="0x72" category="fixed" width="4" label="IEEE 754-2008 binary32"/>] */
                 case 0x72:
                 {
@@ -3694,275 +3696,275 @@
                     break;
                 }
                 /* Codes_SRS_AMQPVALUE_01_369: [<encoding name="ms64" code="0x83" category="fixed" width="8" label="64-bit two's-complement integer representing milliseconds since the unix epoch"/>] */
-				case 0x83:
-				{
-					/* Codes_SRS_AMQPVALUE_01_368: [1.6.17 timestamp An absolute point in time.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_TIMESTAMP;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.timestamp_value = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_371: [<encoding code="0x98" category="fixed" width="16" label="UUID as defined in section 4.1.2 of RFC-4122"/>] */
-				case 0x98:
-				{
-					/* Codes_SRS_AMQPVALUE_01_370: [1.6.18 uuid A universally unique identifier as defined by RFC-4122 section 4.1.2 .] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_UUID;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.timestamp_value = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_373: [<encoding name="vbin8" code="0xa0" category="variable" width="1" label="up to 2^8 - 1 octets of binary data"/>] */
-				case 0xA0:
-				/* Codes_SRS_AMQPVALUE_01_374: [<encoding name="vbin32" code="0xb0" category="variable" width="4" label="up to 2^32 - 1 octets of binary data"/>] */
-				case 0xB0:
-				{
-					/* Codes_SRS_AMQPVALUE_01_372: [1.6.19 binary A sequence of octets.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_BINARY;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.binary_value.length = 0;
-					internal_decoder_data->decode_to_value->value.binary_value.bytes = NULL;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_376: [<encoding name="str8-utf8" code="0xa1" category="variable" width="1" label="up to 2^8 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
-				case 0xA1:
-				/* Codes_SRS_AMQPVALUE_01_377: [<encoding name="str32-utf8" code="0xb1" category="variable" width="4" label="up to 2^32 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
-				case 0xB1:
-				{
-					/* Codes_SRS_AMQPVALUE_01_375: [1.6.20 string A sequence of Unicode characters.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_STRING;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.string_value.chars = NULL;
-					internal_decoder_data->decode_value_state.string_value_state.length = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_379: [<encoding name="sym8" code="0xa3" category="variable" width="1" label="up to 2^8 - 1 seven bit ASCII characters representing a symbolic value"/>] */
-				case 0xA3:
-				/* Codes_SRS_AMQPVALUE_01_380: [<encoding name="sym32" code="0xb3" category="variable" width="4" label="up to 2^32 - 1 seven bit ASCII characters representing a symbolic value"/>] */
-				case 0xB3:
-				{
-					/* Codes_SRS_AMQPVALUE_01_378: [1.6.21 symbol Symbolic values from a constrained domain.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_SYMBOL;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.symbol_value.chars = NULL;
-					internal_decoder_data->decode_value_state.symbol_value_state.length = 0;
-					internal_decoder_data->bytes_decoded = 0;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_384: [<encoding name="list0" code="0x45" category="fixed" width="0" label="the empty list (i.e. the list with no elements)"/>] */
-				case 0x45:
-					/* Codes_SRS_AMQPVALUE_01_383: [1.6.22 list A sequence of polymorphic values.] */
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_LIST;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-					internal_decoder_data->decode_to_value->value.list_value.count = 0;
-					internal_decoder_data->decode_to_value->value.list_value.items = NULL;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-
-				/* Codes_SRS_AMQPVALUE_01_385: [<encoding name="list8" code="0xc0" category="compound" width="1" label="up to 2^8 - 1 list elements with total size less than 2^8 octets"/>] */
-				case 0xC0:
-				case 0xD0:
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_LIST;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.list_value.count = 0;
-					internal_decoder_data->decode_to_value->value.list_value.items = NULL;
-					internal_decoder_data->bytes_decoded = 0;
-					internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_SIZE;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					result = 0;
-					break;
-
-				case 0xC1:
-				case 0xD1:
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_MAP;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.map_value.pair_count = 0;
-					internal_decoder_data->decode_to_value->value.map_value.pairs = NULL;
-					internal_decoder_data->bytes_decoded = 0;
-					internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_SIZE;
-
-					result = 0;
-					break;
-
-				case 0xE0:
-				case 0xF0:
-					internal_decoder_data->decode_to_value->type = AMQP_TYPE_ARRAY;
-					internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
-					internal_decoder_data->decode_to_value->value.array_value.count = 0;
-					internal_decoder_data->decode_to_value->value.array_value.items = NULL;
-					internal_decoder_data->bytes_decoded = 0;
-					internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_SIZE;
-
-					result = 0;
-					break;
-				}
-				break;
-			}
-
-			case DECODER_STATE_TYPE_DATA:
-			{
-				switch (internal_decoder_data->constructor_byte)
-				{
-				default:
+                case 0x83:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_368: [1.6.17 timestamp An absolute point in time.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_TIMESTAMP;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.timestamp_value = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_371: [<encoding code="0x98" category="fixed" width="16" label="UUID as defined in section 4.1.2 of RFC-4122"/>] */
+                case 0x98:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_370: [1.6.18 uuid A universally unique identifier as defined by RFC-4122 section 4.1.2 .] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_UUID;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.timestamp_value = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_373: [<encoding name="vbin8" code="0xa0" category="variable" width="1" label="up to 2^8 - 1 octets of binary data"/>] */
+                case 0xA0:
+                /* Codes_SRS_AMQPVALUE_01_374: [<encoding name="vbin32" code="0xb0" category="variable" width="4" label="up to 2^32 - 1 octets of binary data"/>] */
+                case 0xB0:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_372: [1.6.19 binary A sequence of octets.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_BINARY;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.binary_value.length = 0;
+                    internal_decoder_data->decode_to_value->value.binary_value.bytes = NULL;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_376: [<encoding name="str8-utf8" code="0xa1" category="variable" width="1" label="up to 2^8 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
+                case 0xA1:
+                /* Codes_SRS_AMQPVALUE_01_377: [<encoding name="str32-utf8" code="0xb1" category="variable" width="4" label="up to 2^32 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
+                case 0xB1:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_375: [1.6.20 string A sequence of Unicode characters.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_STRING;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.string_value.chars = NULL;
+                    internal_decoder_data->decode_value_state.string_value_state.length = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_379: [<encoding name="sym8" code="0xa3" category="variable" width="1" label="up to 2^8 - 1 seven bit ASCII characters representing a symbolic value"/>] */
+                case 0xA3:
+                /* Codes_SRS_AMQPVALUE_01_380: [<encoding name="sym32" code="0xb3" category="variable" width="4" label="up to 2^32 - 1 seven bit ASCII characters representing a symbolic value"/>] */
+                case 0xB3:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_378: [1.6.21 symbol Symbolic values from a constrained domain.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_SYMBOL;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.symbol_value.chars = NULL;
+                    internal_decoder_data->decode_value_state.symbol_value_state.length = 0;
+                    internal_decoder_data->bytes_decoded = 0;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_384: [<encoding name="list0" code="0x45" category="fixed" width="0" label="the empty list (i.e. the list with no elements)"/>] */
+                case 0x45:
+                    /* Codes_SRS_AMQPVALUE_01_383: [1.6.22 list A sequence of polymorphic values.] */
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_LIST;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+                    internal_decoder_data->decode_to_value->value.list_value.count = 0;
+                    internal_decoder_data->decode_to_value->value.list_value.items = NULL;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+
+                /* Codes_SRS_AMQPVALUE_01_385: [<encoding name="list8" code="0xc0" category="compound" width="1" label="up to 2^8 - 1 list elements with total size less than 2^8 octets"/>] */
+                case 0xC0:
+                case 0xD0:
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_LIST;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.list_value.count = 0;
+                    internal_decoder_data->decode_to_value->value.list_value.items = NULL;
+                    internal_decoder_data->bytes_decoded = 0;
+                    internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_SIZE;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    result = 0;
+                    break;
+
+                case 0xC1:
+                case 0xD1:
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_MAP;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.map_value.pair_count = 0;
+                    internal_decoder_data->decode_to_value->value.map_value.pairs = NULL;
+                    internal_decoder_data->bytes_decoded = 0;
+                    internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_SIZE;
+
+                    result = 0;
+                    break;
+
+                case 0xE0:
+                case 0xF0:
+                    internal_decoder_data->decode_to_value->type = AMQP_TYPE_ARRAY;
+                    internal_decoder_data->decoder_state = DECODER_STATE_TYPE_DATA;
+                    internal_decoder_data->decode_to_value->value.array_value.count = 0;
+                    internal_decoder_data->decode_to_value->value.array_value.items = NULL;
+                    internal_decoder_data->bytes_decoded = 0;
+                    internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_SIZE;
+
+                    result = 0;
+                    break;
+                }
+                break;
+            }
+
+            case DECODER_STATE_TYPE_DATA:
+            {
+                switch (internal_decoder_data->constructor_byte)
+                {
+                default:
                     LogError("Invalid constructor byte: 0x%02x", internal_decoder_data->constructor_byte);
                     result = __FAILURE__;
                     break;
 
-				case 0x00: /* descriptor */
-				{
-					DECODE_DESCRIBED_VALUE_STEP step = internal_decoder_data->decode_value_state.described_value_state.described_value_state;
-					switch (step)
-					{
-					default:
+                case 0x00: /* descriptor */
+                {
+                    DECODE_DESCRIBED_VALUE_STEP step = internal_decoder_data->decode_value_state.described_value_state.described_value_state;
+                    switch (step)
+                    {
+                    default:
                         LogError("Invalid described value decode step: %d", step);
                         result = __FAILURE__;
-						break;
-
-					case DECODE_DESCRIBED_VALUE_STEP_DESCRIPTOR:
-					{
-						size_t inner_used_bytes;
-						if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
-						{
+                        break;
+
+                    case DECODE_DESCRIBED_VALUE_STEP_DESCRIPTOR:
+                    {
+                        size_t inner_used_bytes;
+                        if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
+                        {
                             LogError("Decoding bytes for described value failed");
                             result = __FAILURE__;
-						}
-						else
-						{
-							INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
-							buffer += inner_used_bytes;
-							size -= inner_used_bytes;
-
-							if (inner_decoder->decoder_state == DECODER_STATE_DONE)
-							{
-								AMQP_VALUE described_value;
-								internal_decoder_destroy(inner_decoder);
-
-								described_value = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-								if (described_value == NULL)
-								{
-									internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                        }
+                        else
+                        {
+                            INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
+                            buffer += inner_used_bytes;
+                            size -= inner_used_bytes;
+
+                            if (inner_decoder->decoder_state == DECODER_STATE_DONE)
+                            {
+                                AMQP_VALUE described_value;
+                                internal_decoder_destroy(inner_decoder);
+
+                                described_value = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+                                if (described_value == NULL)
+                                {
+                                    internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                     LogError("Could not allocate memory for AMQP value");
                                     result = __FAILURE__;
-								}
-								else
-								{
-									described_value->type = AMQP_TYPE_UNKNOWN;
-									internal_decoder_data->decode_to_value->value.described_value.value = (AMQP_VALUE)described_value;
-									internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, described_value, true);
-									if (internal_decoder_data->inner_decoder == NULL)
-									{
-										internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                                }
+                                else
+                                {
+                                    described_value->type = AMQP_TYPE_UNKNOWN;
+                                    internal_decoder_data->decode_to_value->value.described_value.value = (AMQP_VALUE)described_value;
+                                    internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, described_value, true);
+                                    if (internal_decoder_data->inner_decoder == NULL)
+                                    {
+                                        internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                         LogError("Could not create inner decoder");
                                         result = __FAILURE__;
-									}
-									else
-									{
-										internal_decoder_data->decode_value_state.described_value_state.described_value_state = DECODE_DESCRIBED_VALUE_STEP_VALUE;
-										result = 0;
-									}
-								}
-							}
-							else
-							{
-								result = 0;
-							}
-						}
-						break;
-					}
-					case DECODE_DESCRIBED_VALUE_STEP_VALUE:
-					{
-						size_t inner_used_bytes;
-						if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
-						{
+                                    }
+                                    else
+                                    {
+                                        internal_decoder_data->decode_value_state.described_value_state.described_value_state = DECODE_DESCRIBED_VALUE_STEP_VALUE;
+                                        result = 0;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                result = 0;
+                            }
+                        }
+                        break;
+                    }
+                    case DECODE_DESCRIBED_VALUE_STEP_VALUE:
+                    {
+                        size_t inner_used_bytes;
+                        if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
+                        {
                             LogError("Decoding bytes for described value failed");
                             result = __FAILURE__;
-						}
-						else
-						{
-							INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
-							buffer += inner_used_bytes;
-							size -= inner_used_bytes;
-
-							if (inner_decoder->decoder_state == DECODER_STATE_DONE)
-							{
-								internal_decoder_destroy(inner_decoder);
-								internal_decoder_data->inner_decoder = NULL;
-
-								internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-								internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-							}
-
-							result = 0;
-						}
-						break;
-					}
-					}
-					break;
-				}
-				case 0x56:
-				{
-					/* Codes_SRS_AMQPVALUE_01_331: [<encoding code="0x56" category="fixed" width="1" label="boolean with the octet 0x00 being false and octet 0x01 being true"/>] */
-					if (buffer[0] >= 2)
-					{
+                        }
+                        else
+                        {
+                            INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
+                            buffer += inner_used_bytes;
+                            size -= inner_used_bytes;
+
+                            if (inner_decoder->decoder_state == DECODER_STATE_DONE)
+                            {
+                                internal_decoder_destroy(inner_decoder);
+                                internal_decoder_data->inner_decoder = NULL;
+
+                                internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+                                internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                            }
+
+                            result = 0;
+                        }
+                        break;
+                    }
+                    }
+                    break;
+                }
+                case 0x56:
+                {
+                    /* Codes_SRS_AMQPVALUE_01_331: [<encoding code="0x56" category="fixed" width="1" label="boolean with the octet 0x00 being false and octet 0x01 being true"/>] */
+                    if (buffer[0] >= 2)
+                    {
                         LogError("Bad boolean value: %02X", buffer[0]);
                         result = __FAILURE__;
-					}
-					else
-					{
-						internal_decoder_data->decode_to_value->value.bool_value = (buffer[0] == 0) ? false : true;
-
-						buffer++;
-						size--;
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-						result = 0;
-					}
-
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_335: [<encoding code="0x50" category="fixed" width="1" label="8-bit unsigned integer"/>] */
-				case 0x50:
-				{
-					internal_decoder_data->decode_to_value->value.ubyte_value = buffer[0];
-					buffer++;
-					size--;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
+                    }
+                    else
+                    {
+                        internal_decoder_data->decode_to_value->value.bool_value = (buffer[0] == 0) ? false : true;
+
+                        buffer++;
+                        size--;
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        result = 0;
+                    }
+
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_335: [<encoding code="0x50" category="fixed" width="1" label="8-bit unsigned integer"/>] */
+                case 0x50:
+                {
+                    internal_decoder_data->decode_to_value->value.ubyte_value = buffer[0];
+                    buffer++;
+                    size--;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
                 /* Codes_SRS_AMQPVALUE_01_337: [<encoding code="0x60" category="fixed" width="2" label="16-bit unsigned integer in network byte order"/>] */
                 case 0x60:
                 {
@@ -3977,197 +3979,197 @@
                         /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
                         /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
                         /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    }
+
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_339: [<encoding code="0x70" category="fixed" width="4" label="32-bit unsigned integer in network byte order"/>] */
+                case 0x70:
+                {
+                    internal_decoder_data->decode_to_value->value.uint_value += ((uint32_t)buffer[0]) << ((3 - internal_decoder_data->bytes_decoded) * 8);
+                    internal_decoder_data->bytes_decoded++;
+                    buffer++;
+                    size--;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    if (internal_decoder_data->bytes_decoded == 4)
+                    {
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
                     }
 
-					result = 0;
-					break;
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_340: [<encoding name="smalluint" code="0x52" category="fixed" width="1" label="unsigned integer value in the range 0 to 255 inclusive"/>] */
+                case 0x52:
+                {
+                    internal_decoder_data->decode_to_value->value.uint_value = buffer[0];
+                    buffer++;
+                    size--;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_343: [<encoding code="0x80" category="fixed" width="8" label="64-bit unsigned integer in network byte order"/>] */
+                case 0x80:
+                {
+                    internal_decoder_data->decode_to_value->value.ulong_value += ((uint64_t)buffer[0]) << ((7 - internal_decoder_data->bytes_decoded) * 8);
+                    internal_decoder_data->bytes_decoded++;
+                    buffer++;
+                    size--;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    if (internal_decoder_data->bytes_decoded == 8)
+                    {
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    }
+
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_344: [<encoding name="smallulong" code="0x53" category="fixed" width="1" label="unsigned long value in the range 0 to 255 inclusive"/>] */
+                case 0x53:
+                {
+                    internal_decoder_data->decode_to_value->value.ulong_value = buffer[0];
+                    buffer++;
+                    size--;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_347: [<encoding code="0x51" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+                case 0x51:
+                {
+                    internal_decoder_data->decode_to_value->value.byte_value = buffer[0];
+                    buffer++;
+                    size--;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
                 }
-				/* Codes_SRS_AMQPVALUE_01_339: [<encoding code="0x70" category="fixed" width="4" label="32-bit unsigned integer in network byte order"/>] */
-				case 0x70:
-				{
-					internal_decoder_data->decode_to_value->value.uint_value += ((uint32_t)buffer[0]) << ((3 - internal_decoder_data->bytes_decoded) * 8);
-					internal_decoder_data->bytes_decoded++;
-					buffer++;
-					size--;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					if (internal_decoder_data->bytes_decoded == 4)
-					{
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					}
-
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_340: [<encoding name="smalluint" code="0x52" category="fixed" width="1" label="unsigned integer value in the range 0 to 255 inclusive"/>] */
-				case 0x52:
-				{
-					internal_decoder_data->decode_to_value->value.uint_value = buffer[0];
-					buffer++;
-					size--;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_343: [<encoding code="0x80" category="fixed" width="8" label="64-bit unsigned integer in network byte order"/>] */
-				case 0x80:
-				{
-					internal_decoder_data->decode_to_value->value.ulong_value += ((uint64_t)buffer[0]) << ((7 - internal_decoder_data->bytes_decoded) * 8);
-					internal_decoder_data->bytes_decoded++;
-					buffer++;
-					size--;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					if (internal_decoder_data->bytes_decoded == 8)
-					{
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					}
-
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_344: [<encoding name="smallulong" code="0x53" category="fixed" width="1" label="unsigned long value in the range 0 to 255 inclusive"/>] */
-				case 0x53:
-				{
-					internal_decoder_data->decode_to_value->value.ulong_value = buffer[0];
-					buffer++;
-					size--;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_347: [<encoding code="0x51" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-				case 0x51:
-				{
-					internal_decoder_data->decode_to_value->value.byte_value = buffer[0];
-					buffer++;
-					size--;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_349: [<encoding code="0x61" category="fixed" width="2" label="16-bit two's-complement integer in network byte order"/>] */
-				case 0x61:
-				{
-					internal_decoder_data->decode_to_value->value.short_value = (int16_t)((uint16_t)internal_decoder_data->decode_to_value->value.short_value + (((uint16_t)buffer[0]) << ((1 - internal_decoder_data->bytes_decoded) * 8)));
-					internal_decoder_data->bytes_decoded++;
-					buffer++;
-					size--;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					if (internal_decoder_data->bytes_decoded == 2)
-					{
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					}
-
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_351: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
-				case 0x71:
-				{
-					internal_decoder_data->decode_to_value->value.int_value = (int32_t)((uint32_t)internal_decoder_data->decode_to_value->value.int_value + (((uint32_t)buffer[0]) << ((3 - internal_decoder_data->bytes_decoded) * 8)));
-					internal_decoder_data->bytes_decoded++;
-					buffer++;
-					size--;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					if (internal_decoder_data->bytes_decoded == 4)
-					{
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					}
-
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_351: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
-				case 0x54:
-				{
-					internal_decoder_data->decode_to_value->value.int_value = (int32_t)((int8_t)(buffer[0]));
-					buffer++;
-					size--;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_354: [<encoding code="0x81" category="fixed" width="8" label="64-bit two's-complement integer in network byte order"/>] */
-				case 0x81:
-				{
-					internal_decoder_data->decode_to_value->value.long_value = (int64_t)((uint64_t)internal_decoder_data->decode_to_value->value.long_value + (((uint64_t)buffer[0]) << ((7 - internal_decoder_data->bytes_decoded) * 8)));
-					internal_decoder_data->bytes_decoded++;
-					buffer++;
-					size--;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					if (internal_decoder_data->bytes_decoded == 8)
-					{
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					}
-
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_355: [<encoding name="smalllong" code="0x55" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
-				case 0x55:
-				{
-					internal_decoder_data->decode_to_value->value.long_value = (int64_t)((int8_t)buffer[0]);
-					buffer++;
-					size--;
-					internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-					/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-					/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-					/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-					internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					result = 0;
-					break;
-				}
+                /* Codes_SRS_AMQPVALUE_01_349: [<encoding code="0x61" category="fixed" width="2" label="16-bit two's-complement integer in network byte order"/>] */
+                case 0x61:
+                {
+                    internal_decoder_data->decode_to_value->value.short_value = (int16_t)((uint16_t)internal_decoder_data->decode_to_value->value.short_value + (((uint16_t)buffer[0]) << ((1 - internal_decoder_data->bytes_decoded) * 8)));
+                    internal_decoder_data->bytes_decoded++;
+                    buffer++;
+                    size--;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    if (internal_decoder_data->bytes_decoded == 2)
+                    {
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    }
+
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_351: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
+                case 0x71:
+                {
+                    internal_decoder_data->decode_to_value->value.int_value = (int32_t)((uint32_t)internal_decoder_data->decode_to_value->value.int_value + (((uint32_t)buffer[0]) << ((3 - internal_decoder_data->bytes_decoded) * 8)));
+                    internal_decoder_data->bytes_decoded++;
+                    buffer++;
+                    size--;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    if (internal_decoder_data->bytes_decoded == 4)
+                    {
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    }
+
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_351: [<encoding code="0x71" category="fixed" width="4" label="32-bit two's-complement integer in network byte order"/>] */
+                case 0x54:
+                {
+                    internal_decoder_data->decode_to_value->value.int_value = (int32_t)((int8_t)(buffer[0]));
+                    buffer++;
+                    size--;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_354: [<encoding code="0x81" category="fixed" width="8" label="64-bit two's-complement integer in network byte order"/>] */
+                case 0x81:
+                {
+                    internal_decoder_data->decode_to_value->value.long_value = (int64_t)((uint64_t)internal_decoder_data->decode_to_value->value.long_value + (((uint64_t)buffer[0]) << ((7 - internal_decoder_data->bytes_decoded) * 8)));
+                    internal_decoder_data->bytes_decoded++;
+                    buffer++;
+                    size--;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    if (internal_decoder_data->bytes_decoded == 8)
+                    {
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    }
+
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_355: [<encoding name="smalllong" code="0x55" category="fixed" width="1" label="8-bit two's-complement integer"/>] */
+                case 0x55:
+                {
+                    internal_decoder_data->decode_to_value->value.long_value = (int64_t)((int8_t)buffer[0]);
+                    buffer++;
+                    size--;
+                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    result = 0;
+                    break;
+                }
                 /* Codes_SRS_AMQPVALUE_01_289: [\<encoding name="ieee-754" code="0x72" category="fixed" width="4" label="IEEE 754-2008 binary32"/>] */
                 case 0x72:
                 {
@@ -4213,1172 +4215,1172 @@
                     break;
                 }
                 /* Codes_SRS_AMQPVALUE_01_369: [<encoding name="ms64" code="0x83" category="fixed" width="8" label="64-bit two's-complement integer representing milliseconds since the unix epoch"/>] */
-				case 0x83:
-				{
-					internal_decoder_data->decode_to_value->value.timestamp_value = (int64_t)((uint64_t)internal_decoder_data->decode_to_value->value.timestamp_value + (((uint64_t)buffer[0]) << ((7 - internal_decoder_data->bytes_decoded) * 8)));
-					internal_decoder_data->bytes_decoded++;
-					buffer++;
-					size--;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					if (internal_decoder_data->bytes_decoded == 8)
-					{
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					}
-
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_369: [<encoding name="ms64" code="0x83" category="fixed" width="8" label="64-bit two's-complement integer representing milliseconds since the unix epoch"/>] */
-				case 0x98:
-				{
-					size_t to_copy = 16 - internal_decoder_data->bytes_decoded;
-					if (to_copy > size)
-					{
-						to_copy = size;
-					}
-
-					(void)memcpy(&internal_decoder_data->decode_to_value->value.uuid_value[internal_decoder_data->bytes_decoded], buffer, to_copy);
-					internal_decoder_data->bytes_decoded += to_copy;
-					buffer += to_copy;
-					size -= to_copy;
-
-					/* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
-					if (internal_decoder_data->bytes_decoded == 16)
-					{
-						internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-						/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-						/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-						/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-						internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-					}
-
-					result = 0;
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_373: [<encoding name="vbin8" code="0xa0" category="variable" width="1" label="up to 2^8 - 1 octets of binary data"/>] */
-				case 0xA0:
-				{
-					if (internal_decoder_data->bytes_decoded == 0)
-					{
-						internal_decoder_data->decode_to_value->value.binary_value.length = buffer[0];
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->decode_to_value->value.binary_value.length == 0)
-						{
-							internal_decoder_data->decode_to_value->value.binary_value.bytes = NULL;
-
-							/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-							/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-							/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-							internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-							result = 0;
-						}
-						else
-						{
-							internal_decoder_data->decode_to_value->value.binary_value.bytes = (unsigned char*)malloc(internal_decoder_data->decode_to_value->value.binary_value.length);
-							if (internal_decoder_data->decode_to_value->value.binary_value.bytes == NULL)
-							{
+                case 0x83:
+                {
+                    internal_decoder_data->decode_to_value->value.timestamp_value = (int64_t)((uint64_t)internal_decoder_data->decode_to_value->value.timestamp_value + (((uint64_t)buffer[0]) << ((7 - internal_decoder_data->bytes_decoded) * 8)));
+                    internal_decoder_data->bytes_decoded++;
+                    buffer++;
+                    size--;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    if (internal_decoder_data->bytes_decoded == 8)
+                    {
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    }
+
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_369: [<encoding name="ms64" code="0x83" category="fixed" width="8" label="64-bit two's-complement integer representing milliseconds since the unix epoch"/>] */
+                case 0x98:
+                {
+                    size_t to_copy = 16 - internal_decoder_data->bytes_decoded;
+                    if (to_copy > size)
+                    {
+                        to_copy = size;
+                    }
+
+                    (void)memcpy(&internal_decoder_data->decode_to_value->value.uuid_value[internal_decoder_data->bytes_decoded], buffer, to_copy);
+                    internal_decoder_data->bytes_decoded += to_copy;
+                    buffer += to_copy;
+                    size -= to_copy;
+
+                    /* Codes_SRS_AMQPVALUE_01_327: [If not enough bytes have accumulated to decode a value, the on_value_decoded shall not be called.] */
+                    if (internal_decoder_data->bytes_decoded == 16)
+                    {
+                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                        /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                        /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                        /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                    }
+
+                    result = 0;
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_373: [<encoding name="vbin8" code="0xa0" category="variable" width="1" label="up to 2^8 - 1 octets of binary data"/>] */
+                case 0xA0:
+                {
+                    if (internal_decoder_data->bytes_decoded == 0)
+                    {
+                        internal_decoder_data->decode_to_value->value.binary_value.length = buffer[0];
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->decode_to_value->value.binary_value.length == 0)
+                        {
+                            internal_decoder_data->decode_to_value->value.binary_value.bytes = NULL;
+
+                            /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                            /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                            /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                            internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                            result = 0;
+                        }
+                        else
+                        {
+                            internal_decoder_data->decode_to_value->value.binary_value.bytes = (unsigned char*)malloc(internal_decoder_data->decode_to_value->value.binary_value.length);
+                            if (internal_decoder_data->decode_to_value->value.binary_value.bytes == NULL)
+                            {
                                 /* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
                                 LogError("Cannot allocate memory for decoded binary value");
                                 internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
-								result = __FAILURE__;
-							}
-							else
-							{
-								result = 0;
-							}
-						}
-					}
-					else
-					{
-						size_t to_copy = internal_decoder_data->decode_to_value->value.binary_value.length - (internal_decoder_data->bytes_decoded - 1);
-						if (to_copy > size)
-						{
-							to_copy = size;
-						}
-
-						(void)memcpy((unsigned char*)(internal_decoder_data->decode_to_value->value.binary_value.bytes) + (internal_decoder_data->bytes_decoded - 1), buffer, to_copy);
-
-						buffer += to_copy;
-						size -= to_copy;
-						internal_decoder_data->bytes_decoded += to_copy;
-
-						if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_to_value->value.binary_value.length + 1)
-						{
-							internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-							/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-							/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-							/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-							internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-						}
-
-						result = 0;
-					}
-
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_374: [<encoding name="vbin32" code="0xb0" category="variable" width="4" label="up to 2^32 - 1 octets of binary data"/>] */
-				case 0xB0:
-				{
-					if (internal_decoder_data->bytes_decoded < 4)
-					{
-						internal_decoder_data->decode_to_value->value.binary_value.length += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->bytes_decoded == 4)
-						{
-							if (internal_decoder_data->decode_to_value->value.binary_value.length == 0)
-							{
-								internal_decoder_data->decode_to_value->value.binary_value.bytes = NULL;
-
-								/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-								/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-								/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-								internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-								result = 0;
-							}
-							else
-							{
-								internal_decoder_data->decode_to_value->value.binary_value.bytes = (unsigned char*)malloc(internal_decoder_data->decode_to_value->value.binary_value.length + 1);
-								if (internal_decoder_data->decode_to_value->value.binary_value.bytes == NULL)
-								{
-									/* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
-									internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                                result = __FAILURE__;
+                            }
+                            else
+                            {
+                                result = 0;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        size_t to_copy = internal_decoder_data->decode_to_value->value.binary_value.length - (internal_decoder_data->bytes_decoded - 1);
+                        if (to_copy > size)
+                        {
+                            to_copy = size;
+                        }
+
+                        (void)memcpy((unsigned char*)(internal_decoder_data->decode_to_value->value.binary_value.bytes) + (internal_decoder_data->bytes_decoded - 1), buffer, to_copy);
+
+                        buffer += to_copy;
+                        size -= to_copy;
+                        internal_decoder_data->bytes_decoded += to_copy;
+
+                        if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_to_value->value.binary_value.length + 1)
+                        {
+                            internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                            /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                            /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                            /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                            internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        }
+
+                        result = 0;
+                    }
+
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_374: [<encoding name="vbin32" code="0xb0" category="variable" width="4" label="up to 2^32 - 1 octets of binary data"/>] */
+                case 0xB0:
+                {
+                    if (internal_decoder_data->bytes_decoded < 4)
+                    {
+                        internal_decoder_data->decode_to_value->value.binary_value.length += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->bytes_decoded == 4)
+                        {
+                            if (internal_decoder_data->decode_to_value->value.binary_value.length == 0)
+                            {
+                                internal_decoder_data->decode_to_value->value.binary_value.bytes = NULL;
+
+                                /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                result = 0;
+                            }
+                            else
+                            {
+                                internal_decoder_data->decode_to_value->value.binary_value.bytes = (unsigned char*)malloc(internal_decoder_data->decode_to_value->value.binary_value.length + 1);
+                                if (internal_decoder_data->decode_to_value->value.binary_value.bytes == NULL)
+                                {
+                                    /* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
+                                    internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                     LogError("Cannot allocate memory for decoded binary value");
                                     result = __FAILURE__;
-								}
-								else
-								{
-									result = 0;
-								}
-							}
-						}
-						else
-						{
-							result = 0;
-						}
-					}
-					else
-					{
-						size_t to_copy = internal_decoder_data->decode_to_value->value.binary_value.length - (internal_decoder_data->bytes_decoded - 4);
-						if (to_copy > size)
-						{
-							to_copy = size;
-						}
+                                }
+                                else
+                                {
+                                    result = 0;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            result = 0;
+                        }
+                    }
+                    else
+                    {
+                        size_t to_copy = internal_decoder_data->decode_to_value->value.binary_value.length - (internal_decoder_data->bytes_decoded - 4);
+                        if (to_copy > size)
+                        {
+                            to_copy = size;
+                        }
 
                         (void)memcpy((unsigned char*)(internal_decoder_data->decode_to_value->value.binary_value.bytes) + (internal_decoder_data->bytes_decoded - 4), buffer, to_copy);
-						buffer += to_copy;
-						size -= to_copy;
-						internal_decoder_data->bytes_decoded += to_copy;
-
-						if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_to_value->value.binary_value.length + 4)
-						{
-							internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-							internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-						}
-
-						result = 0;
-					}
-
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_376: [<encoding name="str8-utf8" code="0xa1" category="variable" width="1" label="up to 2^8 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
-				case 0xA1:
-				{
-					if (internal_decoder_data->bytes_decoded == 0)
-					{
-						internal_decoder_data->decode_value_state.string_value_state.length = buffer[0];
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						internal_decoder_data->decode_to_value->value.string_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.string_value_state.length + 1);
-						if (internal_decoder_data->decode_to_value->value.string_value.chars == NULL)
-						{
-							/* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
-							internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                        buffer += to_copy;
+                        size -= to_copy;
+                        internal_decoder_data->bytes_decoded += to_copy;
+
+                        if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_to_value->value.binary_value.length + 4)
+                        {
+                            internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+                            internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        }
+
+                        result = 0;
+                    }
+
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_376: [<encoding name="str8-utf8" code="0xa1" category="variable" width="1" label="up to 2^8 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
+                case 0xA1:
+                {
+                    if (internal_decoder_data->bytes_decoded == 0)
+                    {
+                        internal_decoder_data->decode_value_state.string_value_state.length = buffer[0];
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        internal_decoder_data->decode_to_value->value.string_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.string_value_state.length + 1);
+                        if (internal_decoder_data->decode_to_value->value.string_value.chars == NULL)
+                        {
+                            /* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
+                            internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                             LogError("Could not allocate memory for decoded string value");
                             result = __FAILURE__;
-						}
-						else
-						{
-							if (internal_decoder_data->decode_value_state.string_value_state.length == 0)
-							{
-								internal_decoder_data->decode_to_value->value.string_value.chars[0] = '\0';
-
-								/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-								/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-								/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-								internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-							}
-
-							result = 0;
-						}
-					}
-					else
-					{
-						size_t to_copy = internal_decoder_data->decode_value_state.string_value_state.length - (internal_decoder_data->bytes_decoded - 1);
-						if (to_copy > size)
-						{
-							to_copy = size;
-						}
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->decode_value_state.string_value_state.length == 0)
+                            {
+                                internal_decoder_data->decode_to_value->value.string_value.chars[0] = '\0';
+
+                                /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                            }
+
+                            result = 0;
+                        }
+                    }
+                    else
+                    {
+                        size_t to_copy = internal_decoder_data->decode_value_state.string_value_state.length - (internal_decoder_data->bytes_decoded - 1);
+                        if (to_copy > size)
+                        {
+                            to_copy = size;
+                        }
 
                         (void)memcpy(internal_decoder_data->decode_to_value->value.string_value.chars + (internal_decoder_data->bytes_decoded - 1), buffer, to_copy);
-						buffer += to_copy;
-						size -= to_copy;
-						internal_decoder_data->bytes_decoded += to_copy;
-
-						if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.string_value_state.length + 1)
-						{
-							internal_decoder_data->decode_to_value->value.string_value.chars[internal_decoder_data->decode_value_state.string_value_state.length] = 0;
-							internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-							/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-							/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-							/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-							internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-						}
-
-						result = 0;
-					}
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_377: [<encoding name="str32-utf8" code="0xb1" category="variable" width="4" label="up to 2^32 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
-				case 0xB1:
-				{
-					if (internal_decoder_data->bytes_decoded < 4)
-					{
-						internal_decoder_data->decode_value_state.string_value_state.length += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->bytes_decoded == 4)
-						{
-							internal_decoder_data->decode_to_value->value.string_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.string_value_state.length + 1);
-							if (internal_decoder_data->decode_to_value->value.string_value.chars == NULL)
-							{
-								/* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
-								internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                        buffer += to_copy;
+                        size -= to_copy;
+                        internal_decoder_data->bytes_decoded += to_copy;
+
+                        if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.string_value_state.length + 1)
+                        {
+                            internal_decoder_data->decode_to_value->value.string_value.chars[internal_decoder_data->decode_value_state.string_value_state.length] = 0;
+                            internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                            /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                            /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                            /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                            internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        }
+
+                        result = 0;
+                    }
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_377: [<encoding name="str32-utf8" code="0xb1" category="variable" width="4" label="up to 2^32 - 1 octets worth of UTF-8 Unicode (with no byte order mark)"/>] */
+                case 0xB1:
+                {
+                    if (internal_decoder_data->bytes_decoded < 4)
+                    {
+                        internal_decoder_data->decode_value_state.string_value_state.length += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->bytes_decoded == 4)
+                        {
+                            internal_decoder_data->decode_to_value->value.string_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.string_value_state.length + 1);
+                            if (internal_decoder_data->decode_to_value->value.string_value.chars == NULL)
+                            {
+                                /* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
+                                internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                 LogError("Could not allocate memory for decoded string value");
                                 result = __FAILURE__;
-							}
-							else
-							{
-								if (internal_decoder_data->decode_value_state.string_value_state.length == 0)
-								{
-									internal_decoder_data->decode_to_value->value.string_value.chars[0] = '\0';
-
-									/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-									/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-									/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-									internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-								}
-
-								result = 0;
-							}
-						}
-						else
-						{
-							result = 0;
-						}
-					}
-					else
-					{
-						size_t to_copy = internal_decoder_data->decode_value_state.string_value_state.length - (internal_decoder_data->bytes_decoded - 4);
-						if (to_copy > size)
-						{
-							to_copy = size;
-						}
+                            }
+                            else
+                            {
+                                if (internal_decoder_data->decode_value_state.string_value_state.length == 0)
+                                {
+                                    internal_decoder_data->decode_to_value->value.string_value.chars[0] = '\0';
+
+                                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                }
+
+                                result = 0;
+                            }
+                        }
+                        else
+                        {
+                            result = 0;
+                        }
+                    }
+                    else
+                    {
+                        size_t to_copy = internal_decoder_data->decode_value_state.string_value_state.length - (internal_decoder_data->bytes_decoded - 4);
+                        if (to_copy > size)
+                        {
+                            to_copy = size;
+                        }
 
                         (void)memcpy(internal_decoder_data->decode_to_value->value.string_value.chars + (internal_decoder_data->bytes_decoded - 4), buffer, to_copy);
-						buffer += to_copy;
-						size -= to_copy;
-						internal_decoder_data->bytes_decoded += to_copy;
-
-						if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.string_value_state.length + 4)
-						{
-							internal_decoder_data->decode_to_value->value.string_value.chars[internal_decoder_data->decode_value_state.string_value_state.length] = '\0';
-							internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-							/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-							/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-							/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-							internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-						}
-
-						result = 0;
-					}
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_379: [<encoding name="sym8" code="0xa3" category="variable" width="1" label="up to 2^8 - 1 seven bit ASCII characters representing a symbolic value"/>] */
-				case 0xA3:
-				{
-					if (internal_decoder_data->bytes_decoded == 0)
-					{
-						internal_decoder_data->decode_value_state.symbol_value_state.length = buffer[0];
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						internal_decoder_data->decode_to_value->value.symbol_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.symbol_value_state.length + 1);
-						if (internal_decoder_data->decode_to_value->value.symbol_value.chars == NULL)
-						{
-							/* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
-							internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                        buffer += to_copy;
+                        size -= to_copy;
+                        internal_decoder_data->bytes_decoded += to_copy;
+
+                        if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.string_value_state.length + 4)
+                        {
+                            internal_decoder_data->decode_to_value->value.string_value.chars[internal_decoder_data->decode_value_state.string_value_state.length] = '\0';
+                            internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                            /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                            /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                            /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                            internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        }
+
+                        result = 0;
+                    }
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_379: [<encoding name="sym8" code="0xa3" category="variable" width="1" label="up to 2^8 - 1 seven bit ASCII characters representing a symbolic value"/>] */
+                case 0xA3:
+                {
+                    if (internal_decoder_data->bytes_decoded == 0)
+                    {
+                        internal_decoder_data->decode_value_state.symbol_value_state.length = buffer[0];
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        internal_decoder_data->decode_to_value->value.symbol_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.symbol_value_state.length + 1);
+                        if (internal_decoder_data->decode_to_value->value.symbol_value.chars == NULL)
+                        {
+                            /* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
+                            internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                             LogError("Could not allocate memory for decoded symbol value");
                             result = __FAILURE__;
-						}
-						else
-						{
-							if (internal_decoder_data->decode_value_state.symbol_value_state.length == 0)
-							{
-								internal_decoder_data->decode_to_value->value.symbol_value.chars[0] = '\0';
-
-								/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-								/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-								/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-								internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-							}
-
-							result = 0;
-						}
-					}
-					else
-					{
-						size_t to_copy = internal_decoder_data->decode_value_state.symbol_value_state.length - (internal_decoder_data->bytes_decoded - 1);
-						if (to_copy > size)
-						{
-							to_copy = size;
-						}
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->decode_value_state.symbol_value_state.length == 0)
+                            {
+                                internal_decoder_data->decode_to_value->value.symbol_value.chars[0] = '\0';
+
+                                /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                            }
+
+                            result = 0;
+                        }
+                    }
+                    else
+                    {
+                        size_t to_copy = internal_decoder_data->decode_value_state.symbol_value_state.length - (internal_decoder_data->bytes_decoded - 1);
+                        if (to_copy > size)
+                        {
+                            to_copy = size;
+                        }
 
                         (void)memcpy(internal_decoder_data->decode_to_value->value.symbol_value.chars + (internal_decoder_data->bytes_decoded - 1), buffer, to_copy);
-						buffer += to_copy;
-						size -= to_copy;
-						internal_decoder_data->bytes_decoded += to_copy;
-
-						if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.symbol_value_state.length + 1)
-						{
-							internal_decoder_data->decode_to_value->value.symbol_value.chars[internal_decoder_data->decode_value_state.symbol_value_state.length] = 0;
-							internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-							/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-							/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-							/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-							internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-						}
-
-						result = 0;
-					}
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_380: [<encoding name="sym32" code="0xb3" category="variable" width="4" label="up to 2^32 - 1 seven bit ASCII characters representing a symbolic value"/>] */
-				case 0xB3:
-				{
-					if (internal_decoder_data->bytes_decoded < 4)
-					{
-						internal_decoder_data->decode_value_state.symbol_value_state.length += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->bytes_decoded == 4)
-						{
-							internal_decoder_data->decode_to_value->value.symbol_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.symbol_value_state.length + 1);
-							if (internal_decoder_data->decode_to_value->value.symbol_value.chars == NULL)
-							{
-								/* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
-								internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                        buffer += to_copy;
+                        size -= to_copy;
+                        internal_decoder_data->bytes_decoded += to_copy;
+
+                        if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.symbol_value_state.length + 1)
+                        {
+                            internal_decoder_data->decode_to_value->value.symbol_value.chars[internal_decoder_data->decode_value_state.symbol_value_state.length] = 0;
+                            internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                            /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                            /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                            /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                            internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        }
+
+                        result = 0;
+                    }
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_380: [<encoding name="sym32" code="0xb3" category="variable" width="4" label="up to 2^32 - 1 seven bit ASCII characters representing a symbolic value"/>] */
+                case 0xB3:
+                {
+                    if (internal_decoder_data->bytes_decoded < 4)
+                    {
+                        internal_decoder_data->decode_value_state.symbol_value_state.length += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->bytes_decoded == 4)
+                        {
+                            internal_decoder_data->decode_to_value->value.symbol_value.chars = (char*)malloc(internal_decoder_data->decode_value_state.symbol_value_state.length + 1);
+                            if (internal_decoder_data->decode_to_value->value.symbol_value.chars == NULL)
+                            {
+                                /* Codes_SRS_AMQPVALUE_01_326: [If any allocation failure occurs during decoding, amqpvalue_decode_bytes shall fail and return a non-zero value.] */
+                                internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                 LogError("Could not allocate memory for decoded symbol value");
                                 result = __FAILURE__;
-							}
-							else
-							{
-								if (internal_decoder_data->decode_value_state.symbol_value_state.length == 0)
-								{
-									internal_decoder_data->decode_to_value->value.symbol_value.chars[0] = '\0';
-
-									/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-									/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-									/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-									internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-								}
-
-								result = 0;
-							}
-						}
-						else
-						{
-							result = 0;
-						}
-					}
-					else
-					{
-						size_t to_copy = internal_decoder_data->decode_value_state.symbol_value_state.length - (internal_decoder_data->bytes_decoded - 4);
-						if (to_copy > size)
-						{
-							to_copy = size;
-						}
+                            }
+                            else
+                            {
+                                if (internal_decoder_data->decode_value_state.symbol_value_state.length == 0)
+                                {
+                                    internal_decoder_data->decode_to_value->value.symbol_value.chars[0] = '\0';
+
+                                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                }
+
+                                result = 0;
+                            }
+                        }
+                        else
+                        {
+                            result = 0;
+                        }
+                    }
+                    else
+                    {
+                        size_t to_copy = internal_decoder_data->decode_value_state.symbol_value_state.length - (internal_decoder_data->bytes_decoded - 4);
+                        if (to_copy > size)
+                        {
+                            to_copy = size;
+                        }
 
                         (void)memcpy(internal_decoder_data->decode_to_value->value.symbol_value.chars + (internal_decoder_data->bytes_decoded - 4), buffer, to_copy);
-						buffer += to_copy;
-						size -= to_copy;
-						internal_decoder_data->bytes_decoded += to_copy;
-
-						if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.symbol_value_state.length + 4)
-						{
-							internal_decoder_data->decode_to_value->value.symbol_value.chars[internal_decoder_data->decode_value_state.symbol_value_state.length] = '\0';
-							internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-							/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-							/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-							/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-							internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-						}
-
-						result = 0;
-					}
-					break;
-				}
-				/* Codes_SRS_AMQPVALUE_01_385: [<encoding name="list8" code="0xc0" category="compound" width="1" label="up to 2^8 - 1 list elements with total size less than 2^8 octets"/>] */
-				case 0xC0:
-				/* Codes_SRS_AMQPVALUE_01_386: [<encoding name="list32" code="0xd0" category="compound" width="4" label="up to 2^32 - 1 list elements with total size less than 2^32 octets"/>] */
-				case 0xD0:
-				{
-					DECODE_LIST_STEP step = internal_decoder_data->decode_value_state.list_value_state.list_value_state;
-
-					switch (step)
-					{
-					default:
+                        buffer += to_copy;
+                        size -= to_copy;
+                        internal_decoder_data->bytes_decoded += to_copy;
+
+                        if (internal_decoder_data->bytes_decoded == internal_decoder_data->decode_value_state.symbol_value_state.length + 4)
+                        {
+                            internal_decoder_data->decode_to_value->value.symbol_value.chars[internal_decoder_data->decode_value_state.symbol_value_state.length] = '\0';
+                            internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                            /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                            /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                            /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                            internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                        }
+
+                        result = 0;
+                    }
+                    break;
+                }
+                /* Codes_SRS_AMQPVALUE_01_385: [<encoding name="list8" code="0xc0" category="compound" width="1" label="up to 2^8 - 1 list elements with total size less than 2^8 octets"/>] */
+                case 0xC0:
+                /* Codes_SRS_AMQPVALUE_01_386: [<encoding name="list32" code="0xd0" category="compound" width="4" label="up to 2^32 - 1 list elements with total size less than 2^32 octets"/>] */
+                case 0xD0:
+                {
+                    DECODE_LIST_STEP step = internal_decoder_data->decode_value_state.list_value_state.list_value_state;
+
+                    switch (step)
+                    {
+                    default:
                         LogError("Invalid step in decoding list value: %d", step);
                         result = __FAILURE__;
-						break;
-
-					case DECODE_LIST_STEP_SIZE:
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->constructor_byte == 0xC0)
-						{
-							internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_COUNT;
-							internal_decoder_data->bytes_decoded = 0;
-							internal_decoder_data->decode_to_value->value.list_value.count = 0;
-							result = 0;
-						}
-						else
-						{
-							if (internal_decoder_data->bytes_decoded == 4)
-							{
-								internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_COUNT;
-								internal_decoder_data->bytes_decoded = 0;
-								internal_decoder_data->decode_to_value->value.list_value.count = 0;
-							}
-
-							result = 0;
-						}
-
-						break;
-
-					case DECODE_LIST_STEP_COUNT:
-						if (internal_decoder_data->constructor_byte == 0xC0)
-						{
-							internal_decoder_data->decode_to_value->value.list_value.count = buffer[0];
-						}
-						else
-						{
-							internal_decoder_data->decode_to_value->value.list_value.count += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
-						}
-
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->constructor_byte == 0xC0)
-						{
-							if (internal_decoder_data->decode_to_value->value.list_value.count == 0)
-							{
-								internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-								/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-								/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-								/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-								internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-								result = 0;
-							}
-							else
-							{
-								uint32_t i;
-								internal_decoder_data->decode_to_value->value.list_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.list_value.count);
-								if (internal_decoder_data->decode_to_value->value.list_value.items == NULL)
-								{
+                        break;
+
+                    case DECODE_LIST_STEP_SIZE:
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->constructor_byte == 0xC0)
+                        {
+                            internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_COUNT;
+                            internal_decoder_data->bytes_decoded = 0;
+                            internal_decoder_data->decode_to_value->value.list_value.count = 0;
+                            result = 0;
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->bytes_decoded == 4)
+                            {
+                                internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_COUNT;
+                                internal_decoder_data->bytes_decoded = 0;
+                                internal_decoder_data->decode_to_value->value.list_value.count = 0;
+                            }
+
+                            result = 0;
+                        }
+
+                        break;
+
+                    case DECODE_LIST_STEP_COUNT:
+                        if (internal_decoder_data->constructor_byte == 0xC0)
+                        {
+                            internal_decoder_data->decode_to_value->value.list_value.count = buffer[0];
+                        }
+                        else
+                        {
+                            internal_decoder_data->decode_to_value->value.list_value.count += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
+                        }
+
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->constructor_byte == 0xC0)
+                        {
+                            if (internal_decoder_data->decode_to_value->value.list_value.count == 0)
+                            {
+                                internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                                /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                result = 0;
+                            }
+                            else
+                            {
+                                uint32_t i;
+                                internal_decoder_data->decode_to_value->value.list_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.list_value.count);
+                                if (internal_decoder_data->decode_to_value->value.list_value.items == NULL)
+                                {
                                     LogError("Could not allocate memory for decoded list value");
                                     result = __FAILURE__;
-								}
-								else
-								{
-									for (i = 0; i < internal_decoder_data->decode_to_value->value.list_value.count; i++)
-									{
-										internal_decoder_data->decode_to_value->value.list_value.items[i] = NULL;
-									}
-
-									internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_ITEMS;
-									internal_decoder_data->bytes_decoded = 0;
-									internal_decoder_data->inner_decoder = NULL;
-									internal_decoder_data->decode_value_state.list_value_state.item = 0;
-									result = 0;
-								}
-							}
-						}
-						else
-						{
-							if (internal_decoder_data->bytes_decoded == 4)
-							{
-								if (internal_decoder_data->decode_to_value->value.list_value.count == 0)
-								{
-									internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-									/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-									/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-									/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-									internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-									result = 0;
-								}
-								else
-								{
-									uint32_t i;
-
-									internal_decoder_data->decode_to_value->value.list_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.list_value.count);
-									if (internal_decoder_data->decode_to_value->value.list_value.items == NULL)
-									{
+                                }
+                                else
+                                {
+                                    for (i = 0; i < internal_decoder_data->decode_to_value->value.list_value.count; i++)
+                                    {
+                                        internal_decoder_data->decode_to_value->value.list_value.items[i] = NULL;
+                                    }
+
+                                    internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_ITEMS;
+                                    internal_decoder_data->bytes_decoded = 0;
+                                    internal_decoder_data->inner_decoder = NULL;
+                                    internal_decoder_data->decode_value_state.list_value_state.item = 0;
+                                    result = 0;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->bytes_decoded == 4)
+                            {
+                                if (internal_decoder_data->decode_to_value->value.list_value.count == 0)
+                                {
+                                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                    result = 0;
+                                }
+                                else
+                                {
+                                    uint32_t i;
+
+                                    internal_decoder_data->decode_to_value->value.list_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.list_value.count);
+                                    if (internal_decoder_data->decode_to_value->value.list_value.items == NULL)
+                                    {
                                         LogError("Could not allocate memory for decoded list value");
                                         result = __FAILURE__;
-									}
-									else
-									{
-										for (i = 0; i < internal_decoder_data->decode_to_value->value.list_value.count; i++)
-										{
-											internal_decoder_data->decode_to_value->value.list_value.items[i] = NULL;
-										}
-
-										internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_ITEMS;
-										internal_decoder_data->bytes_decoded = 0;
-										internal_decoder_data->inner_decoder = NULL;
-										internal_decoder_data->decode_value_state.list_value_state.item = 0;
-										result = 0;
-									}
-								}
-							}
-							else
-							{
-								result = 0;
-							}
-						}
-						break;
-
-					case DECODE_LIST_STEP_ITEMS:
-					{
-						size_t inner_used_bytes;
-
-						if (internal_decoder_data->bytes_decoded == 0)
-						{
-							AMQP_VALUE_DATA* list_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-							if (list_item == NULL)
-							{
-								internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
-								result = __FAILURE__;
-							}
-							else
-							{
-								list_item->type = AMQP_TYPE_UNKNOWN;
-								internal_decoder_data->decode_to_value->value.list_value.items[internal_decoder_data->decode_value_state.list_value_state.item] = list_item;
-								internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, list_item, true);
-								if (internal_decoder_data->inner_decoder == NULL)
-								{
+                                    }
+                                    else
+                                    {
+                                        for (i = 0; i < internal_decoder_data->decode_to_value->value.list_value.count; i++)
+                                        {
+                                            internal_decoder_data->decode_to_value->value.list_value.items[i] = NULL;
+                                        }
+
+                                        internal_decoder_data->decode_value_state.list_value_state.list_value_state = DECODE_LIST_STEP_ITEMS;
+                                        internal_decoder_data->bytes_decoded = 0;
+                                        internal_decoder_data->inner_decoder = NULL;
+                                        internal_decoder_data->decode_value_state.list_value_state.item = 0;
+                                        result = 0;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                result = 0;
+                            }
+                        }
+                        break;
+
+                    case DECODE_LIST_STEP_ITEMS:
+                    {
+                        size_t inner_used_bytes;
+
+                        if (internal_decoder_data->bytes_decoded == 0)
+                        {
+                            AMQP_VALUE_DATA* list_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+                            if (list_item == NULL)
+                            {
+                                internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                                result = __FAILURE__;
+                            }
+                            else
+                            {
+                                list_item->type = AMQP_TYPE_UNKNOWN;
+                                internal_decoder_data->decode_to_value->value.list_value.items[internal_decoder_data->decode_value_state.list_value_state.item] = list_item;
+                                internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, list_item, true);
+                                if (internal_decoder_data->inner_decoder == NULL)
+                                {
                                     LogError("Could not create inner decoder for list items");
                                     internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                     result = __FAILURE__;
-								}
-								else
-								{
-									result = 0;
-								}
-							}
-						}
-
-						if (internal_decoder_data->inner_decoder == NULL)
-						{
+                                }
+                                else
+                                {
+                                    result = 0;
+                                }
+                            }
+                        }
+
+                        if (internal_decoder_data->inner_decoder == NULL)
+                        {
                             LogError("NULL inner decoder. This should not happen under normal circumstances");
                             result = __FAILURE__;
-						}
-						else if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
-						{
+                        }
+                        else if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
+                        {
                             LogError("Decoding list items failed");
                             result = __FAILURE__;
-						}
-						else
-						{
-							INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
-							internal_decoder_data->bytes_decoded += inner_used_bytes;
-							buffer += inner_used_bytes;
-							size -= inner_used_bytes;
-
-							if (inner_decoder->decoder_state == DECODER_STATE_DONE)
-							{
-								internal_decoder_destroy(inner_decoder);
-								internal_decoder_data->inner_decoder = NULL;
-								internal_decoder_data->bytes_decoded = 0;
-
-								internal_decoder_data->decode_value_state.list_value_state.item++;
-								if (internal_decoder_data->decode_value_state.list_value_state.item == internal_decoder_data->decode_to_value->value.list_value.count)
-								{
-									internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-									/* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
-									/* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
-									/* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
-									internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-								}
-
-							}
-
-							result = 0;
-						}
-
-						break;
-					}
-					}
-
-					break;
-				}
-				case 0xC1:
-				case 0xD1:
-				{
-					DECODE_MAP_STEP step = internal_decoder_data->decode_value_state.map_value_state.map_value_state;
-
-					switch (step)
-					{
-					default:
+                        }
+                        else
+                        {
+                            INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
+                            internal_decoder_data->bytes_decoded += inner_used_bytes;
+                            buffer += inner_used_bytes;
+                            size -= inner_used_bytes;
+
+                            if (inner_decoder->decoder_state == DECODER_STATE_DONE)
+                            {
+                                internal_decoder_destroy(inner_decoder);
+                                internal_decoder_data->inner_decoder = NULL;
+                                internal_decoder_data->bytes_decoded = 0;
+
+                                internal_decoder_data->decode_value_state.list_value_state.item++;
+                                if (internal_decoder_data->decode_value_state.list_value_state.item == internal_decoder_data->decode_to_value->value.list_value.count)
+                                {
+                                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                                    /* Codes_SRS_AMQPVALUE_01_323: [When enough bytes have been processed for a valid amqp value, the on_value_decoded passed in amqpvalue_decoder_create shall be called.] */
+                                    /* Codes_SRS_AMQPVALUE_01_324: [The decoded amqp value shall be passed to on_value_decoded.] */
+                                    /* Codes_SRS_AMQPVALUE_01_325: [Also the context stored in amqpvalue_decoder_create shall be passed to the on_value_decoded callback.] */
+                                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                }
+
+                            }
+
+                            result = 0;
+                        }
+
+                        break;
+                    }
+                    }
+
+                    break;
+                }
+                case 0xC1:
+                case 0xD1:
+                {
+                    DECODE_MAP_STEP step = internal_decoder_data->decode_value_state.map_value_state.map_value_state;
+
+                    switch (step)
+                    {
+                    default:
                         LogError("Invalid step in decoding map value: %d", step);
                         result = __FAILURE__;
-						break;
-
-					case DECODE_MAP_STEP_SIZE:
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->constructor_byte == 0xC1)
-						{
-							internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_COUNT;
-							internal_decoder_data->bytes_decoded = 0;
-							internal_decoder_data->decode_to_value->value.map_value.pair_count = 0;
-							result = 0;
-						}
-						else
-						{
-							if (internal_decoder_data->bytes_decoded == 4)
-							{
-								internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_COUNT;
-								internal_decoder_data->bytes_decoded = 0;
-								internal_decoder_data->decode_to_value->value.map_value.pair_count = 0;
-							}
-							result = 0;
-						}
-
-						break;
-
-					case DECODE_MAP_STEP_COUNT:
-						if (internal_decoder_data->constructor_byte == 0xC1)
-						{
-							internal_decoder_data->decode_to_value->value.map_value.pair_count = buffer[0];
-						}
-						else
-						{
-							internal_decoder_data->decode_to_value->value.map_value.pair_count += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
-						}
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->constructor_byte == 0xC1)
-						{
-							if (internal_decoder_data->decode_to_value->value.map_value.pair_count == 0)
-							{
-								internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-								internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-								result = 0;
-							}
-							else
-							{
-								uint32_t i;
-
-								internal_decoder_data->decode_to_value->value.map_value.pair_count /= 2;
-
-								internal_decoder_data->decode_to_value->value.map_value.pairs = (AMQP_MAP_KEY_VALUE_PAIR*)malloc(sizeof(AMQP_MAP_KEY_VALUE_PAIR) * (internal_decoder_data->decode_to_value->value.map_value.pair_count * 2));
-								if (internal_decoder_data->decode_to_value->value.map_value.pairs == NULL)
-								{
+                        break;
+
+                    case DECODE_MAP_STEP_SIZE:
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->constructor_byte == 0xC1)
+                        {
+                            internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_COUNT;
+                            internal_decoder_data->bytes_decoded = 0;
+                            internal_decoder_data->decode_to_value->value.map_value.pair_count = 0;
+                            result = 0;
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->bytes_decoded == 4)
+                            {
+                                internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_COUNT;
+                                internal_decoder_data->bytes_decoded = 0;
+                                internal_decoder_data->decode_to_value->value.map_value.pair_count = 0;
+                            }
+                            result = 0;
+                        }
+
+                        break;
+
+                    case DECODE_MAP_STEP_COUNT:
+                        if (internal_decoder_data->constructor_byte == 0xC1)
+                        {
+                            internal_decoder_data->decode_to_value->value.map_value.pair_count = buffer[0];
+                        }
+                        else
+                        {
+                            internal_decoder_data->decode_to_value->value.map_value.pair_count += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
+                        }
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->constructor_byte == 0xC1)
+                        {
+                            if (internal_decoder_data->decode_to_value->value.map_value.pair_count == 0)
+                            {
+                                internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                                internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                result = 0;
+                            }
+                            else
+                            {
+                                uint32_t i;
+
+                                internal_decoder_data->decode_to_value->value.map_value.pair_count /= 2;
+
+                                internal_decoder_data->decode_to_value->value.map_value.pairs = (AMQP_MAP_KEY_VALUE_PAIR*)malloc(sizeof(AMQP_MAP_KEY_VALUE_PAIR) * (internal_decoder_data->decode_to_value->value.map_value.pair_count * 2));
+                                if (internal_decoder_data->decode_to_value->value.map_value.pairs == NULL)
+                                {
                                     LogError("Could not allocate memory for map value items");
                                     result = __FAILURE__;
-								}
-								else
-								{
-									for (i = 0; i < internal_decoder_data->decode_to_value->value.map_value.pair_count; i++)
-									{
-										internal_decoder_data->decode_to_value->value.map_value.pairs[i].key = NULL;
-										internal_decoder_data->decode_to_value->value.map_value.pairs[i].value = NULL;
-									}
-
-									internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_PAIRS;
-									internal_decoder_data->bytes_decoded = 0;
-									internal_decoder_data->inner_decoder = NULL;
-									internal_decoder_data->decode_value_state.map_value_state.item = 0;
-									result = 0;
-								}
-							}
-						}
-						else
-						{
-							if (internal_decoder_data->bytes_decoded == 4)
-							{
-								if (internal_decoder_data->decode_to_value->value.map_value.pair_count == 0)
-								{
-									internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-									internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-									result = 0;
-								}
-								else
-								{
-									uint32_t i;
-
-									internal_decoder_data->decode_to_value->value.map_value.pair_count /= 2;
-
-									internal_decoder_data->decode_to_value->value.map_value.pairs = (AMQP_MAP_KEY_VALUE_PAIR*)malloc(sizeof(AMQP_MAP_KEY_VALUE_PAIR) * (internal_decoder_data->decode_to_value->value.map_value.pair_count * 2));
-									if (internal_decoder_data->decode_to_value->value.map_value.pairs == NULL)
-									{
+                                }
+                                else
+                                {
+                                    for (i = 0; i < internal_decoder_data->decode_to_value->value.map_value.pair_count; i++)
+                                    {
+                                        internal_decoder_data->decode_to_value->value.map_value.pairs[i].key = NULL;
+                                        internal_decoder_data->decode_to_value->value.map_value.pairs[i].value = NULL;
+                                    }
+
+                                    internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_PAIRS;
+                                    internal_decoder_data->bytes_decoded = 0;
+                                    internal_decoder_data->inner_decoder = NULL;
+                                    internal_decoder_data->decode_value_state.map_value_state.item = 0;
+                                    result = 0;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->bytes_decoded == 4)
+                            {
+                                if (internal_decoder_data->decode_to_value->value.map_value.pair_count == 0)
+                                {
+                                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                    result = 0;
+                                }
+                                else
+                                {
+                                    uint32_t i;
+
+                                    internal_decoder_data->decode_to_value->value.map_value.pair_count /= 2;
+
+                                    internal_decoder_data->decode_to_value->value.map_value.pairs = (AMQP_MAP_KEY_VALUE_PAIR*)malloc(sizeof(AMQP_MAP_KEY_VALUE_PAIR) * (internal_decoder_data->decode_to_value->value.map_value.pair_count * 2));
+                                    if (internal_decoder_data->decode_to_value->value.map_value.pairs == NULL)
+                                    {
                                         LogError("Could not allocate memory for map value items");
                                         result = __FAILURE__;
-									}
-									else
-									{
-										for (i = 0; i < internal_decoder_data->decode_to_value->value.map_value.pair_count; i++)
-										{
-											internal_decoder_data->decode_to_value->value.map_value.pairs[i].key = NULL;
-											internal_decoder_data->decode_to_value->value.map_value.pairs[i].value = NULL;
-										}
-
-										internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_PAIRS;
-										internal_decoder_data->bytes_decoded = 0;
-										internal_decoder_data->inner_decoder = NULL;
-										internal_decoder_data->decode_value_state.map_value_state.item = 0;
-										result = 0;
-									}
-								}
-							}
-							else
-							{
-								result = 0;
-							}
-						}
-						break;
-
-					case DECODE_MAP_STEP_PAIRS:
-					{
-						size_t inner_used_bytes;
-
-						if (internal_decoder_data->bytes_decoded == 0)
-						{
-							AMQP_VALUE_DATA* map_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-							if (map_item == NULL)
-							{
+                                    }
+                                    else
+                                    {
+                                        for (i = 0; i < internal_decoder_data->decode_to_value->value.map_value.pair_count; i++)
+                                        {
+                                            internal_decoder_data->decode_to_value->value.map_value.pairs[i].key = NULL;
+                                            internal_decoder_data->decode_to_value->value.map_value.pairs[i].value = NULL;
+                                        }
+
+                                        internal_decoder_data->decode_value_state.map_value_state.map_value_state = DECODE_MAP_STEP_PAIRS;
+                                        internal_decoder_data->bytes_decoded = 0;
+                                        internal_decoder_data->inner_decoder = NULL;
+                                        internal_decoder_data->decode_value_state.map_value_state.item = 0;
+                                        result = 0;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                result = 0;
+                            }
+                        }
+                        break;
+
+                    case DECODE_MAP_STEP_PAIRS:
+                    {
+                        size_t inner_used_bytes;
+
+                        if (internal_decoder_data->bytes_decoded == 0)
+                        {
+                            AMQP_VALUE_DATA* map_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+                            if (map_item == NULL)
+                            {
                                 LogError("Could not allocate memory for map item");
                                 internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
-								result = __FAILURE__;
-							}
-							else
-							{
-								map_item->type = AMQP_TYPE_UNKNOWN;
-								if (internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].key == NULL)
-								{
-									internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].key = map_item;
-								}
-								else
-								{
-									internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].value = map_item;
-								}
-								internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, map_item, true);
-								if (internal_decoder_data->inner_decoder == NULL)
-								{
+                                result = __FAILURE__;
+                            }
+                            else
+                            {
+                                map_item->type = AMQP_TYPE_UNKNOWN;
+                                if (internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].key == NULL)
+                                {
+                                    internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].key = map_item;
+                                }
+                                else
+                                {
+                                    internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].value = map_item;
+                                }
+                                internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, map_item, true);
+                                if (internal_decoder_data->inner_decoder == NULL)
+                                {
                                     LogError("Could not create inner decoder for map item");
                                     internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
-									result = __FAILURE__;
-								}
-								else
-								{
-									result = 0;
-								}
-							}
-						}
-
-						if (internal_decoder_data->inner_decoder == NULL)
-						{
+                                    result = __FAILURE__;
+                                }
+                                else
+                                {
+                                    result = 0;
+                                }
+                            }
+                        }
+
+                        if (internal_decoder_data->inner_decoder == NULL)
+                        {
                             LogError("NULL inner decoder. This should not happen under normal circumstances");
                             result = __FAILURE__;
-						}
-						else if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
-						{
+                        }
+                        else if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
+                        {
                             LogError("Could not decode map item");
                             result = __FAILURE__;
-						}
-						else
-						{
-							INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
-							internal_decoder_data->bytes_decoded += inner_used_bytes;
-							buffer += inner_used_bytes;
-							size -= inner_used_bytes;
-
-							if (inner_decoder->decoder_state == DECODER_STATE_DONE)
-							{
-								internal_decoder_destroy(inner_decoder);
-								internal_decoder_data->inner_decoder = NULL;
-								internal_decoder_data->bytes_decoded = 0;
-
-								if (internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].value != NULL)
-								{
-									internal_decoder_data->decode_value_state.map_value_state.item++;
-									if (internal_decoder_data->decode_value_state.map_value_state.item == internal_decoder_data->decode_to_value->value.map_value.pair_count)
-									{
-										internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-										internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-									}
-								}
-							}
-
-							result = 0;
-						}
-
-						break;
-					}
-					}
-
-					break;
-				}
-				case 0xE0:
-				case 0xF0:
-				{
-					DECODE_ARRAY_STEP step = internal_decoder_data->decode_value_state.array_value_state.array_value_state;
-
-					switch (step)
-					{
-					default:
+                        }
+                        else
+                        {
+                            INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
+                            internal_decoder_data->bytes_decoded += inner_used_bytes;
+                            buffer += inner_used_bytes;
+                            size -= inner_used_bytes;
+
+                            if (inner_decoder->decoder_state == DECODER_STATE_DONE)
+                            {
+                                internal_decoder_destroy(inner_decoder);
+                                internal_decoder_data->inner_decoder = NULL;
+                                internal_decoder_data->bytes_decoded = 0;
+
+                                if (internal_decoder_data->decode_to_value->value.map_value.pairs[internal_decoder_data->decode_value_state.map_value_state.item].value != NULL)
+                                {
+                                    internal_decoder_data->decode_value_state.map_value_state.item++;
+                                    if (internal_decoder_data->decode_value_state.map_value_state.item == internal_decoder_data->decode_to_value->value.map_value.pair_count)
+                                    {
+                                        internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                                        internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                    }
+                                }
+                            }
+
+                            result = 0;
+                        }
+
+                        break;
+                    }
+                    }
+
+                    break;
+                }
+                case 0xE0:
+                case 0xF0:
+                {
+                    DECODE_ARRAY_STEP step = internal_decoder_data->decode_value_state.array_value_state.array_value_state;
+
+                    switch (step)
+                    {
+                    default:
                         LogError("Invalid step in decoding array value: %d", step);
                         result = __FAILURE__;
-						break;
-
-					case DECODE_ARRAY_STEP_SIZE:
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->constructor_byte == 0xE0)
-						{
-							internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_COUNT;
-							internal_decoder_data->bytes_decoded = 0;
-							internal_decoder_data->decode_to_value->value.array_value.count = 0;
-							result = 0;
-						}
-						else
-						{
-							if (internal_decoder_data->bytes_decoded == 4)
-							{
-								internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_COUNT;
-								internal_decoder_data->bytes_decoded = 0;
-								internal_decoder_data->decode_to_value->value.array_value.count = 0;
-							}
-							result = 0;
-						}
-
-						break;
-
-					case DECODE_ARRAY_STEP_COUNT:
-						if (internal_decoder_data->constructor_byte == 0xE0)
-						{
-							internal_decoder_data->decode_to_value->value.array_value.count = buffer[0];
-						}
-						else
-						{
-							internal_decoder_data->decode_to_value->value.array_value.count += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
-						}
-
-						internal_decoder_data->bytes_decoded++;
-						buffer++;
-						size--;
-
-						if (internal_decoder_data->constructor_byte == 0xE0)
-						{
-							if (internal_decoder_data->decode_to_value->value.array_value.count == 0)
-							{
-								internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-
-								internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-								result = 0;
-							}
-							else
-							{
-								uint32_t i;
-								internal_decoder_data->decode_to_value->value.array_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.array_value.count);
-								if (internal_decoder_data->decode_to_value->value.array_value.items == NULL)
-								{
+                        break;
+
+                    case DECODE_ARRAY_STEP_SIZE:
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->constructor_byte == 0xE0)
+                        {
+                            internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_COUNT;
+                            internal_decoder_data->bytes_decoded = 0;
+                            internal_decoder_data->decode_to_value->value.array_value.count = 0;
+                            result = 0;
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->bytes_decoded == 4)
+                            {
+                                internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_COUNT;
+                                internal_decoder_data->bytes_decoded = 0;
+                                internal_decoder_data->decode_to_value->value.array_value.count = 0;
+                            }
+                            result = 0;
+                        }
+
+                        break;
+
+                    case DECODE_ARRAY_STEP_COUNT:
+                        if (internal_decoder_data->constructor_byte == 0xE0)
+                        {
+                            internal_decoder_data->decode_to_value->value.array_value.count = buffer[0];
+                        }
+                        else
+                        {
+                            internal_decoder_data->decode_to_value->value.array_value.count += buffer[0] << ((3 - internal_decoder_data->bytes_decoded) * 8);
+                        }
+
+                        internal_decoder_data->bytes_decoded++;
+                        buffer++;
+                        size--;
+
+                        if (internal_decoder_data->constructor_byte == 0xE0)
+                        {
+                            if (internal_decoder_data->decode_to_value->value.array_value.count == 0)
+                            {
+                                internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+
+                                internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                result = 0;
+                            }
+                            else
+                            {
+                                uint32_t i;
+                                internal_decoder_data->decode_to_value->value.array_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.array_value.count);
+                                if (internal_decoder_data->decode_to_value->value.array_value.items == NULL)
+                                {
                                     LogError("Could not allocate memory for array items");
                                     result = __FAILURE__;
-								}
-								else
-								{
-									for (i = 0; i < internal_decoder_data->decode_to_value->value.array_value.count; i++)
-									{
-										internal_decoder_data->decode_to_value->value.array_value.items[i] = NULL;
-									}
-
-									internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_ITEMS;
-									internal_decoder_data->bytes_decoded = 0;
-									internal_decoder_data->inner_decoder = NULL;
-									internal_decoder_data->decode_value_state.array_value_state.item = 0;
-									result = 0;
-								}
-							}
-						}
-						else
-						{
-							if (internal_decoder_data->bytes_decoded == 4)
-							{
-								if (internal_decoder_data->decode_to_value->value.array_value.count == 0)
-								{
-									internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-									internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-									result = 0;
-								}
-								else
-								{
-									uint32_t i;
-									internal_decoder_data->decode_to_value->value.array_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.array_value.count);
-									if (internal_decoder_data->decode_to_value->value.array_value.items == NULL)
-									{
+                                }
+                                else
+                                {
+                                    for (i = 0; i < internal_decoder_data->decode_to_value->value.array_value.count; i++)
+                                    {
+                                        internal_decoder_data->decode_to_value->value.array_value.items[i] = NULL;
+                                    }
+
+                                    internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_ITEMS;
+                                    internal_decoder_data->bytes_decoded = 0;
+                                    internal_decoder_data->inner_decoder = NULL;
+                                    internal_decoder_data->decode_value_state.array_value_state.item = 0;
+                                    result = 0;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (internal_decoder_data->bytes_decoded == 4)
+                            {
+                                if (internal_decoder_data->decode_to_value->value.array_value.count == 0)
+                                {
+                                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+                                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+                                    result = 0;
+                                }
+                                else
+                                {
+                                    uint32_t i;
+                                    internal_decoder_data->decode_to_value->value.array_value.items = (AMQP_VALUE*)malloc(sizeof(AMQP_VALUE) * internal_decoder_data->decode_to_value->value.array_value.count);
+                                    if (internal_decoder_data->decode_to_value->value.array_value.items == NULL)
+                                    {
                                         LogError("Could not allocate memory for array items");
                                         result = __FAILURE__;
-									}
-									else
-									{
-										for (i = 0; i < internal_decoder_data->decode_to_value->value.array_value.count; i++)
-										{
-											internal_decoder_data->decode_to_value->value.array_value.items[i] = NULL;
-										}
-										internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_ITEMS;
-										internal_decoder_data->bytes_decoded = 0;
-										internal_decoder_data->inner_decoder = NULL;
-										internal_decoder_data->decode_value_state.array_value_state.item = 0;
-										result = 0;
-									}
-								}
-							}
-							else
-							{
-								result = 0;
-							}
-						}
-						break;
-
-					case DECODE_ARRAY_STEP_ITEMS:
-					{
-						size_t inner_used_bytes;
-
-						if (internal_decoder_data->bytes_decoded == 0)
-						{
-							AMQP_VALUE_DATA* array_item;
-							internal_decoder_data->decode_value_state.array_value_state.constructor_byte = buffer[0];
-
-							array_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-							if (array_item == NULL)
-							{
+                                    }
+                                    else
+                                    {
+                                        for (i = 0; i < internal_decoder_data->decode_to_value->value.array_value.count; i++)
+                                        {
+                                            internal_decoder_data->decode_to_value->value.array_value.items[i] = NULL;
+                                        }
+                                        internal_decoder_data->decode_value_state.array_value_state.array_value_state = DECODE_ARRAY_STEP_ITEMS;
+                                        internal_decoder_data->bytes_decoded = 0;
+                                        internal_decoder_data->inner_decoder = NULL;
+                                        internal_decoder_data->decode_value_state.array_value_state.item = 0;
+                                        result = 0;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                result = 0;
+                            }
+                        }
+                        break;
+
+                    case DECODE_ARRAY_STEP_ITEMS:
+                    {
+                        size_t inner_used_bytes;
+
+                        if (internal_decoder_data->bytes_decoded == 0)
+                        {
+                            AMQP_VALUE_DATA* array_item;
+                            internal_decoder_data->decode_value_state.array_value_state.constructor_byte = buffer[0];
+
+                            array_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+                            if (array_item == NULL)
+                            {
                                 LogError("Could not allocate memory for array item to be decoded");
                                 internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                 result = __FAILURE__;
-							}
-							else
-							{
-								array_item->type = AMQP_TYPE_UNKNOWN;
-								internal_decoder_data->decode_to_value->value.array_value.items[internal_decoder_data->decode_value_state.array_value_state.item] = array_item;
-								internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, array_item, true);
-								if (internal_decoder_data->inner_decoder == NULL)
-								{
-									internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
+                            }
+                            else
+                            {
+                                array_item->type = AMQP_TYPE_UNKNOWN;
+                                internal_decoder_data->decode_to_value->value.array_value.items[internal_decoder_data->decode_value_state.array_value_state.item] = array_item;
+                                internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, array_item, true);
+                                if (internal_decoder_data->inner_decoder == NULL)
+                                {
+                                    internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
                                     LogError("Could not create inner decoder for array items");
                                     result = __FAILURE__;
-								}
-								else
-								{
-									result = 0;
-								}
-							}
-						}
-
-						if (internal_decoder_data->inner_decoder == NULL)
-						{
+                                }
+                                else
+                                {
+                                    result = 0;
+                                }
+                            }
+                        }
+
+                        if (internal_decoder_data->inner_decoder == NULL)
+                        {
                             LogError("NULL inner decoder. This should not happen under normal circumstances");
                             result = __FAILURE__;
-						}
-						else if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
-						{
+                        }
+                        else if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, buffer, size, &inner_used_bytes) != 0)
+                        {
                             LogError("Could not decode array item");
                             result = __FAILURE__;
-						}
-						else
-						{
-							INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
-							internal_decoder_data->bytes_decoded += inner_used_bytes;
-							buffer += inner_used_bytes;
-							size -= inner_used_bytes;
-
-							if (inner_decoder->decoder_state == DECODER_STATE_DONE)
-							{
-								internal_decoder_destroy(inner_decoder);
-								internal_decoder_data->inner_decoder = NULL;
-
-								internal_decoder_data->decode_value_state.array_value_state.item++;
-								if (internal_decoder_data->decode_value_state.array_value_state.item == internal_decoder_data->decode_to_value->value.array_value.count)
-								{
-									internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
-									internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
-
-									result = 0;
-								}
-								else
-								{
-									AMQP_VALUE_DATA* array_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-									if (array_item == NULL)
-									{
+                        }
+                        else
+                        {
+                            INTERNAL_DECODER_DATA* inner_decoder = (INTERNAL_DECODER_DATA*)internal_decoder_data->inner_decoder;
+                            internal_decoder_data->bytes_decoded += inner_used_bytes;
+                            buffer += inner_used_bytes;
+                            size -= inner_used_bytes;
+
+                            if (inner_decoder->decoder_state == DECODER_STATE_DONE)
+                            {
+                                internal_decoder_destroy(inner_decoder);
+                                internal_decoder_data->inner_decoder = NULL;
+
+                                internal_decoder_data->decode_value_state.array_value_state.item++;
+                                if (internal_decoder_data->decode_value_state.array_value_state.item == internal_decoder_data->decode_to_value->value.array_value.count)
+                                {
+                                    internal_decoder_data->decoder_state = DECODER_STATE_CONSTRUCTOR;
+                                    internal_decoder_data->on_value_decoded(internal_decoder_data->on_value_decoded_context, internal_decoder_data->decode_to_value);
+
+                                    result = 0;
+                                }
+                                else
+                                {
+                                    AMQP_VALUE_DATA* array_item = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+                                    if (array_item == NULL)
+                                    {
                                         LogError("Could not allocate memory for array item");
                                         internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
-										result = __FAILURE__;
-									}
-									else
-									{
-										array_item->type = AMQP_TYPE_UNKNOWN;
-										internal_decoder_data->decode_to_value->value.array_value.items[internal_decoder_data->decode_value_state.array_value_state.item] = array_item;
-										internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, array_item, true);
-										if (internal_decoder_data->inner_decoder == NULL)
-										{
+                                        result = __FAILURE__;
+                                    }
+                                    else
+                                    {
+                                        array_item->type = AMQP_TYPE_UNKNOWN;
+                                        internal_decoder_data->decode_to_value->value.array_value.items[internal_decoder_data->decode_value_state.array_value_state.item] = array_item;
+                                        internal_decoder_data->inner_decoder = internal_decoder_create(inner_decoder_callback, internal_decoder_data, array_item, true);
+                                        if (internal_decoder_data->inner_decoder == NULL)
+                                        {
                                             LogError("Could not create inner decoder for array item");
                                             internal_decoder_data->decoder_state = DECODER_STATE_ERROR;
-											result = __FAILURE__;
-										}
-										else
-										{
-											if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, &internal_decoder_data->decode_value_state.array_value_state.constructor_byte, 1, NULL) != 0)
-											{
+                                            result = __FAILURE__;
+                                        }
+                                        else
+                                        {
+                                            if (internal_decoder_decode_bytes(internal_decoder_data->inner_decoder, &internal_decoder_data->decode_value_state.array_value_state.constructor_byte, 1, NULL) != 0)
+                                            {
                                                 LogError("Could not decode array item data");
                                                 result = __FAILURE__;
-											}
-											else
-											{
-												result = 0;
-											}
-										}
-									}
-								}
-							}
-							else
-							{
-								result = 0;
-							}
-						}
-
-						break;
-					}
-					}
-
-					break;
-				}
-				}
-				break;
-			}
-			}
-
-			if (result != 0)
-			{
-				break;
-			}
-		}
-	}
-
-	if (used_bytes != NULL)
-	{
-		*used_bytes = initial_size - size;
-	}
-
-	return result;
+                                            }
+                                            else
+                                            {
+                                                result = 0;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                result = 0;
+                            }
+                        }
+
+                        break;
+                    }
+                    }
+
+                    break;
+                }
+                }
+                break;
+            }
+            }
+
+            if (result != 0)
+            {
+                break;
+            }
+        }
+    }
+
+    if (used_bytes != NULL)
+    {
+        *used_bytes = initial_size - size;
+    }
+
+    return result;
 }
 
 AMQPVALUE_DECODER_HANDLE amqpvalue_decoder_create(ON_VALUE_DECODED on_value_decoded, void* callback_context)
 {
-	AMQPVALUE_DECODER_HANDLE_DATA* decoder_instance;
-
-	/* Codes_SRS_AMQPVALUE_01_312: [If the on_value_decoded argument is NULL, amqpvalue_decoder_create shall return NULL.] */
-	if (on_value_decoded == NULL)
-	{
+    AMQPVALUE_DECODER_HANDLE_DATA* decoder_instance;
+
+    /* Codes_SRS_AMQPVALUE_01_312: [If the on_value_decoded argument is NULL, amqpvalue_decoder_create shall return NULL.] */
+    if (on_value_decoded == NULL)
+    {
         LogError("NULL on_value_decoded");
         decoder_instance = NULL;
-	}
-	else
-	{
-		decoder_instance = (AMQPVALUE_DECODER_HANDLE_DATA*)malloc(sizeof(AMQPVALUE_DECODER_HANDLE_DATA));
-		/* Codes_SRS_AMQPVALUE_01_313: [If creating the decoder fails, amqpvalue_decoder_create shall return NULL.] */
+    }
+    else
+    {
+        decoder_instance = (AMQPVALUE_DECODER_HANDLE_DATA*)malloc(sizeof(AMQPVALUE_DECODER_HANDLE_DATA));
+        /* Codes_SRS_AMQPVALUE_01_313: [If creating the decoder fails, amqpvalue_decoder_create shall return NULL.] */
         if (decoder_instance == NULL)
         {
             LogError("Could not allocate memory for AMQP value decoder");
         }
         else
         {
-			decoder_instance->decode_to_value = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
-			if (decoder_instance->decode_to_value == NULL)
-			{
-				/* Codes_SRS_AMQPVALUE_01_313: [If creating the decoder fails, amqpvalue_decoder_create shall return NULL.] */
+            decoder_instance->decode_to_value = REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+            if (decoder_instance->decode_to_value == NULL)
+            {
+                /* Codes_SRS_AMQPVALUE_01_313: [If creating the decoder fails, amqpvalue_decoder_create shall return NULL.] */
                 LogError("Could not allocate memory for decoded AMQP value");
                 free(decoder_instance);
-				decoder_instance = NULL;
-			}
-			else
-			{
-				decoder_instance->decode_to_value->type = AMQP_TYPE_UNKNOWN;
-				decoder_instance->internal_decoder = internal_decoder_create(on_value_decoded, callback_context, decoder_instance->decode_to_value, false);
-				if (decoder_instance->internal_decoder == NULL)
-				{
-					/* Codes_SRS_AMQPVALUE_01_313: [If creating the decoder fails, amqpvalue_decoder_create shall return NULL.] */
+                decoder_instance = NULL;
+            }
+            else
+            {
+                decoder_instance->decode_to_value->type = AMQP_TYPE_UNKNOWN;
+                decoder_instance->internal_decoder = internal_decoder_create(on_value_decoded, callback_context, decoder_instance->decode_to_value, false);
+                if (decoder_instance->internal_decoder == NULL)
+                {
+                    /* Codes_SRS_AMQPVALUE_01_313: [If creating the decoder fails, amqpvalue_decoder_create shall return NULL.] */
                     LogError("Could not create the internal decoder");
                     free(decoder_instance->decode_to_value);
-					free(decoder_instance);
-					decoder_instance = NULL;
-				}
-			}
-		}
-	}
-
-	/* Codes_SRS_AMQPVALUE_01_311: [amqpvalue_decoder_create shall create a new amqp value decoder and return a non-NULL handle to it.] */
-	return decoder_instance;
+                    free(decoder_instance);
+                    decoder_instance = NULL;
+                }
+            }
+        }
+    }
+
+    /* Codes_SRS_AMQPVALUE_01_311: [amqpvalue_decoder_create shall create a new amqp value decoder and return a non-NULL handle to it.] */
+    return decoder_instance;
 }
 
 void amqpvalue_decoder_destroy(AMQPVALUE_DECODER_HANDLE handle)
@@ -5390,293 +5392,293 @@
     }
     else
     {
-    	AMQPVALUE_DECODER_HANDLE_DATA* decoder_instance = (AMQPVALUE_DECODER_HANDLE_DATA*)handle;
-		/* Codes_SRS_AMQPVALUE_01_316: [amqpvalue_decoder_destroy shall free all resources associated with the amqpvalue_decoder.] */
-		amqpvalue_destroy(decoder_instance->internal_decoder->decode_to_value);
-		internal_decoder_destroy(decoder_instance->internal_decoder);
-		free(handle);
-	}
+        AMQPVALUE_DECODER_HANDLE_DATA* decoder_instance = (AMQPVALUE_DECODER_HANDLE_DATA*)handle;
+        /* Codes_SRS_AMQPVALUE_01_316: [amqpvalue_decoder_destroy shall free all resources associated with the amqpvalue_decoder.] */
+        amqpvalue_destroy(decoder_instance->internal_decoder->decode_to_value);
+        internal_decoder_destroy(decoder_instance->internal_decoder);
+        free(handle);
+    }
 }
 
 /* Codes_SRS_AMQPVALUE_01_318: [amqpvalue_decode_bytes shall decode size bytes that are passed in the buffer argument.] */
 int amqpvalue_decode_bytes(AMQPVALUE_DECODER_HANDLE handle, const unsigned char* buffer, size_t size)
 {
-	int result;
-
-	AMQPVALUE_DECODER_HANDLE_DATA* decoder_instance = (AMQPVALUE_DECODER_HANDLE_DATA*)handle;
-	/* Codes_SRS_AMQPVALUE_01_320: [If handle or buffer are NULL, amqpvalue_decode_bytes shall return a non-zero value.] */
-	if ((decoder_instance == NULL) ||
-		(buffer == NULL) ||
-		/* Codes_SRS_AMQPVALUE_01_321: [If size is 0, amqpvalue_decode_bytes shall return a non-zero value.] */
-		(size == 0))
-	{
+    int result;
+
+    AMQPVALUE_DECODER_HANDLE_DATA* decoder_instance = (AMQPVALUE_DECODER_HANDLE_DATA*)handle;
+    /* Codes_SRS_AMQPVALUE_01_320: [If handle or buffer are NULL, amqpvalue_decode_bytes shall return a non-zero value.] */
+    if ((decoder_instance == NULL) ||
+        (buffer == NULL) ||
+        /* Codes_SRS_AMQPVALUE_01_321: [If size is 0, amqpvalue_decode_bytes shall return a non-zero value.] */
+        (size == 0))
+    {
         LogError("Bad arguments: decoder_instance = %p, buffer = %p, size = %u",
             decoder_instance, buffer, size);
         result = __FAILURE__;
-	}
-	else
-	{
-		size_t used_bytes;
-
-		/* Codes_SRS_AMQPVALUE_01_318: [amqpvalue_decode_bytes shall decode size bytes that are passed in the buffer argument.] */
-		if (internal_decoder_decode_bytes(decoder_instance->internal_decoder, buffer, size, &used_bytes) != 0)
-		{
+    }
+    else
+    {
+        size_t used_bytes;
+
+        /* Codes_SRS_AMQPVALUE_01_318: [amqpvalue_decode_bytes shall decode size bytes that are passed in the buffer argument.] */
+        if (internal_decoder_decode_bytes(decoder_instance->internal_decoder, buffer, size, &used_bytes) != 0)
+        {
             LogError("Failed decoding bytes");
             result = __FAILURE__;
-		}
-		else
-		{
-			/* Codes_SRS_AMQPVALUE_01_319: [On success, amqpvalue_decode_bytes shall return 0.] */
-			result = 0;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            /* Codes_SRS_AMQPVALUE_01_319: [On success, amqpvalue_decode_bytes shall return 0.] */
+            result = 0;
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_get_inplace_descriptor(AMQP_VALUE value)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if ((value_data->type != AMQP_TYPE_DESCRIBED) &&
-			(value_data->type != AMQP_TYPE_COMPOSITE))
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if ((value_data->type != AMQP_TYPE_DESCRIBED) &&
+            (value_data->type != AMQP_TYPE_COMPOSITE))
+        {
             LogError("Type is not described or composite");
             result = NULL;
-		}
-		else
-		{
-			result = value_data->value.described_value.descriptor;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            result = value_data->value.described_value.descriptor;
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_get_inplace_described_value(AMQP_VALUE value)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if ((value_data->type != AMQP_TYPE_DESCRIBED) &&
-			(value_data->type != AMQP_TYPE_COMPOSITE))
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if ((value_data->type != AMQP_TYPE_DESCRIBED) &&
+            (value_data->type != AMQP_TYPE_COMPOSITE))
+        {
             LogError("Type is not described or composite");
             result = NULL;
-		}
-		else
-		{
-			result = value_data->value.described_value.value;
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            result = value_data->value.described_value.value;
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_create_described(AMQP_VALUE descriptor, AMQP_VALUE value)
 {
-	AMQP_VALUE_DATA* result = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE_DATA* result = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         LogError("Cannot allocate memory for described type");
     }
     else
     {
-		result->type = AMQP_TYPE_DESCRIBED;
-		result->value.described_value.descriptor = descriptor;
-		result->value.described_value.value = value;
-	}
-
-	return result;
+        result->type = AMQP_TYPE_DESCRIBED;
+        result->value.described_value.descriptor = descriptor;
+        result->value.described_value.value = value;
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_create_composite(AMQP_VALUE descriptor, uint32_t list_size)
 {
-	AMQP_VALUE_DATA* result = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE_DATA* result = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         LogError("Cannot allocate memory for composite type");
     }
     else
     {
-		result->type = AMQP_TYPE_COMPOSITE;
-		result->value.described_value.descriptor = amqpvalue_clone(descriptor);
-		if (result->value.described_value.descriptor == NULL)
-		{
+        result->type = AMQP_TYPE_COMPOSITE;
+        result->value.described_value.descriptor = amqpvalue_clone(descriptor);
+        if (result->value.described_value.descriptor == NULL)
+        {
             LogError("Cannot clone descriptor for composite type");
             free(result);
-			result = NULL;
-		}
-		else
-		{
-			result->value.described_value.value = amqpvalue_create_list();
-			if (result->value.described_value.value == NULL)
-			{
+            result = NULL;
+        }
+        else
+        {
+            result->value.described_value.value = amqpvalue_create_list();
+            if (result->value.described_value.value == NULL)
+            {
                 LogError("Cannot create list for composite type");
                 amqpvalue_destroy(result->value.described_value.descriptor);
-				free(result);
-				result = NULL;
-			}
-			else
-			{
-				if (amqpvalue_set_list_item_count(result->value.described_value.value, list_size) != 0)
-				{
+                free(result);
+                result = NULL;
+            }
+            else
+            {
+                if (amqpvalue_set_list_item_count(result->value.described_value.value, list_size) != 0)
+                {
                     LogError("Cannot set list item count for composite type");
                     amqpvalue_destroy(result->value.described_value.descriptor);
-					amqpvalue_destroy(result->value.described_value.value);
-					free(result);
-					result = NULL;
-				}
-			}
-		}
-	}
-
-	return result;
+                    amqpvalue_destroy(result->value.described_value.value);
+                    free(result);
+                    result = NULL;
+                }
+            }
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_create_composite_with_ulong_descriptor(uint64_t descriptor)
 {
-	AMQP_VALUE_DATA* result = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
+    AMQP_VALUE_DATA* result = (AMQP_VALUE_DATA*)REFCOUNT_TYPE_CREATE(AMQP_VALUE_DATA);
     if (result == NULL)
     {
         LogError("Cannot allocate memory for composite type");
     }
     else
     {
-		AMQP_VALUE descriptor_ulong_value = amqpvalue_create_ulong(descriptor);
-		if (descriptor_ulong_value == NULL)
-		{
+        AMQP_VALUE descriptor_ulong_value = amqpvalue_create_ulong(descriptor);
+        if (descriptor_ulong_value == NULL)
+        {
             LogError("Cannot create ulong descriptor for composite type");
             free(result);
-			result = NULL;
-		}
-		else
-		{
-			result->type = AMQP_TYPE_COMPOSITE;
-			result->value.described_value.descriptor = descriptor_ulong_value;
-			result->value.described_value.value = amqpvalue_create_list();
-			if (result->value.described_value.value == NULL)
-			{
+            result = NULL;
+        }
+        else
+        {
+            result->type = AMQP_TYPE_COMPOSITE;
+            result->value.described_value.descriptor = descriptor_ulong_value;
+            result->value.described_value.value = amqpvalue_create_list();
+            if (result->value.described_value.value == NULL)
+            {
                 LogError("Cannot create list for composite type");
                 amqpvalue_destroy(descriptor_ulong_value);
-				free(result);
-				result = NULL;
-			}
-		}
-	}
-
-	return result;
+                free(result);
+                result = NULL;
+            }
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_set_composite_item(AMQP_VALUE value, uint32_t index, AMQP_VALUE item_value)
 {
-	int result;
-
-	if (value == NULL)
-	{
+    int result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = __FAILURE__;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if (value_data->type != AMQP_TYPE_COMPOSITE)
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if (value_data->type != AMQP_TYPE_COMPOSITE)
+        {
             LogError("Attempt to set composite item on a non-composite type");
             result = __FAILURE__;
-		}
-		else
-		{
-			if (amqpvalue_set_list_item(value_data->value.described_value.value, index, item_value) != 0)
-			{
+        }
+        else
+        {
+            if (amqpvalue_set_list_item(value_data->value.described_value.value, index, item_value) != 0)
+            {
                 LogError("amqpvalue_set_list_item failed for composite item");
                 result = __FAILURE__;
-			}
-			else
-			{
-				result = 0;
-			}
-		}
-	}
-
-	return result;
+            }
+            else
+            {
+                result = 0;
+            }
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_get_composite_item(AMQP_VALUE value, size_t index)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if ((value_data->type != AMQP_TYPE_COMPOSITE) &&
-			(value_data->type != AMQP_TYPE_DESCRIBED))
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if ((value_data->type != AMQP_TYPE_COMPOSITE) &&
+            (value_data->type != AMQP_TYPE_DESCRIBED))
+        {
             LogError("Attempt to get composite item on a non-composite type");
             result = NULL;
-		}
-		else
-		{
-			result = amqpvalue_get_list_item(value_data->value.described_value.value, index);
+        }
+        else
+        {
+            result = amqpvalue_get_list_item(value_data->value.described_value.value, index);
             if (result == NULL)
             {
                 LogError("amqpvalue_get_list_item failed for composite item");
             }
-		}
-	}
-
-	return result;
+        }
+    }
+
+    return result;
 }
 
 AMQP_VALUE amqpvalue_get_composite_item_in_place(AMQP_VALUE value, size_t index)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-		if ((value_data->type != AMQP_TYPE_COMPOSITE) &&
-			(value_data->type != AMQP_TYPE_DESCRIBED))
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+        if ((value_data->type != AMQP_TYPE_COMPOSITE) &&
+            (value_data->type != AMQP_TYPE_DESCRIBED))
+        {
             LogError("Attempt to get composite item in place on a non-composite type");
             result = NULL;
-		}
-		else
-		{
-			result = amqpvalue_get_list_item_in_place(value_data->value.described_value.value, index);
+        }
+        else
+        {
+            result = amqpvalue_get_list_item_in_place(value_data->value.described_value.value, index);
             if (result == NULL)
             {
                 LogError("amqpvalue_get_list_item_in_place failed for composite item");
             }
-		}
-	}
-
-	return result;
+        }
+    }
+
+    return result;
 }
 
 int amqpvalue_get_composite_item_count(AMQP_VALUE value, uint32_t* item_count)
@@ -5716,28 +5718,28 @@
 
 AMQP_VALUE amqpvalue_get_list_item_in_place(AMQP_VALUE value, size_t index)
 {
-	AMQP_VALUE result;
-
-	if (value == NULL)
-	{
+    AMQP_VALUE result;
+
+    if (value == NULL)
+    {
         LogError("NULL value");
         result = NULL;
-	}
-	else
-	{
-		AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
-
-		if ((value_data->type != AMQP_TYPE_LIST) ||
-			(value_data->value.list_value.count <= index))
-		{
+    }
+    else
+    {
+        AMQP_VALUE_DATA* value_data = (AMQP_VALUE_DATA*)value;
+
+        if ((value_data->type != AMQP_TYPE_LIST) ||
+            (value_data->value.list_value.count <= index))
+        {
             LogError("Attempt to get list item in place on a non-list type");
             result = NULL;
-		}
-		else
-		{
-			result = value_data->value.list_value.items[index];
-		}
-	}
-
-	return result;
+        }
+        else
+        {
+            result = value_data->value.list_value.items[index];
+        }
+    }
+
+    return result;
 }