diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
index 0be8ee130b2b0abaa44f1615254bd02c7ae7f1f1..a5bab8b9c628bb660722c352791e3d9fff349851 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
@@ -617,9 +617,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf
         } else {
             setProjectName(defaultProjectName);
         }
-        System.out.println("michele was here preprocessOpenAPI "+projectName);
         additionalProperties.put(PROJECT_NAME, projectName);
-        System.out.println("michele was here preprocessOpenAPI after "+projectName);
     }
 
     public void setProjectName(String projectName) {
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache
index c8daaf0e444b6f9ac9d8ddebdd87df438797eeac..d2016014fad0bac837c938086d7a0512828e6e94 100644
--- a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache
@@ -99,7 +99,7 @@ end:
 //
 {{/notes}}
 {{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}}
-{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{^isListContainer}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isListContainer}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}}{{/allParams}})
+{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}})
 {
     list_t    *localVarQueryParameters = {{#hasQueryParams}}list_create();{{/hasQueryParams}}{{^hasQueryParams}}NULL;{{/hasQueryParams}}
     list_t    *localVarHeaderParameters = {{#hasHeaderParams}}list_create();{{/hasHeaderParams}}{{^hasHeaderParams}}NULL;{{/hasHeaderParams}}
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache
index 6b2d7773d4311b3e15e6fb204d283ad3dd58de80..6247c6d97dca6609e7dee124c92089f58546c947 100644
--- a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache
@@ -32,7 +32,7 @@ typedef enum  { {{projectName}}_{{operationId}}_{{enumName}}_NULL = 0{{#enumVars
 //
 {{/notes}}
 {{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}}
-{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}} ,{{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{^isListContainer}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isListContainer}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}}{{/allParams}});
+{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}});
 
 
 {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
index 5e3e49c29e46ac417aacee07b7ecf06ce8d1adcf..4f59107267d526154ca109a592bbd91d0d7eb36f 100644
--- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
@@ -37,6 +37,11 @@ cJSON *{{classFilename}}_{{classname}}_convertToJSON({{projectName}}_{{classVarN
         goto fail;
     }
 {{/isNumeric}}
+{{#isBoolean}}
+    if(cJSON_AddBoolToObject(item, "{{{classname}}}", {{{classname}}}) == NULL) {
+        goto fail;
+    }
+{{/isBoolean}}
     return item;
 fail:
     cJSON_Delete(item);
@@ -389,12 +394,18 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) {
         goto fail;
     }
     {{/isString}}
-    {{^isString}}
+    {{#isBoolean}}
+    if(cJSON_AddBoolToObject({{{name}}}, "", *(cJSON_bool *){{{name}}}ListEntry->data) == NULL)
+    {
+        goto fail;
+    }
+    {{/isBoolean}}
+    {{#isNumeric}}
     if(cJSON_AddNumberToObject({{{name}}}, "", *(double *){{{name}}}ListEntry->data) == NULL)
     {
         goto fail;
     }
-    {{/isString}}
+    {{/isNumeric}}
     {{/items}}
     }
     {{/isPrimitiveType}}
@@ -433,12 +444,18 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) {
             goto fail;
         }
         {{/isString}}
-        {{^isString}}
+        {{#isNumeric}}
         if(cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL)
         {
             goto fail;
         }
-        {{/isString}}
+        {{/isNumeric}}
+        {{#isBoolean}}
+        if(cJSON_AddBoolToObject(localMapObject, localKeyValue->key, *(cJSON_bool *)localKeyValue->value) == NULL)
+        {
+            goto fail;
+        }
+        {{/isBoolean}}
         {{/items}}
     }
     }
@@ -598,13 +615,20 @@ fail:
         }
         list_addElement({{{name}}}List , strdup({{{name}}}_local->valuestring));
         {{/isString}}
-        {{^isString}}
+        {{#isNumeric}}
         if(!cJSON_IsNumber({{{name}}}_local))
         {
             goto end;
         }
         list_addElement({{{name}}}List , &{{{name}}}_local->valuedouble);
-        {{/isString}}
+        {{/isNumeric}}
+        {{#isBoolean}}
+        if(!cJSON_IsBool({{{name}}}_local))
+        {
+            goto end;
+        }
+        list_addElement({{{name}}}List , {{{name}}}_local->valueint);
+        {{/isBoolean}}
         {{/items}}
     }
     {{/isPrimitiveType}}
@@ -649,13 +673,20 @@ fail:
         }
         localMapKeyPair = keyValuePair_create(strdup(localMapObject->string),strdup(localMapObject->valuestring));
         {{/isString}}
-        {{^isString}}
+        {{#isBoolean}}
+        if(!cJSON_IsBool(localMapObject))
+        {
+            goto end;
+        }
+        localMapKeyPair = keyValuePair_create(strdup(localMapObject->string), &localMapObject->valueint);
+        {{/isBoolean}}
+        {{#isNumeric}}
         if(!cJSON_IsNumber(localMapObject))
         {
             goto end;
         }
         localMapKeyPair = keyValuePair_create(strdup(localMapObject->string),&localMapObject->valuedouble );
-        {{/isString}}
+        {{/isNumeric}}
 		{{/items}}
         list_addElement({{{name}}}List , localMapKeyPair);
     }
diff --git a/samples/client/petstore/c/api/PetAPI.c b/samples/client/petstore/c/api/PetAPI.c
index 5dc27c6bbf5925c15595c522568fd0fa68f2d4a1..e89428e9be6afd07a7aa67c1e481435d7f083dce 100644
--- a/samples/client/petstore/c/api/PetAPI.c
+++ b/samples/client/petstore/c/api/PetAPI.c
@@ -58,7 +58,7 @@ end:
 // Add a new pet to the store
 //
 void
-PetAPI_addPet(apiClient_t *apiClient, pet_t * body)
+PetAPI_addPet(apiClient_t *apiClient, pet_t * body )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -117,7 +117,7 @@ end:
 // Deletes a pet
 //
 void
-PetAPI_deletePet(apiClient_t *apiClient, long petId, char * api_key)
+PetAPI_deletePet(apiClient_t *apiClient, long petId , char * api_key )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = list_create();
@@ -195,7 +195,7 @@ end:
 // Multiple status values can be provided with comma separated strings
 //
 list_t*
-PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status)
+PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status )
 {
     list_t    *localVarQueryParameters = list_create();
     list_t    *localVarHeaderParameters = NULL;
@@ -274,7 +274,7 @@ end:
 // 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)
+PetAPI_findPetsByTags(apiClient_t *apiClient, list_t * tags )
 {
     list_t    *localVarQueryParameters = list_create();
     list_t    *localVarHeaderParameters = NULL;
@@ -353,7 +353,7 @@ end:
 // Returns a single pet
 //
 pet_t*
-PetAPI_getPetById(apiClient_t *apiClient, long petId)
+PetAPI_getPetById(apiClient_t *apiClient, long petId )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -432,7 +432,7 @@ end:
 // Update an existing pet
 //
 void
-PetAPI_updatePet(apiClient_t *apiClient, pet_t * body)
+PetAPI_updatePet(apiClient_t *apiClient, pet_t * body )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -497,7 +497,7 @@ end:
 // Updates a pet in the store with form data
 //
 void
-PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char * name, char * status)
+PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId , char * name , char * status )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -589,7 +589,7 @@ end:
 // uploads an image
 //
 api_response_t*
-PetAPI_uploadFile(apiClient_t *apiClient, long petId, 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;
diff --git a/samples/client/petstore/c/api/PetAPI.h b/samples/client/petstore/c/api/PetAPI.h
index b4bfc6cdf9cd927a826b6e43188b8d1abe6daab1..23f8e1d9224181edadca35973f0a10a9e0280e00 100644
--- a/samples/client/petstore/c/api/PetAPI.h
+++ b/samples/client/petstore/c/api/PetAPI.h
@@ -14,13 +14,13 @@ typedef enum  { openapi_petstore_findPetsByStatus_STATUS_NULL = 0, openapi_petst
 // Add a new pet to the store
 //
 void
-PetAPI_addPet(apiClient_t *apiClient ,pet_t * body);
+PetAPI_addPet(apiClient_t *apiClient, pet_t * body );
 
 
 // Deletes a pet
 //
 void
-PetAPI_deletePet(apiClient_t *apiClient ,long petId ,char * api_key);
+PetAPI_deletePet(apiClient_t *apiClient, long petId , char * api_key );
 
 
 // Finds Pets by status
@@ -28,7 +28,7 @@ PetAPI_deletePet(apiClient_t *apiClient ,long petId ,char * api_key);
 // Multiple status values can be provided with comma separated strings
 //
 list_t*
-PetAPI_findPetsByStatus(apiClient_t *apiClient ,list_t * status);
+PetAPI_findPetsByStatus(apiClient_t *apiClient, list_t * status );
 
 
 // Finds Pets by tags
@@ -36,7 +36,7 @@ PetAPI_findPetsByStatus(apiClient_t *apiClient ,list_t * status);
 // 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);
+PetAPI_findPetsByTags(apiClient_t *apiClient, list_t * tags );
 
 
 // Find pet by ID
@@ -44,24 +44,24 @@ PetAPI_findPetsByTags(apiClient_t *apiClient ,list_t * tags);
 // Returns a single pet
 //
 pet_t*
-PetAPI_getPetById(apiClient_t *apiClient ,long petId);
+PetAPI_getPetById(apiClient_t *apiClient, long petId );
 
 
 // Update an existing pet
 //
 void
-PetAPI_updatePet(apiClient_t *apiClient ,pet_t * body);
+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 ,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 ,char * additionalMetadata ,binary_t* file);
+PetAPI_uploadFile(apiClient_t *apiClient, long petId , char * additionalMetadata , binary_t* file );
 
 
diff --git a/samples/client/petstore/c/api/StoreAPI.c b/samples/client/petstore/c/api/StoreAPI.c
index d8d4778e7beab391a897359d817651e41264d694..31857ad2d1902c7e249c7318c2ff2fa444411816 100644
--- a/samples/client/petstore/c/api/StoreAPI.c
+++ b/samples/client/petstore/c/api/StoreAPI.c
@@ -17,7 +17,7 @@
 // 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)
+StoreAPI_deleteOrder(apiClient_t *apiClient, char * orderId )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -139,7 +139,7 @@ end:
 // 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)
+StoreAPI_getOrderById(apiClient_t *apiClient, long orderId )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -218,7 +218,7 @@ end:
 // Place an order for a pet
 //
 order_t*
-StoreAPI_placeOrder(apiClient_t *apiClient, order_t * body)
+StoreAPI_placeOrder(apiClient_t *apiClient, order_t * body )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
diff --git a/samples/client/petstore/c/api/StoreAPI.h b/samples/client/petstore/c/api/StoreAPI.h
index cba13a977d5579f671a9c0b647d4b0b8560b2a67..e38609bbceab04528f208d6bf890450be581a148 100644
--- a/samples/client/petstore/c/api/StoreAPI.h
+++ b/samples/client/petstore/c/api/StoreAPI.h
@@ -12,7 +12,7 @@
 // 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);
+StoreAPI_deleteOrder(apiClient_t *apiClient, char * orderId );
 
 
 // Returns pet inventories by status
@@ -28,12 +28,12 @@ StoreAPI_getInventory(apiClient_t *apiClient);
 // 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);
+StoreAPI_getOrderById(apiClient_t *apiClient, long orderId );
 
 
 // Place an order for a pet
 //
 order_t*
-StoreAPI_placeOrder(apiClient_t *apiClient ,order_t * body);
+StoreAPI_placeOrder(apiClient_t *apiClient, order_t * body );
 
 
diff --git a/samples/client/petstore/c/api/UserAPI.c b/samples/client/petstore/c/api/UserAPI.c
index 2bb91981179e52380b403d5bcb6c631f3def1c46..e49c0f14bc5c72a4a7780a52b82eaa6af1ff4c09 100644
--- a/samples/client/petstore/c/api/UserAPI.c
+++ b/samples/client/petstore/c/api/UserAPI.c
@@ -17,7 +17,7 @@
 // This can only be done by the logged in user.
 //
 void
-UserAPI_createUser(apiClient_t *apiClient, user_t * body)
+UserAPI_createUser(apiClient_t *apiClient, user_t * body )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -74,7 +74,7 @@ end:
 // Creates list of users with given input array
 //
 void
-UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t * body)
+UserAPI_createUsersWithArrayInput(apiClient_t *apiClient, list_t * body )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -153,7 +153,7 @@ end:
 // Creates list of users with given input array
 //
 void
-UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body)
+UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -234,7 +234,7 @@ end:
 // This can only be done by the logged in user.
 //
 void
-UserAPI_deleteUser(apiClient_t *apiClient, char * username)
+UserAPI_deleteUser(apiClient_t *apiClient, char * username )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -294,7 +294,7 @@ end:
 // Get user by user name
 //
 user_t*
-UserAPI_getUserByName(apiClient_t *apiClient, char * username)
+UserAPI_getUserByName(apiClient_t *apiClient, char * username )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
@@ -369,7 +369,7 @@ end:
 // Logs user into the system
 //
 char*
-UserAPI_loginUser(apiClient_t *apiClient, char * username, char * password)
+UserAPI_loginUser(apiClient_t *apiClient, char * username , char * password )
 {
     list_t    *localVarQueryParameters = list_create();
     list_t    *localVarHeaderParameters = NULL;
@@ -520,7 +520,7 @@ end:
 // This can only be done by the logged in user.
 //
 void
-UserAPI_updateUser(apiClient_t *apiClient, char * username, user_t * body)
+UserAPI_updateUser(apiClient_t *apiClient, char * username , user_t * body )
 {
     list_t    *localVarQueryParameters = NULL;
     list_t    *localVarHeaderParameters = NULL;
diff --git a/samples/client/petstore/c/api/UserAPI.h b/samples/client/petstore/c/api/UserAPI.h
index 57f04a721940c16b74acfce05816c53f52fdca3a..cc93b91b5711810c7cdda15d80bd596f93f96287 100644
--- a/samples/client/petstore/c/api/UserAPI.h
+++ b/samples/client/petstore/c/api/UserAPI.h
@@ -12,19 +12,19 @@
 // This can only be done by the logged in user.
 //
 void
-UserAPI_createUser(apiClient_t *apiClient ,user_t * body);
+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);
+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);
+UserAPI_createUsersWithListInput(apiClient_t *apiClient, list_t * body );
 
 
 // Delete user
@@ -32,19 +32,19 @@ UserAPI_createUsersWithListInput(apiClient_t *apiClient ,list_t * body);
 // This can only be done by the logged in user.
 //
 void
-UserAPI_deleteUser(apiClient_t *apiClient ,char * username);
+UserAPI_deleteUser(apiClient_t *apiClient, char * username );
 
 
 // Get user by user name
 //
 user_t*
-UserAPI_getUserByName(apiClient_t *apiClient ,char * username);
+UserAPI_getUserByName(apiClient_t *apiClient, char * username );
 
 
 // Logs user into the system
 //
 char*
-UserAPI_loginUser(apiClient_t *apiClient ,char * username ,char * password);
+UserAPI_loginUser(apiClient_t *apiClient, char * username , char * password );
 
 
 // Logs out current logged in user session
@@ -58,6 +58,6 @@ UserAPI_logoutUser(apiClient_t *apiClient);
 // This can only be done by the logged in user.
 //
 void
-UserAPI_updateUser(apiClient_t *apiClient ,char * username ,user_t * body);
+UserAPI_updateUser(apiClient_t *apiClient, char * username , user_t * body );