C additional properties fix #4289 (#4349)

* Correction to C support for additional_properties

* TAB to SPACE in one file

modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache

@@ -255,7 +255,7 @@ void {{classname}}_free({{classname}}_t *{{classname}}) {
     {{/isListContainer}}
     {{#isMapContainer}}
     list_ForEach(listEntry, {{classname}}->{{baseName}}) {
-		keyValuePair_t *localMapKeyPair = (keyValuePair_t*) listEntry->data;
+        keyValuePair_t *localKeyValue = (keyValuePair_t*) listEntry->data;
         free (localKeyValue->key);
         free (localKeyValue->value);
     }

samples/client/petstore/c/.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.1-SNAPSHOT
+4.2.2-SNAPSHOT

samples/client/petstore/c/CMakeLists.txt

@@ -63,27 +63,28 @@ install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX})
 set(SRCS "")
 set(HDRS "")
 
-# This section shows how to use the above compiled libary to compile the source files
-# set source files
-set(SRCS
-    unit-tests/manual-PetAPI.c
-    unit-tests/manual-StoreAPI.c
-    unit-tests/manual-UserAPI.c
-    unit-tests/manual-order.c
-    unit-tests/manual-user.c)
 
-#set header files
+## This section shows how to use the above compiled libary to compile the source files
-set(HDRS
+## set source files
-)
+#set(SRCS
+#    unit-tests/manual-PetAPI.c
+#    unit-tests/manual-StoreAPI.c
+#    unit-tests/manual-UserAPI.c
+#    unit-tests/manual-order.c
+#    unit-tests/manual-user.c)
 
-# loop over all files in SRCS variable
+##set header files
-foreach(SOURCE_FILE ${SRCS})
+#set(HDRS
-    # Get only the file name from the file as add_executable doesnot support executable with slash("/")
+#)
-    get_filename_component(FILE_NAME_ONLY ${SOURCE_FILE} NAME_WE)
+
-    # Remove .c from the file name and set it as executable name
+## loop over all files in SRCS variable
-    string( REPLACE ".c" "" EXECUTABLE_FILE ${FILE_NAME_ONLY})
+#foreach(SOURCE_FILE ${SRCS})
-    # Add executable for every source file in  SRCS
+#    # Get only the file name from the file as add_executable doesnot support executable with slash("/")
-    add_executable(unit-${EXECUTABLE_FILE} ${SOURCE_FILE})
+#    get_filename_component(FILE_NAME_ONLY ${SOURCE_FILE} NAME_WE)
-    # Link above created libary to executable and dependent libary curl
+#    # Remove .c from the file name and set it as executable name
-    target_link_libraries(unit-${EXECUTABLE_FILE} ${CURL_LIBRARIES} ${pkgName} )
+#    string( REPLACE ".c" "" EXECUTABLE_FILE ${FILE_NAME_ONLY})
-endforeach(SOURCE_FILE ${SRCS})
+#    # Add executable for every source file in  SRCS
+#    add_executable(unit-${EXECUTABLE_FILE} ${SOURCE_FILE})
+#    # Link above created libary to executable and dependent libary curl
+#    target_link_libraries(unit-${EXECUTABLE_FILE} ${CURL_LIBRARIES} ${pkgName} )
+#endforeach(SOURCE_FILE ${SRCS})

samples/client/petstore/c/api/PetAPI.c

@@ -13,7 +13,9 @@
 
 // Add a new pet to the store
 //
-void PetAPI_addPet(apiClient_t *apiClient, pet_t *body) {
+void
+PetAPI_addPet(apiClient_t *apiClient ,pet_t * body)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -31,11 +33,11 @@ void PetAPI_addPet(apiClient_t *apiClient, pet_t *body) {
 
     // Body Param
     cJSON *localVarSingleItemJSON_body;
-	if(body != NULL) {
+    if (body != NULL)
+    {
         //string
         localVarSingleItemJSON_body = pet_convertToJSON(body);
-		localVarBodyParameters =
+        localVarBodyParameters = cJSON_Print(localVarSingleItemJSON_body);
-			cJSON_Print(localVarSingleItemJSON_body);
     }
     list_addElement(localVarContentType,"application/json"); //consumes
     list_addElement(localVarContentType,"application/xml"); //consumes
@@ -65,11 +67,14 @@ end:
     free(localVarPath);
     cJSON_Delete(localVarSingleItemJSON_body);
     free(localVarBodyParameters);
+
 }
 
 // Deletes a pet
 //
-void PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key) {
+void
+PetAPI_deletePet(apiClient_t *apiClient ,long petId ,char * api_key)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = list_create();
     list_t    *localVarFormParameters = NULL;
@@ -89,14 +94,12 @@ void PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key) {
         goto end;
     }
     char* localVarToReplace_petId = malloc(sizeOfPathParams_petId);
-	snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}",
+    snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
-	         "petId");
 
     char localVarBuff_petId[256];
     intToStr(localVarBuff_petId, petId);
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_petId,
+    localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
-	                          localVarBuff_petId);
 
 
 
