Azure IoT
A modelling and serializer library for Microsoft Azure IoTHub client applications
Dependents: sht15_remote_monitoring f767zi_mqtt remote_monitoring simplesample_amqp ... more
This library implements a serializer library to be used in projects involving Microsoft Azure IoT Hub connectivity. The code is replicated from https://github.com/Azure/azure-iot-sdks
Diff: schema.c
- Revision:
- 11:b1327861f5e0
- Parent:
- 10:c2aee3965a83
- Child:
- 13:16e88f0cfa5f
diff -r c2aee3965a83 -r b1327861f5e0 schema.c
--- a/schema.c Fri Apr 08 13:25:09 2016 -0700
+++ b/schema.c Sun Apr 24 16:40:59 2016 -0700
@@ -168,7 +168,7 @@
(type == NULL))
{
result = SCHEMA_INVALID_ARG;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -187,7 +187,7 @@
if (i < modelType->PropertyCount)
{
result = SCHEMA_DUPLICATE_ELEMENT;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -196,7 +196,7 @@
{
/* Codes_SRS_SCHEMA_99_014:[On any other error, Schema_AddModelProperty shall return SCHEMA_ERROR.] */
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -207,7 +207,7 @@
{
/* Codes_SRS_SCHEMA_99_014:[On any other error, Schema_AddModelProperty shall return SCHEMA_ERROR.] */
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -216,7 +216,7 @@
/* Codes_SRS_SCHEMA_99_014:[On any other error, Schema_AddModelProperty shall return SCHEMA_ERROR.] */
free(newProperty);
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else if (mallocAndStrcpy_s((char**)&newProperty->PropertyType, type) != 0)
{
@@ -224,7 +224,7 @@
free((void*)newProperty->PropertyName);
free(newProperty);
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -243,7 +243,7 @@
if (oldProperties == NULL)
{
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -278,7 +278,7 @@
{
/* Codes_SRS_SCHEMA_99_003:[On failure, NULL shall be returned.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -286,26 +286,26 @@
{
/* Codes_SRS_SCHEMA_99_003:[On failure, NULL shall be returned.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else if ((result = (SCHEMA*)malloc(sizeof(SCHEMA))) == NULL)
{
/* Codes_SRS_SCHEMA_99_003:[On failure, NULL shall be returned.] */
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else if (mallocAndStrcpy_s((char**)&result->Namespace, schemaNamespace) != 0)
{
/* Codes_SRS_SCHEMA_99_003:[On failure, NULL shall be returned.] */
free(result);
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else if (VECTOR_push_back(g_schemas, &result, 1) != 0)
{
free((void*)result->Namespace);
free(result);
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -455,7 +455,7 @@
{
/* Codes_SRS_SCHEMA_07_187: [Schema_AddDeviceRef shall return SCHEMA_INVALID_ARG if modelTypeHandle is NULL.] */
result = SCHEMA_INVALID_ARG;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -474,7 +474,7 @@
if (modelTypeHandle == NULL)
{
result = SCHEMA_INVALID_ARG;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -488,7 +488,7 @@
else
{
result = SCHEMA_DEVICE_COUNT_ZERO;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
}
return result;
@@ -505,7 +505,7 @@
{
/* Codes_SRS_SCHEMA_99_009:[On failure, Schema_CreateModelType shall return NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -536,7 +536,7 @@
{
/* Codes_SRS_SCHEMA_99_009:[On failure, Schema_CreateModelType shall return NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -548,14 +548,14 @@
/* Codes_SRS_SCHEMA_99_009:[On failure, Schema_CreateModelType shall return NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else if (mallocAndStrcpy_s((char**)&modelType->Name, modelName) != 0)
{
/* Codes_SRS_SCHEMA_99_009:[On failure, Schema_CreateModelType shall return NULL.] */
result = NULL;
free(modelType);
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -580,7 +580,7 @@
if (oldModelTypes == NULL)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -627,7 +627,7 @@
(actionName == NULL))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -647,7 +647,7 @@
if (i < modelType->ActionCount)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_DUPLICATE_ELEMENT));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_DUPLICATE_ELEMENT));
}
else
{
@@ -657,7 +657,7 @@
{
/* Codes_SRS_SCHEMA_99_106: [On any other error, Schema_CreateModelAction shall return NULL.]*/
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -669,7 +669,7 @@
{
/* Codes_SRS_SCHEMA_99_106: [On any other error, Schema_CreateModelAction shall return NULL.]*/
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -678,7 +678,7 @@
/* Codes_SRS_SCHEMA_99_106: [On any other error, Schema_CreateModelAction shall return NULL.]*/
free(newAction);
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -696,7 +696,7 @@
SCHEMA_ACTION_HANDLE* oldActions = (SCHEMA_ACTION_HANDLE*)realloc(modelType->Actions, sizeof(SCHEMA_ACTION_HANDLE) * modelType->ActionCount);
if (oldActions == NULL)
{
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -720,7 +720,7 @@
(argumentType == NULL))
{
result = SCHEMA_INVALID_ARG;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -741,7 +741,7 @@
if (i < action->ArgumentCount)
{
result = SCHEMA_DUPLICATE_ELEMENT;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -751,7 +751,7 @@
{
/* Codes_SRS_SCHEMA_99_112: [On any other error, Schema_ AddModelActionArgumet shall return SCHEMA_ERROR.] */
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -760,7 +760,7 @@
{
/* Codes_SRS_SCHEMA_99_112: [On any other error, Schema_ AddModelActionArgumet shall return SCHEMA_ERROR.] */
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -769,7 +769,7 @@
/* Codes_SRS_SCHEMA_99_112: [On any other error, Schema_ AddModelActionArgumet shall return SCHEMA_ERROR.] */
free(newActionArgument);
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else if (mallocAndStrcpy_s((char**)&newActionArgument->Type, argumentType) != 0)
{
@@ -777,7 +777,7 @@
free((void*)newActionArgument->Name);
free(newActionArgument);
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -797,7 +797,7 @@
SCHEMA_ACTION_ARGUMENT_HANDLE* oldArguments = (SCHEMA_ACTION_ARGUMENT_HANDLE*)realloc(action->ArgumentHandles, sizeof(SCHEMA_ACTION_ARGUMENT_HANDLE) * action->ArgumentCount);
if (oldArguments == NULL)
{
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -819,7 +819,7 @@
(propertyName == NULL))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -840,7 +840,7 @@
{
/* Codes_SRS_SCHEMA_99_038:[Schema_GetModelPropertyByName shall return NULL if unable to find a matching property or if any of the arguments are NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
}
else
{
@@ -886,7 +886,7 @@
(index >= modelType->PropertyCount))
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -907,7 +907,7 @@
(actionName == NULL))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -928,7 +928,7 @@
{
/* Codes_SRS_SCHEMA_99_041:[Schema_GetModelActionByName shall return NULL if unable to find a matching action, if any of the arguments are NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
}
else
{
@@ -948,7 +948,7 @@
(actionCount == NULL))
{
result = SCHEMA_INVALID_ARG;
- LogError("(result=%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result=%s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -975,7 +975,7 @@
(index >= modelType->ActionCount))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -995,7 +995,7 @@
if (actionHandle == NULL)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1016,7 +1016,7 @@
(argumentCount == NULL))
{
result = SCHEMA_INVALID_ARG;
- LogError("(result=%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result=%s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1042,7 +1042,7 @@
(actionArgumentName == NULL))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1063,7 +1063,7 @@
{
/* Codes_SRS_SCHEMA_99_118: [Schema_GetModelActionArgumentByName shall return NULL if unable to find a matching argument or if any of the arguments are NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
}
else
{
@@ -1085,7 +1085,7 @@
(argumentIndex >= modelAction->ArgumentCount))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1103,7 +1103,7 @@
if (actionArgumentHandle == NULL)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1121,7 +1121,7 @@
if (actionArgumentHandle == NULL)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1142,7 +1142,7 @@
(typeName == NULL))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1162,7 +1162,7 @@
if (i < schema->StructTypeCount)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_DUPLICATE_ELEMENT));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_DUPLICATE_ELEMENT));
}
else
{
@@ -1171,7 +1171,7 @@
{
/* Codes_SRS_SCHEMA_99_066:[On any other error, Schema_CreateStructType shall return NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -1180,14 +1180,14 @@
{
/* Codes_SRS_SCHEMA_99_066:[On any other error, Schema_CreateStructType shall return NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else if (mallocAndStrcpy_s((char**)&structType->Name, typeName) != 0)
{
/* Codes_SRS_SCHEMA_99_066:[On any other error, Schema_CreateStructType shall return NULL.] */
result = NULL;
free(structType);
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -1208,7 +1208,7 @@
if (oldStructTypes == NULL)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ERROR));
}
else
{
@@ -1230,7 +1230,7 @@
if (structTypeHandle == NULL)
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1250,7 +1250,7 @@
(structTypeCount == NULL))
{
result = SCHEMA_INVALID_ARG;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1275,7 +1275,7 @@
(name == NULL))
{
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1295,7 +1295,7 @@
{
/* Codes_SRS_SCHEMA_99_069:[Schema_GetStructTypeByName shall return NULL if unable to find a matching struct or if any of the arguments are NULL.] */
result = NULL;
- LogError("(Error code:%s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
+ LogError("(Error code:%s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
}
else
{
@@ -1317,7 +1317,7 @@
(index >= schema->StructTypeCount))
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1339,7 +1339,7 @@
(propertyType == NULL))
{
result = SCHEMA_INVALID_ARG;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1359,7 +1359,7 @@
if (i < structType->PropertyCount)
{
result = SCHEMA_DUPLICATE_ELEMENT;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1367,7 +1367,7 @@
if (newProperties == NULL)
{
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1377,7 +1377,7 @@
if ((newProperty = (PROPERTY*)malloc(sizeof(PROPERTY))) == NULL)
{
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1385,14 +1385,14 @@
{
free(newProperty);
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else if (mallocAndStrcpy_s((char**)&newProperty->PropertyType, propertyType) != 0)
{
free((void*)newProperty->PropertyName);
free(newProperty);
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1412,7 +1412,7 @@
if (oldProperties == NULL)
{
result = SCHEMA_ERROR;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1435,7 +1435,7 @@
(propertyName == NULL))
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1455,7 +1455,7 @@
if (i == structType->PropertyCount)
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_ELEMENT_NOT_FOUND));
}
/* Codes_SRS_SCHEMA_99_075:[Schema_GetStructTypePropertyByName shall return a non-NULL handle corresponding to a property identified by the structTypeHandle and propertyName.] */
else
@@ -1476,7 +1476,7 @@
(propertyCount == NULL))
{
result = SCHEMA_INVALID_ARG;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1503,7 +1503,7 @@
(index >= structType->PropertyCount))
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1523,7 +1523,7 @@
if (propertyHandle == NULL)
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1544,7 +1544,7 @@
if (propertyHandle == NULL)
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1565,7 +1565,7 @@
(modelCount == NULL) )
{
result = SCHEMA_INVALID_ARG;
- LogError("(result = %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(result = %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1588,7 +1588,7 @@
(modelName == NULL))
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1627,7 +1627,7 @@
(index >= schema->ModelTypeCount))
{
result = NULL;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1667,7 +1667,7 @@
)
{
result = SCHEMA_INVALID_ARG;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, SCHEMA_INVALID_ARG));
}
else
{
@@ -1677,14 +1677,14 @@
if (mallocAndStrcpy_s((char**)&(temp.propertyName), propertyName) != 0)
{
result = SCHEMA_ERROR;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else if (VECTOR_push_back(parentModel->models, &temp, 1) != 0)
{
/*Codes_SRS_SCHEMA_99_174: [The function shall return SCHEMA_ERROR if any other error occurs.]*/
free((void*)temp.propertyName);
result = SCHEMA_ERROR;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{
@@ -1706,7 +1706,7 @@
)
{
result = SCHEMA_INVALID_ARG;
- LogError("(Error code: %s)\r\n", ENUM_TO_STRING(SCHEMA_RESULT, result));
+ LogError("(Error code: %s)", ENUM_TO_STRING(SCHEMA_RESULT, result));
}
else
{