@@ -108,10 +111,8 @@ void PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key) {
     if (api_key) {
         keyHeader_api_key = strdup("api_key");
         valueHeader_api_key = strdup((api_key));
-		keyPairHeader_api_key = keyValuePair_create(keyHeader_api_key,
+        keyPairHeader_api_key = keyValuePair_create(keyHeader_api_key, valueHeader_api_key);
-		                                            valueHeader_api_key);
+        list_addElement(localVarHeaderParameters,keyPairHeader_api_key);
-		list_addElement(localVarHeaderParameters,
-		                keyPairHeader_api_key);
     }
 
     apiClient_invoke(apiClient,
@@ -142,13 +143,16 @@ end:
     free(keyHeader_api_key);
     free(valueHeader_api_key);
     free(keyPairHeader_api_key);
+
 }
 
 // Finds Pets by status
 //
 // Multiple status values can be provided with comma separated strings
 //
-list_t *PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t *status) {
+list_t*
+PetAPI_findPetsByStatus(apiClient_t *apiClient ,list_t * status)
+{
     list_t    *localVarQueryParameters = list_create();
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -165,7 +169,8 @@ list_t *PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t *status) {
 
 
     // query parameters
-	if(status) {
+    if (status)
+    {
         list_addElement(localVarQueryParameters,status);
     }
     list_addElement(localVarHeaderType,"application/xml"); //produces
@@ -194,7 +199,8 @@ list_t *PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t *status) {
     cJSON *VarJSON;
     cJSON_ArrayForEach(VarJSON, PetAPIlocalVarJSON)
     {
-		if(!cJSON_IsObject(VarJSON)) {
+        if(!cJSON_IsObject(VarJSON))
+        {
            // return 0;
         }
         char *localVarJSONToChar = cJSON_Print(VarJSON);
@@ -216,13 +222,16 @@ list_t *PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t *status) {
     return elementToReturn;
 end:
     return NULL;
+
 }
 
 // Finds Pets by tags
 //
 // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 //
-list_t *PetAPI_findPetsByTags(apiClient_t *apiClient, list_t *tags) {
+list_t*
+PetAPI_findPetsByTags(apiClient_t *apiClient ,list_t * tags)
+{
     list_t    *localVarQueryParameters = list_create();
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -239,7 +248,8 @@ list_t *PetAPI_findPetsByTags(apiClient_t *apiClient, list_t *tags) {
 
 
     // query parameters
-	if(tags) {
+    if (tags)
+    {
         list_addElement(localVarQueryParameters,tags);
     }
     list_addElement(localVarHeaderType,"application/xml"); //produces
@@ -268,7 +278,8 @@ list_t *PetAPI_findPetsByTags(apiClient_t *apiClient, list_t *tags) {
     cJSON *VarJSON;
     cJSON_ArrayForEach(VarJSON, PetAPIlocalVarJSON)
     {
-		if(!cJSON_IsObject(VarJSON)) {
+        if(!cJSON_IsObject(VarJSON))
+        {
            // return 0;
         }
         char *localVarJSONToChar = cJSON_Print(VarJSON);
@@ -290,13 +301,16 @@ list_t *PetAPI_findPetsByTags(apiClient_t *apiClient, list_t *tags) {
     return elementToReturn;
 end:
     return NULL;
+
 }
 
 // Find pet by ID
 //
 // Returns a single pet
 //
-pet_t *PetAPI_getPetById(apiClient_t *apiClient, long petId) {
+pet_t*
+PetAPI_getPetById(apiClient_t *apiClient ,long petId)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -316,14 +330,12 @@ pet_t *PetAPI_getPetById(apiClient_t *apiClient, long petId) {
         goto end;
     }
     char* localVarToReplace_petId = malloc(sizeOfPathParams_petId);
-	snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}",
+    snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
-	         "petId");
 
     char localVarBuff_petId[256];
     intToStr(localVarBuff_petId, petId);
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_petId,
+    localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
-	                          localVarBuff_petId);
 
 
 
@@ -370,11 +382,14 @@ pet_t *PetAPI_getPetById(apiClient_t *apiClient, long petId) {
     return elementToReturn;
 end:
     return NULL;
+
 }
 
 // Update an existing pet
 //
-void PetAPI_updatePet(apiClient_t *apiClient, pet_t *body) {
+void
+PetAPI_updatePet(apiClient_t *apiClient ,pet_t * body)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -392,11 +407,11 @@ void PetAPI_updatePet(apiClient_t *apiClient, pet_t *body) {
 
     // Body Param
     cJSON *localVarSingleItemJSON_body;
-	if(body != NULL) {
+    if (body != NULL)
+    {
         //string
         localVarSingleItemJSON_body = pet_convertToJSON(body);
-		localVarBodyParameters =
+        localVarBodyParameters = cJSON_Print(localVarSingleItemJSON_body);
-			cJSON_Print(localVarSingleItemJSON_body);
     }
     list_addElement(localVarContentType,"application/json"); //consumes
     list_addElement(localVarContentType,"application/xml"); //consumes
@@ -432,12 +447,14 @@ end:
     free(localVarPath);
     cJSON_Delete(localVarSingleItemJSON_body);
     free(localVarBodyParameters);
+
 }
 
 // Updates a pet in the store with form data
 //
-void PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name,
+void
-                              char *status) {
+PetAPI_updatePetWithForm(apiClient_t *apiClient ,long petId ,char * name ,char * status)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = list_create();
@@ -457,14 +474,12 @@ void PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name,
         goto end;
     }
     char* localVarToReplace_petId = malloc(sizeOfPathParams_petId);
-	snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}",
+    snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
-	         "petId");
 
     char localVarBuff_petId[256];
     intToStr(localVarBuff_petId, petId);
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_petId,
+    localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
-	                          localVarBuff_petId);
 
 
 
@@ -473,11 +488,11 @@ void PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name,
     char *keyForm_name;
     char * valueForm_name;
     keyValuePair_t *keyPairForm_name = 0;
-	if(name != NULL) {
+    if (name != NULL)
+    {
         keyForm_name = strdup("name");
         valueForm_name = strdup((name));
-		keyPairForm_name = keyValuePair_create(keyForm_name,
+        keyPairForm_name = keyValuePair_create(keyForm_name,valueForm_name);
-		                                       valueForm_name);
         list_addElement(localVarFormParameters,keyPairForm_name);
     }
 
@@ -485,15 +500,14 @@ void PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name,
     char *keyForm_status;
     char * valueForm_status;
     keyValuePair_t *keyPairForm_status = 0;
-	if(status != NULL) {
+    if (status != NULL)
+    {
         keyForm_status = strdup("status");
         valueForm_status = strdup((status));
-		keyPairForm_status = keyValuePair_create(keyForm_status,
+        keyPairForm_status = keyValuePair_create(keyForm_status,valueForm_status);
-		                                         valueForm_status);
         list_addElement(localVarFormParameters,keyPairForm_status);
     }
-	list_addElement(localVarContentType,
+    list_addElement(localVarContentType,"application/x-www-form-urlencoded"); //consumes
-	                "application/x-www-form-urlencoded");                 // consumes
     apiClient_invoke(apiClient,
                     localVarPath,
                     localVarQueryParameters,
@@ -525,12 +539,14 @@ end:
     free(keyForm_status);
     free(valueForm_status);
     keyValuePair_free(keyPairForm_status);
+
 }
 
 // uploads an image
 //
-api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId,
+api_response_t*
-                                  char *additionalMetadata, binary_t *file) {
+PetAPI_uploadFile(apiClient_t *apiClient ,long petId ,char * additionalMetadata ,binary_t* file)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = list_create();
@@ -550,14 +566,12 @@ api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId,
         goto end;
     }
     char* localVarToReplace_petId = malloc(sizeOfPathParams_petId);
-	snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}",
+    snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
-	         "petId");
 
     char localVarBuff_petId[256];
     intToStr(localVarBuff_petId, petId);
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_petId,
+    localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
-	                          localVarBuff_petId);
 
 
 
@@ -566,25 +580,23 @@ api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId,
     char *keyForm_additionalMetadata;
     char * valueForm_additionalMetadata;
     keyValuePair_t *keyPairForm_additionalMetadata = 0;
-	if(additionalMetadata != NULL) {
+    if (additionalMetadata != NULL)
+    {
         keyForm_additionalMetadata = strdup("additionalMetadata");
         valueForm_additionalMetadata = strdup((additionalMetadata));
-		keyPairForm_additionalMetadata = keyValuePair_create(
+        keyPairForm_additionalMetadata = keyValuePair_create(keyForm_additionalMetadata,valueForm_additionalMetadata);
-			keyForm_additionalMetadata,
+        list_addElement(localVarFormParameters,keyPairForm_additionalMetadata);
-			valueForm_additionalMetadata);
-		list_addElement(localVarFormParameters,
-		                keyPairForm_additionalMetadata);
     }
 
     // form parameters
     char *keyForm_file;
     binary_t* valueForm_file;
     keyValuePair_t *keyPairForm_file = 0;
-	if(file != NULL) {
+    if (file != NULL)
+    {
         keyForm_file = strdup("file");
         valueForm_file = file;
-		keyPairForm_file = keyValuePair_create(keyForm_file,
+        keyPairForm_file = keyValuePair_create(keyForm_file, &valueForm_file);
-		                                       &valueForm_file);
         list_addElement(localVarFormParameters,keyPairForm_file); //file adding
     }
     list_addElement(localVarHeaderType,"application/json"); //produces
@@ -604,8 +616,7 @@ api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId,
     }
     //nonprimitive not container
     cJSON *PetAPIlocalVarJSON = cJSON_Parse(apiClient->dataReceived);
-	api_response_t *elementToReturn = api_response_parseFromJSON(
+    api_response_t *elementToReturn = api_response_parseFromJSON(PetAPIlocalVarJSON);
-		PetAPIlocalVarJSON);
     cJSON_Delete(PetAPIlocalVarJSON);
     if(elementToReturn == NULL) {
         // return 0;
@@ -632,4 +643,6 @@ api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId,
     return elementToReturn;
 end:
     return NULL;
+
 }
+

samples/client/petstore/c/api/PetAPI.h

@@ -10,47 +10,55 @@
 
 // Add a new pet to the store
 //
-void PetAPI_addPet(apiClient_t *apiClient, pet_t *body);
+void
+PetAPI_addPet(apiClient_t *apiClient ,pet_t * body);
 
 
 // Deletes a pet
 //
-void PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key);
+void
+PetAPI_deletePet(apiClient_t *apiClient ,long petId ,char * api_key);
 
 
 // Finds Pets by status
 //
 // Multiple status values can be provided with comma separated strings
 //
-list_t *PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t *status);
+list_t*
+PetAPI_findPetsByStatus(apiClient_t *apiClient ,list_t * status);
 
 
 // Finds Pets by tags
 //
 // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 //
-list_t *PetAPI_findPetsByTags(apiClient_t *apiClient, list_t *tags);
+list_t*
+PetAPI_findPetsByTags(apiClient_t *apiClient ,list_t * tags);
 
 
 // Find pet by ID
 //
 // Returns a single pet
 //
-pet_t *PetAPI_getPetById(apiClient_t *apiClient, long petId);
+pet_t*
+PetAPI_getPetById(apiClient_t *apiClient ,long petId);
 
 
 // Update an existing pet
 //
-void PetAPI_updatePet(apiClient_t *apiClient, pet_t *body);
+void
+PetAPI_updatePet(apiClient_t *apiClient ,pet_t * body);
 
 
 // Updates a pet in the store with form data
 //
-void PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name,
+void
-                              char *status);
+PetAPI_updatePetWithForm(apiClient_t *apiClient ,long petId ,char * name ,char * status);
 
 
 // uploads an image
 //
-api_response_t *PetAPI_uploadFile(apiClient_t *apiClient, long petId,
+api_response_t*
-                                  char *additionalMetadata, binary_t *file);
+PetAPI_uploadFile(apiClient_t *apiClient ,long petId ,char * additionalMetadata ,binary_t* file);
+
+

samples/client/petstore/c/api/StoreAPI.c

@@ -15,7 +15,9 @@
 //
 // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
 //
-void StoreAPI_deleteOrder(apiClient_t *apiClient, char *orderId) {
+void
+StoreAPI_deleteOrder(apiClient_t *apiClient ,char * orderId)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -30,16 +32,14 @@ void StoreAPI_deleteOrder(apiClient_t *apiClient, char *orderId) {
 
 
     // Path Params
-	long sizeOfPathParams_orderId = strlen(orderId) + 3 + strlen(
+    long sizeOfPathParams_orderId = strlen(orderId)+3 + strlen("{ orderId }");
-		"{ orderId }");
     if(orderId == NULL) {
         goto end;
     }
     char* localVarToReplace_orderId = malloc(sizeOfPathParams_orderId);
     sprintf(localVarToReplace_orderId, "{%s}", "orderId");
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_orderId,
+    localVarPath = strReplace(localVarPath, localVarToReplace_orderId, orderId);
-	                          orderId);
 
 
     apiClient_invoke(apiClient,
@@ -70,13 +70,16 @@ end:
     
     free(localVarPath);
     free(localVarToReplace_orderId);
+
 }
 
 // Returns pet inventories by status
 //
 // Returns a map of status codes to quantities
 //
-list_t *StoreAPI_getInventory(apiClient_t *apiClient) {
+list_t*
+StoreAPI_getInventory(apiClient_t *apiClient)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -110,10 +113,7 @@ list_t *StoreAPI_getInventory(apiClient_t *apiClient) {
     cJSON *VarJSON;
     list_t *elementToReturn = list_create();
     cJSON_ArrayForEach(VarJSON, localVarJSON){
-		keyValuePair_t *keyPair =
+        keyValuePair_t *keyPair = keyValuePair_create(strdup(VarJSON->string), cJSON_Print(VarJSON));
-			keyValuePair_create(strdup(
-						    VarJSON->string), cJSON_Print(
-						    VarJSON));
         list_addElement(elementToReturn, keyPair);
     }
     cJSON_Delete(localVarJSON);
@@ -130,13 +130,16 @@ list_t *StoreAPI_getInventory(apiClient_t *apiClient) {
     return elementToReturn;
 end:
     return NULL;
+
 }
 
 // Find purchase order by ID
 //
 // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
 //
-order_t *StoreAPI_getOrderById(apiClient_t *apiClient, long orderId) {
+order_t*
+StoreAPI_getOrderById(apiClient_t *apiClient ,long orderId)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -151,20 +154,17 @@ order_t *StoreAPI_getOrderById(apiClient_t *apiClient, long orderId) {
 
 
     // Path Params
-	long sizeOfPathParams_orderId = sizeof(orderId) + 3 + strlen(
+    long sizeOfPathParams_orderId = sizeof(orderId)+3 + strlen("{ orderId }");
-		"{ orderId }");
     if(orderId == 0){
         goto end;
     }
     char* localVarToReplace_orderId = malloc(sizeOfPathParams_orderId);
-	snprintf(localVarToReplace_orderId, sizeOfPathParams_orderId, "{%s}",
+    snprintf(localVarToReplace_orderId, sizeOfPathParams_orderId, "{%s}", "orderId");
-	         "orderId");
 
     char localVarBuff_orderId[256];
     intToStr(localVarBuff_orderId, orderId);
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_orderId,
+    localVarPath = strReplace(localVarPath, localVarToReplace_orderId, localVarBuff_orderId);
-	                          localVarBuff_orderId);
 
 
 
@@ -211,11 +211,14 @@ order_t *StoreAPI_getOrderById(apiClient_t *apiClient, long orderId) {
     return elementToReturn;
 end:
     return NULL;
+
 }
 
 // Place an order for a pet
 //
-order_t *StoreAPI_placeOrder(apiClient_t *apiClient, order_t *body) {
+order_t*
+StoreAPI_placeOrder(apiClient_t *apiClient ,order_t * body)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -233,11 +236,11 @@ order_t *StoreAPI_placeOrder(apiClient_t *apiClient, order_t *body) {
 
     // Body Param
     cJSON *localVarSingleItemJSON_body;
-	if(body != NULL) {
+    if (body != NULL)
+    {
         //string
         localVarSingleItemJSON_body = order_convertToJSON(body);
-		localVarBodyParameters =
+        localVarBodyParameters = cJSON_Print(localVarSingleItemJSON_body);
-			cJSON_Print(localVarSingleItemJSON_body);
     }
     list_addElement(localVarHeaderType,"application/xml"); //produces
     list_addElement(localVarHeaderType,"application/json"); //produces
@@ -280,4 +283,6 @@ order_t *StoreAPI_placeOrder(apiClient_t *apiClient, order_t *body) {
     return elementToReturn;
 end:
     return NULL;
+
 }
+

samples/client/petstore/c/api/StoreAPI.h

@@ -11,23 +11,29 @@
 //
 // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
 //
-void StoreAPI_deleteOrder(apiClient_t *apiClient, char *orderId);
+void
+StoreAPI_deleteOrder(apiClient_t *apiClient ,char * orderId);
 
 
 // Returns pet inventories by status
 //
 // Returns a map of status codes to quantities
 //
-list_t *StoreAPI_getInventory(apiClient_t *apiClient);
+list_t*
+StoreAPI_getInventory(apiClient_t *apiClient);
 
 
 // Find purchase order by ID
 //
 // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
 //
-order_t *StoreAPI_getOrderById(apiClient_t *apiClient, long orderId);
+order_t*
+StoreAPI_getOrderById(apiClient_t *apiClient ,long orderId);
 
 
 // Place an order for a pet
 //
-order_t *StoreAPI_placeOrder(apiClient_t *apiClient, order_t *body);
+order_t*
+StoreAPI_placeOrder(apiClient_t *apiClient ,order_t * body);
+
+

samples/client/petstore/c/api/UserAPI.c

@@ -15,7 +15,9 @@
 //
 // This can only be done by the logged in user.
 //
-void UserAPI_createUser(apiClient_t *apiClient, user_t *body) {
+void
+UserAPI_createUser(apiClient_t *apiClient ,user_t * body)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -33,11 +35,11 @@ void UserAPI_createUser(apiClient_t *apiClient, user_t *body) {
 
     // Body Param
     cJSON *localVarSingleItemJSON_body;
-	if(body != NULL) {
+    if (body != NULL)
+    {
         //string
         localVarSingleItemJSON_body = user_convertToJSON(body);
-		localVarBodyParameters =
+        localVarBodyParameters = cJSON_Print(localVarSingleItemJSON_body);
-			cJSON_Print(localVarSingleItemJSON_body);
     }
     apiClient_invoke(apiClient,
                     localVarPath,
@@ -65,11 +67,14 @@ end:
     free(localVarPath);
     cJSON_Delete(localVarSingleItemJSON_body);
     free(localVarBodyParameters);
+
 }
 
 // Creates list of users with given input array
 //
-void UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t *body) {
+void
+UserAPI_createUsersWithArrayInput(apiClient_t *apiClient ,list_t * body)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -90,11 +95,12 @@ void UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t *body) {
     cJSON *localVar_body;
     cJSON *localVarItemJSON_body;
     cJSON *localVarSingleItemJSON_body;
-	if(body != NULL) {
+    if (body != NULL)
+    {
         localVarItemJSON_body = cJSON_CreateObject();
-		localVarSingleItemJSON_body = cJSON_AddArrayToObject(
+        localVarSingleItemJSON_body = cJSON_AddArrayToObject(localVarItemJSON_body, "body");
-			localVarItemJSON_body, "body");
+        if (localVarSingleItemJSON_body == NULL)
-		if(localVarSingleItemJSON_body == NULL) {
+        {
             // nonprimitive container
 
             goto end;
@@ -105,11 +111,11 @@ void UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t *body) {
     list_ForEach(bodyBodyListEntry, body)
     {
         localVar_body = user_convertToJSON(bodyBodyListEntry->data);
-		if(localVar_body == NULL) {
+        if(localVar_body == NULL)
+        {
             goto end;
         }
-		cJSON_AddItemToArray(localVarSingleItemJSON_body,
+        cJSON_AddItemToArray(localVarSingleItemJSON_body, localVar_body);
-		                     localVar_body);
         localVarBodyParameters = cJSON_Print(localVarItemJSON_body);
     }
     apiClient_invoke(apiClient,
@@ -140,11 +146,14 @@ end:
     cJSON_Delete(localVarSingleItemJSON_body);
     cJSON_Delete(localVar_body);
     free(localVarBodyParameters);
+
 }
 
 // Creates list of users with given input array
 //
-void UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t *body) {
+void
+UserAPI_createUsersWithListInput(apiClient_t *apiClient ,list_t * body)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -165,11 +174,12 @@ void UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t *body) {
     cJSON *localVar_body;
     cJSON *localVarItemJSON_body;
     cJSON *localVarSingleItemJSON_body;
-	if(body != NULL) {
+    if (body != NULL)
+    {
         localVarItemJSON_body = cJSON_CreateObject();
-		localVarSingleItemJSON_body = cJSON_AddArrayToObject(
+        localVarSingleItemJSON_body = cJSON_AddArrayToObject(localVarItemJSON_body, "body");
-			localVarItemJSON_body, "body");
+        if (localVarSingleItemJSON_body == NULL)
-		if(localVarSingleItemJSON_body == NULL) {
+        {
             // nonprimitive container
 
             goto end;
@@ -180,11 +190,11 @@ void UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t *body) {
     list_ForEach(bodyBodyListEntry, body)
     {
         localVar_body = user_convertToJSON(bodyBodyListEntry->data);
-		if(localVar_body == NULL) {
+        if(localVar_body == NULL)
+        {
             goto end;
         }
-		cJSON_AddItemToArray(localVarSingleItemJSON_body,
+        cJSON_AddItemToArray(localVarSingleItemJSON_body, localVar_body);
-		                     localVar_body);
         localVarBodyParameters = cJSON_Print(localVarItemJSON_body);
     }
     apiClient_invoke(apiClient,
@@ -215,13 +225,16 @@ end:
     cJSON_Delete(localVarSingleItemJSON_body);
     cJSON_Delete(localVar_body);
     free(localVarBodyParameters);
+
 }
 
 // Delete user
 //
 // This can only be done by the logged in user.
 //
-void UserAPI_deleteUser(apiClient_t *apiClient, char *username) {
+void
+UserAPI_deleteUser(apiClient_t *apiClient ,char * username)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -236,16 +249,14 @@ void UserAPI_deleteUser(apiClient_t *apiClient, char *username) {
 
 
     // Path Params
-	long sizeOfPathParams_username = strlen(username) + 3 + strlen(
+    long sizeOfPathParams_username = strlen(username)+3 + strlen("{ username }");
-		"{ username }");
     if(username == NULL) {
         goto end;
     }
     char* localVarToReplace_username = malloc(sizeOfPathParams_username);
     sprintf(localVarToReplace_username, "{%s}", "username");
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_username,
+    localVarPath = strReplace(localVarPath, localVarToReplace_username, username);
-	                          username);
 
 
     apiClient_invoke(apiClient,
@@ -276,11 +287,14 @@ end:
     
     free(localVarPath);
     free(localVarToReplace_username);
+
 }
 
 // Get user by user name
 //
-user_t *UserAPI_getUserByName(apiClient_t *apiClient, char *username) {
+user_t*
+UserAPI_getUserByName(apiClient_t *apiClient ,char * username)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -295,16 +309,14 @@ user_t *UserAPI_getUserByName(apiClient_t *apiClient, char *username) {
 
 
     // Path Params
-	long sizeOfPathParams_username = strlen(username) + 3 + strlen(
+    long sizeOfPathParams_username = strlen(username)+3 + strlen("{ username }");
-		"{ username }");
     if(username == NULL) {
         goto end;
     }
     char* localVarToReplace_username = malloc(sizeOfPathParams_username);
     sprintf(localVarToReplace_username, "{%s}", "username");
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_username,
+    localVarPath = strReplace(localVarPath, localVarToReplace_username, username);
-	                          username);
 
 
     list_addElement(localVarHeaderType,"application/xml"); //produces
@@ -350,12 +362,14 @@ user_t *UserAPI_getUserByName(apiClient_t *apiClient, char *username) {
     return elementToReturn;
 end:
     return NULL;
+
 }
 
 // Logs user into the system
 //
-char *UserAPI_loginUser(apiClient_t *apiClient, char *username,
+char*
-                        char *password) {
+UserAPI_loginUser(apiClient_t *apiClient ,char * username ,char * password)
+{
     list_t    *localVarQueryParameters = list_create();
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -375,11 +389,11 @@ char *UserAPI_loginUser(apiClient_t *apiClient, char *username,
     char *keyQuery_username;
     char * valueQuery_username;
     keyValuePair_t *keyPairQuery_username = 0;
-	if(username) {
+    if (username)
+    {
         keyQuery_username = strdup("username");
         valueQuery_username = strdup((username));
-		keyPairQuery_username = keyValuePair_create(keyQuery_username,
+        keyPairQuery_username = keyValuePair_create(keyQuery_username, valueQuery_username);
-		                                            valueQuery_username);
         list_addElement(localVarQueryParameters,keyPairQuery_username);
     }
 
@@ -387,11 +401,11 @@ char *UserAPI_loginUser(apiClient_t *apiClient, char *username,
     char *keyQuery_password;
     char * valueQuery_password;
     keyValuePair_t *keyPairQuery_password = 0;
-	if(password) {
+    if (password)
+    {
         keyQuery_password = strdup("password");
         valueQuery_password = strdup((password));
-		keyPairQuery_password = keyValuePair_create(keyQuery_password,
+        keyPairQuery_password = keyValuePair_create(keyQuery_password, valueQuery_password);
-		                                            valueQuery_password);
         list_addElement(localVarQueryParameters,keyPairQuery_password);
     }
     list_addElement(localVarHeaderType,"application/xml"); //produces
@@ -433,11 +447,14 @@ char *UserAPI_loginUser(apiClient_t *apiClient, char *username,
     return elementToReturn;
 end:
     return NULL;
+
 }
 
 // Logs out current logged in user session
 //
-void UserAPI_logoutUser(apiClient_t *apiClient) {
+void
+UserAPI_logoutUser(apiClient_t *apiClient)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -476,13 +493,16 @@ end:
     
     
     free(localVarPath);
+
 }
 
 // Updated user
 //
 // This can only be done by the logged in user.
 //
-void UserAPI_updateUser(apiClient_t *apiClient, char *username, user_t *body) {
+void
+UserAPI_updateUser(apiClient_t *apiClient ,char * username ,user_t * body)
+{
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
     list_t    *localVarFormParameters = NULL;
@@ -497,26 +517,24 @@ void UserAPI_updateUser(apiClient_t *apiClient, char *username, user_t *body) {
 
 
     // Path Params
-	long sizeOfPathParams_username = strlen(username) + 3 + strlen(
+    long sizeOfPathParams_username = strlen(username)+3 + strlen("{ username }");
-		"{ username }");
     if(username == NULL) {
         goto end;
     }
     char* localVarToReplace_username = malloc(sizeOfPathParams_username);
     sprintf(localVarToReplace_username, "{%s}", "username");
 
-	localVarPath = strReplace(localVarPath, localVarToReplace_username,
+    localVarPath = strReplace(localVarPath, localVarToReplace_username, username);
-	                          username);
 
 
 
     // Body Param
     cJSON *localVarSingleItemJSON_body;
-	if(body != NULL) {
+    if (body != NULL)
+    {
         //string
         localVarSingleItemJSON_body = user_convertToJSON(body);
-		localVarBodyParameters =
+        localVarBodyParameters = cJSON_Print(localVarSingleItemJSON_body);
-			cJSON_Print(localVarSingleItemJSON_body);
     }
     apiClient_invoke(apiClient,
                     localVarPath,
@@ -548,4 +566,6 @@ end:
     free(localVarToReplace_username);
     cJSON_Delete(localVarSingleItemJSON_body);
     free(localVarBodyParameters);
+
 }
+

samples/client/petstore/c/api/UserAPI.h

@@ -11,43 +11,53 @@
 //
 // This can only be done by the logged in user.
 //
-void UserAPI_createUser(apiClient_t *apiClient, user_t *body);
+void
+UserAPI_createUser(apiClient_t *apiClient ,user_t * body);
 
 
 // Creates list of users with given input array
 //
-void UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t *body);
+void
+UserAPI_createUsersWithArrayInput(apiClient_t *apiClient ,list_t * body);
 
 
 // Creates list of users with given input array
 //
-void UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t *body);
+void
+UserAPI_createUsersWithListInput(apiClient_t *apiClient ,list_t * body);
 
 
 // Delete user
 //
 // This can only be done by the logged in user.
 //
-void UserAPI_deleteUser(apiClient_t *apiClient, char *username);
+void
+UserAPI_deleteUser(apiClient_t *apiClient ,char * username);
 
 
 // Get user by user name
 //
-user_t *UserAPI_getUserByName(apiClient_t *apiClient, char *username);
+user_t*
+UserAPI_getUserByName(apiClient_t *apiClient ,char * username);
 
 
 // Logs user into the system
 //
-char *UserAPI_loginUser(apiClient_t *apiClient, char *username, char *password);
+char*
+UserAPI_loginUser(apiClient_t *apiClient ,char * username ,char * password);
 
 
 // Logs out current logged in user session
 //
-void UserAPI_logoutUser(apiClient_t *apiClient);
+void
+UserAPI_logoutUser(apiClient_t *apiClient);
 
 
 // Updated user
 //
 // This can only be done by the logged in user.
 //
-void UserAPI_updateUser(apiClient_t *apiClient, char *username, user_t *body);
+void
+UserAPI_updateUser(apiClient_t *apiClient ,char * username ,user_t * body);
+
+

samples/client/petstore/c/external/cJSON.h

@@ -50,7 +50,8 @@ extern "C"
 #define cJSON_StringIsConst 512
 
 /* The cJSON structure: */
-typedef struct cJSON {
+typedef struct cJSON
+{
     /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
     struct cJSON *next;
     struct cJSON *prev;
@@ -71,18 +72,15 @@ typedef struct cJSON {
     char *string;
 } cJSON;
 
-typedef struct cJSON_Hooks {
+typedef struct cJSON_Hooks
+{
       void *(*malloc_fn)(size_t sz);
       void (*free_fn)(void *ptr);
 } cJSON_Hooks;
 
 typedef int cJSON_bool;
 
-#if !defined(__WINDOWS__) && \
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
-        (defined(WIN32) || \
-        defined(WIN64) || \
-        defined(_MSC_VER) || \
-        defined(_WIN32))
 #define __WINDOWS__
 #endif
 #ifdef __WINDOWS__
@@ -106,9 +104,7 @@ typedef int cJSON_bool;
 */
 
 /* export symbols by default, this is necessary for copy pasting the C and header file */
-#if !defined(CJSON_HIDE_SYMBOLS) && \
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
-        !defined(CJSON_IMPORT_SYMBOLS) && \
-        !defined(CJSON_EXPORT_SYMBOLS)
 #define CJSON_EXPORT_SYMBOLS
 #endif
 
@@ -120,10 +116,7 @@ typedef int cJSON_bool;
 #define CJSON_PUBLIC(type)   __declspec(dllimport) type __stdcall
 #endif
 #else /* !WIN32 */
-#if (defined(__GNUC__) || \
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
-        defined(__SUNPRO_CC) || \
-        defined(__SUNPRO_C)) && \
-        defined(CJSON_API_VISIBILITY)
 #define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
 #else
 #define CJSON_PUBLIC(type) type
@@ -147,22 +140,17 @@ CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks * hooks);
 CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
 /* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
 /* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
-CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value,
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
-                                          const char **return_parse_end,
-                                          cJSON_bool require_null_terminated);
 
 /* Render a cJSON entity to text for transfer/storage. */
 CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
 /* Render a cJSON entity to text for transfer/storage without any formatting. */
 CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
 /* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
-CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON * item, int prebuffer,
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
-                                         cJSON_bool fmt);
 /* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
 /* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
-CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON * item, char *buffer,
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
-                                                 const int length,
-                                                 const cJSON_bool format);
 /* Delete a cJSON entity and all subentities. */
 CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
 
@@ -171,12 +159,9 @@ CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON * array);
 /* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
 CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
 /* Get item "string" from object. Case insensitive. */
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object,
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
-                                          const char *const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
-CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
-	const cJSON * const object, const char *const string);
-CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON * object,
-                                             const char *string);
 /* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
 CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
 
@@ -223,46 +208,30 @@ CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count);
 
 /* Append item to the specified array/object. */
 CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON * object, const char *string,
+CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
-                                         cJSON * item);
 /* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
  * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
  * writing to `item->string` */
-CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON * object, const char *string,
+CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
-                                           cJSON * item);
 /* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
 CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON * object,
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
-                                                  const char *string,
-                                                  cJSON * item);
 
 /* Remove/Detatch items from Arrays/Objects. */
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON * parent,
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
-                                                 cJSON * const item);
 CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
 CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON * object,
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
-                                                 const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
-CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON * object,
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
-                                                              const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON * object,
-                                              const char *string);
-CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON * object,
-                                                           const char *string);
 
 /* Update array items. */
-CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON * array, int which,
+CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
-                                           cJSON * newitem);                         /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
-CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent,
+CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
-                                                     cJSON * const item,
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
-                                                     cJSON * replacement);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON * array, int which,
-                                            cJSON * newitem);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON * object, const char *string,
-                                             cJSON * newitem);
-CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON * object,
-                                                          const char *string,
-                                                          cJSON * newitem);
 
 /* Duplicate a cJSON item */
 CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
@@ -271,60 +240,31 @@ CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON * item, cJSON_bool recurse);
 The item->next and ->prev pointers are always zero on return from Duplicate. */
 /* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
  * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
-CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a,
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
-                                       const cJSON * const b,
-                                       const cJSON_bool case_sensitive);
 
 
 CJSON_PUBLIC(void) cJSON_Minify(char *json);
 
 /* Helper functions for creating and adding items to an object at the same time.
  * They return the added item or NULL on failure. */
-CJSON_PUBLIC(cJSON *) cJSON_AddNullToObject(cJSON * const object,
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
-                                            const char *const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
-CJSON_PUBLIC(cJSON *) cJSON_AddTrueToObject(cJSON * const object,
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
-                                            const char *const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
-CJSON_PUBLIC(cJSON *) cJSON_AddFalseToObject(cJSON * const object,
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
-                                             const char *const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
-CJSON_PUBLIC(cJSON *) cJSON_AddBoolToObject(cJSON * const object,
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
-                                            const char *const name,
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
-                                            const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
-CJSON_PUBLIC(cJSON *) cJSON_AddNumberToObject(cJSON * const object,
-                                              const char *const name,
-                                              const double number);
-CJSON_PUBLIC(cJSON *) cJSON_AddStringToObject(cJSON * const object,
-                                              const char *const name,
-                                              const char *const string);
-CJSON_PUBLIC(cJSON *) cJSON_AddRawToObject(cJSON * const object,
-                                           const char *const name,
-                                           const char *const raw);
-CJSON_PUBLIC(cJSON *) cJSON_AddObjectToObject(cJSON * const object,
-                                              const char *const name);
-CJSON_PUBLIC(cJSON *) cJSON_AddArrayToObject(cJSON * const object,
-                                             const char *const name);
 
 /* When assigning an integer value, it needs to be propagated to valuedouble too. */
-#define cJSON_SetIntValue(object, \
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
-	                  number) ((object) ? (object)->valueint = \
-					   (object)->valuedouble = \
-						   (number) : (number))
 /* helper for the cJSON_SetNumberValue macro */
 CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
-#define cJSON_SetNumberValue(object, \
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
-	                     number) ((object != \
-	                               NULL) ? cJSON_SetNumberHelper(object, \
-								     ( \
-									     double) \
-	                                                             number) : ( \
-					      number))
 
 /* Macro for iterating over an array or object */
-#define cJSON_ArrayForEach(element, array) for(element = \
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
-						       (array != \
-						        NULL) ? (array)->child : \
-						       NULL; \
-	                                       element != NULL; \
-	                                       element = element->next)
 
 /* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
 CJSON_PUBLIC(void *) cJSON_malloc(size_t size);

samples/client/petstore/c/include/apiClient.h

@@ -17,7 +17,8 @@ typedef struct apiClient_t {
     char *accessToken;
 } apiClient_t;
 
-typedef struct binary_t {
+typedef struct binary_t
+{
     uint8_t* data;
     unsigned int len;
 } binary_t;
@@ -26,11 +27,7 @@ apiClient_t *apiClient_create();
 
 void apiClient_free(apiClient_t *apiClient);
 
-void apiClient_invoke(apiClient_t *apiClient, char *operationParameter,
+void apiClient_invoke(apiClient_t *apiClient,char* operationParameter, list_t *queryParameters, list_t *headerParameters, list_t *formParameters,list_t *headerType,list_t *contentType, char *bodyParameters, char *requestType);
-                      list_t *queryParameters, list_t *headerParameters,
-                      list_t *formParameters, list_t *headerType,
-                      list_t *contentType, char *bodyParameters,
-                      char *requestType);
 
 char *strReplace(char *orig, char *rep, char *with);
 

samples/client/petstore/c/include/list.h

@@ -21,12 +21,7 @@ typedef struct list_t {
     long count;
 } list_t;
 
-#define list_ForEach(element, list) for(element = \
+#define list_ForEach(element, list) for(element = (list != NULL) ? (list)->firstEntry : NULL; element != NULL; element = element->nextListEntry)
-						(list != \
-						 NULL) ? (list)->firstEntry : \
-						NULL; \
-	                                element != NULL; \
-	                                element = element->nextListEntry)
 
 list_t* list_create();
 void list_free(list_t* listToFree);
@@ -36,12 +31,8 @@ listEntry_t *list_getElementAt(list_t *list, long indexOfElement);
 listEntry_t* list_getWithIndex(list_t* list, int index);
 void list_removeElement(list_t* list, listEntry_t* elementToRemove);
 
-void list_iterateThroughListForward(list_t *list, void (*operationToPerform)(
+void list_iterateThroughListForward(list_t* list, void (*operationToPerform)(listEntry_t*, void*), void *additionalDataNeededForCallbackFunction);
-					    listEntry_t *,
+void list_iterateThroughListBackward(list_t* list, void (*operationToPerform)(listEntry_t*, void*), void *additionalDataNeededForCallbackFunction);
-					    void *), void *additionalDataNeededForCallbackFunction);
-void list_iterateThroughListBackward(list_t *list, void (*operationToPerform)(
-					     listEntry_t *,
-					     void *), void *additionalDataNeededForCallbackFunction);
 
 void listEntry_printAsInt(listEntry_t* listEntry, void *additionalData);
 void listEntry_free(listEntry_t *listEntry, void *additionalData);

samples/client/petstore/c/model/api_response.c

@@ -5,7 +5,11 @@
 
 
 
-api_response_t *api_response_create(int code, char *type, char *message) {
+api_response_t *api_response_create(
+    int code,
+    char *type,
+    char *message
+    ) {
     api_response_t *api_response_local_var = malloc(sizeof(api_response_t));
     if (!api_response_local_var) {
         return NULL;
@@ -30,9 +34,7 @@ cJSON *api_response_convertToJSON(api_response_t *api_response) {
 
     // api_response->code
     if(api_response->code) { 
-		if(cJSON_AddNumberToObject(item, "code",
+    if(cJSON_AddNumberToObject(item, "code", api_response->code) == NULL) {
-		                           api_response->code) == NULL)
-		{
     goto fail; //Numeric
     }
      } 
@@ -40,9 +42,7 @@ cJSON *api_response_convertToJSON(api_response_t *api_response) {
 
     // api_response->type
     if(api_response->type) { 
-		if(cJSON_AddStringToObject(item, "type",
+    if(cJSON_AddStringToObject(item, "type", api_response->type) == NULL) {
-		                           api_response->type) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -50,9 +50,7 @@ cJSON *api_response_convertToJSON(api_response_t *api_response) {
 
     // api_response->message
     if(api_response->message) { 
-		if(cJSON_AddStringToObject(item, "message",
+    if(cJSON_AddStringToObject(item, "message", api_response->message) == NULL) {
-		                           api_response->message) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -66,31 +64,32 @@ fail:
 }
 
 api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON){
+
     api_response_t *api_response_local_var = NULL;
 
     // api_response->code
-	cJSON *code =
+    cJSON *code = cJSON_GetObjectItemCaseSensitive(api_responseJSON, "code");
-		cJSON_GetObjectItemCaseSensitive(api_responseJSON, "code");
     if (code) { 
-		if(!cJSON_IsNumber(code)) {
+    if(!cJSON_IsNumber(code))
+    {
     goto end; //Numeric
     }
     }
 
     // api_response->type
-	cJSON *type =
+    cJSON *type = cJSON_GetObjectItemCaseSensitive(api_responseJSON, "type");
-		cJSON_GetObjectItemCaseSensitive(api_responseJSON, "type");
     if (type) { 
-		if(!cJSON_IsString(type)) {
+    if(!cJSON_IsString(type))
+    {
     goto end; //String
     }
     }
 
     // api_response->message
-	cJSON *message = cJSON_GetObjectItemCaseSensitive(api_responseJSON,
+    cJSON *message = cJSON_GetObjectItemCaseSensitive(api_responseJSON, "message");
-	                                                  "message");
     if (message) { 
-		if(!cJSON_IsString(message)) {
+    if(!cJSON_IsString(message))
+    {
     goto end; //String
     }
     }
@@ -105,4 +104,5 @@ api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON) {
     return api_response_local_var;
 end:
     return NULL;
+
 }

samples/client/petstore/c/model/api_response.h

@@ -18,9 +18,14 @@ typedef struct api_response_t {
     int code; //numeric
     char *type; // string
     char *message; // string
+
 } api_response_t;
 
-api_response_t *api_response_create(int code, char *type, char *message);
+api_response_t *api_response_create(
+    int code,
+    char *type,
+    char *message
+);
 
 void api_response_free(api_response_t *api_response);
 
@@ -29,3 +34,4 @@ api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON);
 cJSON *api_response_convertToJSON(api_response_t *api_response);
 
 #endif /* _api_response_H_ */
+

samples/client/petstore/c/model/category.c

@@ -5,7 +5,10 @@
 
 
 
-category_t *category_create(long id, char *name) {
+category_t *category_create(
+    long id,
+    char *name
+    ) {
     category_t *category_local_var = malloc(sizeof(category_t));
     if (!category_local_var) {
         return NULL;
@@ -36,9 +39,7 @@ cJSON *category_convertToJSON(category_t *category) {
 
     // category->name
     if(category->name) { 
-		if(cJSON_AddStringToObject(item, "name",
+    if(cJSON_AddStringToObject(item, "name", category->name) == NULL) {
-		                           category->name) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -52,12 +53,14 @@ fail:
 }
 
 category_t *category_parseFromJSON(cJSON *categoryJSON){
+
     category_t *category_local_var = NULL;
 
     // category->id
     cJSON *id = cJSON_GetObjectItemCaseSensitive(categoryJSON, "id");
     if (id) { 
-		if(!cJSON_IsNumber(id)) {
+    if(!cJSON_IsNumber(id))
+    {
     goto end; //Numeric
     }
     }
@@ -65,7 +68,8 @@ category_t *category_parseFromJSON(cJSON *categoryJSON) {
     // category->name
     cJSON *name = cJSON_GetObjectItemCaseSensitive(categoryJSON, "name");
     if (name) { 
-		if(!cJSON_IsString(name)) {
+    if(!cJSON_IsString(name))
+    {
     goto end; //String
     }
     }
@@ -79,4 +83,5 @@ category_t *category_parseFromJSON(cJSON *categoryJSON) {
     return category_local_var;
 end:
     return NULL;
+
 }

samples/client/petstore/c/model/category.h

@@ -17,9 +17,13 @@
 typedef struct category_t {
     long id; //numeric
     char *name; // string
+
 } category_t;
 
-category_t *category_create(long id, char *name);
+category_t *category_create(
+    long id,
+    char *name
+);
 
 void category_free(category_t *category);
 
@@ -28,3 +32,4 @@ category_t *category_parseFromJSON(cJSON *categoryJSON);
 cJSON *category_convertToJSON(category_t *category);
 
 #endif /* _category_H_ */
+

samples/client/petstore/c/model/order.c

@@ -22,8 +22,14 @@ status_e statusorder_FromString(char *status) {
     return 0;
     }
 
-order_t *order_create(long id, long petId, int quantity, char *shipDate,
+order_t *order_create(
-                      status_e status, int complete) {
+    long id,
+    long petId,
+    int quantity,
+    char *shipDate,
+    status_e status,
+    int complete
+    ) {
     order_t *order_local_var = malloc(sizeof(order_t));
     if (!order_local_var) {
         return NULL;
@@ -58,9 +64,7 @@ cJSON *order_convertToJSON(order_t *order) {
 
     // order->petId
     if(order->petId) { 
-		if(cJSON_AddNumberToObject(item, "petId",
+    if(cJSON_AddNumberToObject(item, "petId", order->petId) == NULL) {
-		                           order->petId) == NULL)
-		{
     goto fail; //Numeric
     }
      } 
@@ -68,9 +72,7 @@ cJSON *order_convertToJSON(order_t *order) {
 
     // order->quantity
     if(order->quantity) { 
-		if(cJSON_AddNumberToObject(item, "quantity",
+    if(cJSON_AddNumberToObject(item, "quantity", order->quantity) == NULL) {
-		                           order->quantity) == NULL)
-		{
     goto fail; //Numeric
     }
      } 
@@ -78,9 +80,7 @@ cJSON *order_convertToJSON(order_t *order) {
 
     // order->shipDate
     if(order->shipDate) { 
-		if(cJSON_AddStringToObject(item, "shipDate",
+    if(cJSON_AddStringToObject(item, "shipDate", order->shipDate) == NULL) {
-		                           order->shipDate) == NULL)
-		{
     goto fail; //Date-Time
     }
      } 
@@ -88,8 +88,7 @@ cJSON *order_convertToJSON(order_t *order) {
 
     // order->status
     
-	if(cJSON_AddStringToObject(item, "status",
+    if(cJSON_AddStringToObject(item, "status", statusorder_ToString(order->status)) == NULL)
-	                           statusorder_ToString(order->status)) == NULL)
     {
     goto fail; //Enum
     }
@@ -98,9 +97,7 @@ cJSON *order_convertToJSON(order_t *order) {
 
     // order->complete
     if(order->complete) { 
-		if(cJSON_AddBoolToObject(item, "complete",
+    if(cJSON_AddBoolToObject(item, "complete", order->complete) == NULL) {
-		                         order->complete) == NULL)
-		{
     goto fail; //Bool
     }
      } 
@@ -114,12 +111,14 @@ fail:
 }
 
 order_t *order_parseFromJSON(cJSON *orderJSON){
+
     order_t *order_local_var = NULL;
 
     // order->id
     cJSON *id = cJSON_GetObjectItemCaseSensitive(orderJSON, "id");
     if (id) { 
-		if(!cJSON_IsNumber(id)) {
+    if(!cJSON_IsNumber(id))
+    {
     goto end; //Numeric
     }
     }
@@ -127,25 +126,26 @@ order_t *order_parseFromJSON(cJSON *orderJSON) {
     // order->petId
     cJSON *petId = cJSON_GetObjectItemCaseSensitive(orderJSON, "petId");
     if (petId) { 
-		if(!cJSON_IsNumber(petId)) {
+    if(!cJSON_IsNumber(petId))
+    {
     goto end; //Numeric
     }
     }
 
     // order->quantity
-	cJSON *quantity =
+    cJSON *quantity = cJSON_GetObjectItemCaseSensitive(orderJSON, "quantity");
-		cJSON_GetObjectItemCaseSensitive(orderJSON, "quantity");
     if (quantity) { 
-		if(!cJSON_IsNumber(quantity)) {
+    if(!cJSON_IsNumber(quantity))
+    {
     goto end; //Numeric
     }
     }
 
     // order->shipDate
-	cJSON *shipDate =
+    cJSON *shipDate = cJSON_GetObjectItemCaseSensitive(orderJSON, "shipDate");
-		cJSON_GetObjectItemCaseSensitive(orderJSON, "shipDate");
     if (shipDate) { 
-		if(!cJSON_IsString(shipDate)) {
+    if(!cJSON_IsString(shipDate))
+    {
     goto end; //DateTime
     }
     }
@@ -154,17 +154,18 @@ order_t *order_parseFromJSON(cJSON *orderJSON) {
     cJSON *status = cJSON_GetObjectItemCaseSensitive(orderJSON, "status");
     status_e statusVariable;
     if (status) { 
-		if(!cJSON_IsString(status)) {
+    if(!cJSON_IsString(status))
+    {
     goto end; //Enum
     }
     statusVariable = statusorder_FromString(status->valuestring);
     }
 
     // order->complete
-	cJSON *complete =
+    cJSON *complete = cJSON_GetObjectItemCaseSensitive(orderJSON, "complete");
-		cJSON_GetObjectItemCaseSensitive(orderJSON, "complete");
     if (complete) { 
-		if(!cJSON_IsBool(complete)) {
+    if(!cJSON_IsBool(complete))
+    {
     goto end; //Bool
     }
     }
@@ -182,4 +183,5 @@ order_t *order_parseFromJSON(cJSON *orderJSON) {
     return order_local_var;
 end:
     return NULL;
+
 }

samples/client/petstore/c/model/order.h

@@ -26,10 +26,17 @@ typedef struct order_t {
     char *shipDate; //date time
     status_e status; //enum
     int complete; //boolean
+
 } order_t;
 
-order_t *order_create(long id, long petId, int quantity, char *shipDate,
+order_t *order_create(
-                      status_e status, int complete);
+    long id,
+    long petId,
+    int quantity,
+    char *shipDate,
+    status_e status,
+    int complete
+);
 
 void order_free(order_t *order);
 
@@ -38,3 +45,4 @@ order_t *order_parseFromJSON(cJSON *orderJSON);
 cJSON *order_convertToJSON(order_t *order);
 
 #endif /* _order_H_ */
+

samples/client/petstore/c/model/pet.c

@@ -22,8 +22,14 @@ status_e statuspet_FromString(char *status) {
     return 0;
     }
 
-pet_t *pet_create(long id, category_t *category, char *name, list_t *photoUrls,
+pet_t *pet_create(
-                  list_t *tags, status_e status) {
+    long id,
+    category_t *category,
+    char *name,
+    list_t *photoUrls,
+    list_t *tags,
+    status_e status
+    ) {
     pet_t *pet_local_var = malloc(sizeof(pet_t));
     if (!pet_local_var) {
         return NULL;
@@ -67,8 +73,7 @@ cJSON *pet_convertToJSON(pet_t *pet) {
 
     // pet->category
     if(pet->category) { 
-		cJSON *category_local_JSON = category_convertToJSON(
+    cJSON *category_local_JSON = category_convertToJSON(pet->category);
-			pet->category);
     if(category_local_JSON == NULL) {
     goto fail; //model
     }
@@ -101,9 +106,7 @@ cJSON *pet_convertToJSON(pet_t *pet) {
 
     listEntry_t *photo_urlsListEntry;
     list_ForEach(photo_urlsListEntry, pet->photoUrls) {
-		if(cJSON_AddStringToObject(photo_urls, "",
+    if(cJSON_AddStringToObject(photo_urls, "", (char*)photo_urlsListEntry->data) == NULL)
-		                           (char *) photo_urlsListEntry->data)
-		   == NULL)
     {
         goto fail;
     }
@@ -120,8 +123,7 @@ cJSON *pet_convertToJSON(pet_t *pet) {
     listEntry_t *tagsListEntry;
     if (pet->tags) {
     list_ForEach(tagsListEntry, pet->tags) {
-				cJSON *itemLocal = tag_convertToJSON(
+    cJSON *itemLocal = tag_convertToJSON(tagsListEntry->data);
-					tagsListEntry->data);
     if(itemLocal == NULL) {
     goto fail;
     }
@@ -133,8 +135,7 @@ cJSON *pet_convertToJSON(pet_t *pet) {
 
     // pet->status
     
-	if(cJSON_AddStringToObject(item, "status",
+    if(cJSON_AddStringToObject(item, "status", statuspet_ToString(pet->status)) == NULL)
-	                           statuspet_ToString(pet->status)) == NULL)
     {
     goto fail; //Enum
     }
@@ -149,12 +150,14 @@ fail:
 }
 
 pet_t *pet_parseFromJSON(cJSON *petJSON){
+
     pet_t *pet_local_var = NULL;
 
     // pet->id
     cJSON *id = cJSON_GetObjectItemCaseSensitive(petJSON, "id");
     if (id) { 
-		if(!cJSON_IsNumber(id)) {
+    if(!cJSON_IsNumber(id))
+    {
     goto end; //Numeric
     }
     }
@@ -173,13 +176,13 @@ pet_t *pet_parseFromJSON(cJSON *petJSON) {
     }
 
     
-	if(!cJSON_IsString(name)) {
+    if(!cJSON_IsString(name))
+    {
     goto end; //String
     }
 
     // pet->photoUrls
-	cJSON *photoUrls =
+    cJSON *photoUrls = cJSON_GetObjectItemCaseSensitive(petJSON, "photoUrls");
-		cJSON_GetObjectItemCaseSensitive(petJSON, "photoUrls");
     if (!photoUrls) {
         goto end;
     }
@@ -194,11 +197,11 @@ pet_t *pet_parseFromJSON(cJSON *petJSON) {
 
     cJSON_ArrayForEach(photo_urls_local, photoUrls)
     {
-		if(!cJSON_IsString(photo_urls_local)) {
+        if(!cJSON_IsString(photo_urls_local))
+        {
             goto end;
         }
-		list_addElement(photo_urlsList,
+        list_addElement(photo_urlsList , strdup(photo_urls_local->valuestring));
-		                strdup(photo_urls_local->valuestring));
     }
 
     // pet->tags
@@ -217,8 +220,7 @@ pet_t *pet_parseFromJSON(cJSON *petJSON) {
         if(!cJSON_IsObject(tags_local_nonprimitive)){
             goto end;
         }
-			tag_t *tagsItem = tag_parseFromJSON(
+        tag_t *tagsItem = tag_parseFromJSON(tags_local_nonprimitive);
-				tags_local_nonprimitive);
 
         list_addElement(tagsList, tagsItem);
     }
@@ -228,7 +230,8 @@ pet_t *pet_parseFromJSON(cJSON *petJSON) {
     cJSON *status = cJSON_GetObjectItemCaseSensitive(petJSON, "status");
     status_e statusVariable;
     if (status) { 
-		if(!cJSON_IsString(status)) {
+    if(!cJSON_IsString(status))
+    {
     goto end; //Enum
     }
     statusVariable = statuspet_FromString(status->valuestring);
@@ -247,4 +250,5 @@ pet_t *pet_parseFromJSON(cJSON *petJSON) {
     return pet_local_var;
 end:
     return NULL;
+
 }

samples/client/petstore/c/model/pet.h

@@ -28,10 +28,17 @@ typedef struct pet_t {
     list_t *photoUrls; //primitive container
     list_t *tags; //nonprimitive container
     status_e status; //enum
+
 } pet_t;
 
-pet_t *pet_create(long id, category_t *category, char *name, list_t *photoUrls,
+pet_t *pet_create(
-                  list_t *tags, status_e status);
+    long id,
+    category_t *category,
+    char *name,
+    list_t *photoUrls,
+    list_t *tags,
+    status_e status
+);
 
 void pet_free(pet_t *pet);
 
@@ -40,3 +47,4 @@ pet_t *pet_parseFromJSON(cJSON *petJSON);
 cJSON *pet_convertToJSON(pet_t *pet);
 
 #endif /* _pet_H_ */
+

samples/client/petstore/c/model/tag.c

@@ -5,7 +5,10 @@
 
 
 
-tag_t *tag_create(long id, char *name) {
+tag_t *tag_create(
+    long id,
+    char *name
+    ) {
     tag_t *tag_local_var = malloc(sizeof(tag_t));
     if (!tag_local_var) {
         return NULL;
@@ -50,12 +53,14 @@ fail:
 }
 
 tag_t *tag_parseFromJSON(cJSON *tagJSON){
+
     tag_t *tag_local_var = NULL;
 
     // tag->id
     cJSON *id = cJSON_GetObjectItemCaseSensitive(tagJSON, "id");
     if (id) { 
-		if(!cJSON_IsNumber(id)) {
+    if(!cJSON_IsNumber(id))
+    {
     goto end; //Numeric
     }
     }
@@ -63,7 +68,8 @@ tag_t *tag_parseFromJSON(cJSON *tagJSON) {
     // tag->name
     cJSON *name = cJSON_GetObjectItemCaseSensitive(tagJSON, "name");
     if (name) { 
-		if(!cJSON_IsString(name)) {
+    if(!cJSON_IsString(name))
+    {
     goto end; //String
     }
     }
@@ -77,4 +83,5 @@ tag_t *tag_parseFromJSON(cJSON *tagJSON) {
     return tag_local_var;
 end:
     return NULL;
+
 }

samples/client/petstore/c/model/tag.h

@@ -17,9 +17,13 @@
 typedef struct tag_t {
     long id; //numeric
     char *name; // string
+
 } tag_t;
 
-tag_t *tag_create(long id, char *name);
+tag_t *tag_create(
+    long id,
+    char *name
+);
 
 void tag_free(tag_t *tag);
 
@@ -28,3 +32,4 @@ tag_t *tag_parseFromJSON(cJSON *tagJSON);
 cJSON *tag_convertToJSON(tag_t *tag);
 
 #endif /* _tag_H_ */
+

samples/client/petstore/c/model/user.c

@@ -5,8 +5,16 @@
 
 
 
-user_t *user_create(long id, char *username, char *firstName, char *lastName,
+user_t *user_create(
-                    char *email, char *password, char *phone, int userStatus) {
+    long id,
+    char *username,
+    char *firstName,
+    char *lastName,
+    char *email,
+    char *password,
+    char *phone,
+    int userStatus
+    ) {
     user_t *user_local_var = malloc(sizeof(user_t));
     if (!user_local_var) {
         return NULL;
@@ -48,9 +56,7 @@ cJSON *user_convertToJSON(user_t *user) {
 
     // user->username
     if(user->username) { 
-		if(cJSON_AddStringToObject(item, "username",
+    if(cJSON_AddStringToObject(item, "username", user->username) == NULL) {
-		                           user->username) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -58,9 +64,7 @@ cJSON *user_convertToJSON(user_t *user) {
 
     // user->firstName
     if(user->firstName) { 
-		if(cJSON_AddStringToObject(item, "firstName",
+    if(cJSON_AddStringToObject(item, "firstName", user->firstName) == NULL) {
-		                           user->firstName) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -68,9 +72,7 @@ cJSON *user_convertToJSON(user_t *user) {
 
     // user->lastName
     if(user->lastName) { 
-		if(cJSON_AddStringToObject(item, "lastName",
+    if(cJSON_AddStringToObject(item, "lastName", user->lastName) == NULL) {
-		                           user->lastName) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -78,9 +80,7 @@ cJSON *user_convertToJSON(user_t *user) {
 
     // user->email
     if(user->email) { 
-		if(cJSON_AddStringToObject(item, "email",
+    if(cJSON_AddStringToObject(item, "email", user->email) == NULL) {
-		                           user->email) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -88,9 +88,7 @@ cJSON *user_convertToJSON(user_t *user) {
 
     // user->password
     if(user->password) { 
-		if(cJSON_AddStringToObject(item, "password",
+    if(cJSON_AddStringToObject(item, "password", user->password) == NULL) {
-		                           user->password) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -98,9 +96,7 @@ cJSON *user_convertToJSON(user_t *user) {
 
     // user->phone
     if(user->phone) { 
-		if(cJSON_AddStringToObject(item, "phone",
+    if(cJSON_AddStringToObject(item, "phone", user->phone) == NULL) {
-		                           user->phone) == NULL)
-		{
     goto fail; //String
     }
      } 
@@ -108,9 +104,7 @@ cJSON *user_convertToJSON(user_t *user) {
 
     // user->userStatus
     if(user->userStatus) { 
-		if(cJSON_AddNumberToObject(item, "userStatus",
+    if(cJSON_AddNumberToObject(item, "userStatus", user->userStatus) == NULL) {
-		                           user->userStatus) == NULL)
-		{
     goto fail; //Numeric
     }
      } 
@@ -124,39 +118,41 @@ fail:
 }
 
 user_t *user_parseFromJSON(cJSON *userJSON){
+
     user_t *user_local_var = NULL;
 
     // user->id
     cJSON *id = cJSON_GetObjectItemCaseSensitive(userJSON, "id");
     if (id) { 
-		if(!cJSON_IsNumber(id)) {
+    if(!cJSON_IsNumber(id))
+    {
     goto end; //Numeric
     }
     }
 
     // user->username
-	cJSON *username =
+    cJSON *username = cJSON_GetObjectItemCaseSensitive(userJSON, "username");
-		cJSON_GetObjectItemCaseSensitive(userJSON, "username");
     if (username) { 
-		if(!cJSON_IsString(username)) {
+    if(!cJSON_IsString(username))
+    {
     goto end; //String
     }
     }
 
     // user->firstName
-	cJSON *firstName = cJSON_GetObjectItemCaseSensitive(userJSON,
+    cJSON *firstName = cJSON_GetObjectItemCaseSensitive(userJSON, "firstName");
-	                                                    "firstName");
     if (firstName) { 
-		if(!cJSON_IsString(firstName)) {
+    if(!cJSON_IsString(firstName))
+    {
     goto end; //String
     }
     }
 
     // user->lastName
-	cJSON *lastName =
+    cJSON *lastName = cJSON_GetObjectItemCaseSensitive(userJSON, "lastName");
-		cJSON_GetObjectItemCaseSensitive(userJSON, "lastName");
     if (lastName) { 
-		if(!cJSON_IsString(lastName)) {
+    if(!cJSON_IsString(lastName))
+    {
     goto end; //String
     }
     }
@@ -164,16 +160,17 @@ user_t *user_parseFromJSON(cJSON *userJSON) {
     // user->email
     cJSON *email = cJSON_GetObjectItemCaseSensitive(userJSON, "email");
     if (email) { 
-		if(!cJSON_IsString(email)) {
+    if(!cJSON_IsString(email))
+    {
     goto end; //String
     }
     }
 
     // user->password
-	cJSON *password =
+    cJSON *password = cJSON_GetObjectItemCaseSensitive(userJSON, "password");
-		cJSON_GetObjectItemCaseSensitive(userJSON, "password");
     if (password) { 
-		if(!cJSON_IsString(password)) {
+    if(!cJSON_IsString(password))
+    {
     goto end; //String
     }
     }
@@ -181,16 +178,17 @@ user_t *user_parseFromJSON(cJSON *userJSON) {
     // user->phone
     cJSON *phone = cJSON_GetObjectItemCaseSensitive(userJSON, "phone");
     if (phone) { 
-		if(!cJSON_IsString(phone)) {
+    if(!cJSON_IsString(phone))
+    {
     goto end; //String
     }
     }
 
     // user->userStatus
-	cJSON *userStatus = cJSON_GetObjectItemCaseSensitive(userJSON,
+    cJSON *userStatus = cJSON_GetObjectItemCaseSensitive(userJSON, "userStatus");
-	                                                     "userStatus");
     if (userStatus) { 
-		if(!cJSON_IsNumber(userStatus)) {
+    if(!cJSON_IsNumber(userStatus))
+    {
     goto end; //Numeric
     }
     }
@@ -210,4 +208,5 @@ user_t *user_parseFromJSON(cJSON *userJSON) {
     return user_local_var;
 end:
     return NULL;
+
 }

samples/client/petstore/c/model/user.h

@@ -23,10 +23,19 @@ typedef struct user_t {
     char *password; // string
     char *phone; // string
     int userStatus; //numeric
+
 } user_t;
 
-user_t *user_create(long id, char *username, char *firstName, char *lastName,
+user_t *user_create(
-                    char *email, char *password, char *phone, int userStatus);
+    long id,
+    char *username,
+    char *firstName,
+    char *lastName,
+    char *email,
+    char *password,
+    char *phone,
+    int userStatus
+);
 
 void user_free(user_t *user);
 
@@ -35,3 +44,4 @@ user_t *user_parseFromJSON(cJSON *userJSON);
 cJSON *user_convertToJSON(user_t *user);
 
 #endif /* _user_H_ */
+

samples/client/petstore/c/src/apiClient.c

@@ -40,7 +40,8 @@ void replaceSpaceWithPlus(char *stringToProcess) {
     }
 }
 
-char *assembleTargetUrl(char *basePath, char *operationParameter,
+char *assembleTargetUrl(char    *basePath,
+                        char    *operationParameter,
                         list_t    *queryParameters) {
     int neededBufferSizeForQueryParameters = 0;
     listEntry_t *listEntry;
@@ -125,10 +126,14 @@ int lengthOfKeyPair(keyValuePair_t *keyPair) {
 }
 
 
-void apiClient_invoke(apiClient_t *apiClient, char *operationParameter,
+void apiClient_invoke(apiClient_t    *apiClient,
-                      list_t *queryParameters, list_t *headerParameters,
+                      char        *operationParameter,
-                      list_t *formParameters, list_t *headerType,
+                      list_t        *queryParameters,
-                      list_t *contentType, char *bodyParameters,
+                      list_t        *headerParameters,
+                      list_t        *formParameters,
+                      list_t        *headerType,
+                      list_t        *contentType,
+                      char        *bodyParameters,
                       char        *requestType) {
     CURL *handle = curl_easy_init();
     CURLcode res;
@@ -283,18 +288,16 @@ void apiClient_invoke(apiClient_t *apiClient, char *operationParameter,
             }
         }
         // this would only be generated for apiKey authentication
-		if(apiClient->apiKeys != NULL) {
+        if (apiClient->apiKeys != NULL)
+        {
         list_ForEach(listEntry, apiClient->apiKeys) {
         keyValuePair_t *apiKey = listEntry->data;
         if((apiKey->key != NULL) &&
            (apiKey->value != NULL) )
         {
-					char *headerValueToWrite =
+            char *headerValueToWrite = assembleHeaderField(
-						assembleHeaderField(
+                apiKey->key, apiKey->value);
-							apiKey->key,
+            curl_slist_append(headers, headerValueToWrite);
-							apiKey->value);
-					curl_slist_append(headers,
-					                  headerValueToWrite);
             free(headerValueToWrite);
         }
         }
@@ -338,8 +341,7 @@ void apiClient_invoke(apiClient_t *apiClient, char *operationParameter,
         }
 
         if(res == CURLE_OK) {
-			curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE,
+            curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE, &apiClient->response_code);
-			                  &apiClient->response_code);
         } else {
             char *url,*ip,*scheme;
             long port;
@@ -347,8 +349,7 @@ void apiClient_invoke(apiClient_t *apiClient, char *operationParameter,
             curl_easy_getinfo(handle, CURLINFO_PRIMARY_IP, &ip);
             curl_easy_getinfo(handle, CURLINFO_PRIMARY_PORT, &port);
             curl_easy_getinfo(handle, CURLINFO_SCHEME, &scheme);
-			fprintf(stderr,
+            fprintf(stderr, "curl_easy_perform() failed\n\nURL: %s\nIP: %s\nPORT: %li\nSCHEME: %s\nStrERROR: %s\n",url,ip,port,scheme,
-			        "curl_easy_perform() failed\n\nURL: %s\nIP: %s\nPORT: %li\nSCHEME: %s\nStrERROR: %s\n", url, ip, port, scheme,
             curl_easy_strerror(res));
         }
 
@@ -376,8 +377,7 @@ char *strReplace(char *orig, char *rep, char *with) {
     int count; // number of replacements
 
     // sanity checks and initialization
-	if(!orig ||
+    if(!orig || !rep)
-	   !rep)
     {
         return NULL;
     }
@@ -419,8 +419,7 @@ char *strReplace(char *orig, char *rep, char *with) {
     return result;
 }
 
-char *sbi_base64encode(const void	*b64_encode_this,
+char *sbi_base64encode (const void *b64_encode_this, int encode_this_many_bytes){
-                       int		encode_this_many_bytes) {
 #ifdef OPENSSL
     BIO *b64_bio, *mem_bio;      //Declares two OpenSSL BIOs: a base64 filter and a memory BIO.
     BUF_MEM *mem_bio_mem_ptr;    //Pointer to a "memory BIO" structure holding our base64 data.
@@ -439,12 +438,10 @@ char *sbi_base64encode(const void	*b64_encode_this,
 #endif
 }
 
-char *sbi_base64decode(const void	*b64_decode_this,
+char *sbi_base64decode (const void *b64_decode_this, int decode_this_many_bytes){
-                       int		decode_this_many_bytes) {
 #ifdef OPENSSL
     BIO *b64_bio, *mem_bio;      //Declares two OpenSSL BIOs: a base64 filter and a memory BIO.
-	char *base64_decoded = calloc( (decode_this_many_bytes * 3) / 4 + 1,
+    char *base64_decoded = calloc( (decode_this_many_bytes*3)/4+1, sizeof(char) ); //+1 = null.
-	                               sizeof(char) );                             // +1 = null.
     b64_bio = BIO_new(BIO_f_base64());                      //Initialize our base64 filter BIO.
     mem_bio = BIO_new(BIO_s_mem());                         //Initialize our memory source BIO.
     BIO_write(mem_bio, b64_decode_this, decode_this_many_bytes); //Base64 data saved in source.

samples/client/petstore/c/src/list.c

@@ -35,7 +35,8 @@ list_t *list_create() {
     return createdList;
 }
 
-void list_iterateThroughListForward(list_t *list, void (*operationToPerform)(
+void list_iterateThroughListForward(list_t *list,
+                                    void (*operationToPerform)(
                                         listEntry_t *,
                                         void *callbackFunctionUsedData),
                                     void *additionalDataNeededForCallbackFunction)
@@ -61,7 +62,8 @@ void list_iterateThroughListForward(list_t *list, void (*operationToPerform)(
     }
 }
 
-void list_iterateThroughListBackward(list_t *list, void (*operationToPerform)(
+void list_iterateThroughListBackward(list_t *list,
+                                     void (*operationToPerform)(
                                          listEntry_t *,
                                          void *callbackFunctionUsedData),
                                      void *additionalDataNeededForCallbackFunction)