[C][Client] Use int* as int or bool type function parameter (#17179)

2023-12-12 22:11:13 +08:00 · 2023-12-12 22:11:13 +08:00 · 2a27fd51a7
commit 2a27fd51a7
parent a792a79059
10 changed files with 74 additions and 60 deletions
--- 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}}{{#isArray}}{{{.}}}_t*{{/isArray}}{{#isMap}}{{{.}}}{{/isMap}}{{/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}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}{{dataType}}_t *{{/isArray}}{{#isMap}}{{dataType}}{{/isMap}}{{/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}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e {{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e {{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}} {{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}{{dataType}}_t *{{/isArray}}{{#isMap}}{{dataType}} {{/isMap}}{{/isContainer}}{{{paramName}}}{{/allParams}})
 {
    list_t    *localVarQueryParameters = {{#hasQueryParams}}list_createList();{{/hasQueryParams}}{{^hasQueryParams}}NULL;{{/hasQueryParams}}
    list_t    *localVarHeaderParameters = {{#hasHeaderParams}}list_createList();{{/hasHeaderParams}}{{^hasHeaderParams}}NULL;{{/hasHeaderParams}}
@ -138,7 +138,7 @@ end:
    snprintf(localVarToReplace_{{paramName}}, sizeOfPathParams_{{paramName}}, "{%s}", "{{baseName}}");

    char localVarBuff_{{paramName}}[256];
-    intToStr(localVarBuff_{{paramName}}, {{paramName}});
+    intToStr(localVarBuff_{{paramName}}, *{{paramName}});

    localVarPath = strReplace(localVarPath, localVarToReplace_{{paramName}}, localVarBuff_{{paramName}});

@ -198,7 +198,19 @@ end:
    keyValuePair_t *keyPairHeader_{{paramName}} = 0;
    if ({{paramName}}) {
        keyHeader_{{{paramName}}} = strdup("{{{baseName}}}");
+        {{#isInteger}}
+        valueHeader_{{{paramName}}} = calloc(1,MAX_NUMBER_LENGTH);
+        snprintf(valueHeader_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", *{{{paramName}}});
+        {{/isInteger}}
+        {{#isBoolean}}
+        valueHeader_{{{paramName}}} = calloc(1,MAX_NUMBER_LENGTH);
+        snprintf(valueHeader_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", *{{{paramName}}});
+        {{/isBoolean}}
+        {{^isInteger}}
+        {{^isBoolean}}
        valueHeader_{{{paramName}}} = {{#isString}}{{^isEnum}}strdup({{/isEnum}}{{/isString}}({{{paramName}}}){{#isString}}{{^isEnum}}){{/isEnum}}{{/isString}};
+        {{/isBoolean}}
+        {{/isInteger}}
        keyPairHeader_{{paramName}} = keyValuePair_create(keyHeader_{{{paramName}}}, {{#isEnum}}(void *){{/isEnum}}{{^isString}}&{{/isString}}valueHeader_{{{paramName}}});
        list_addElement(localVarHeaderParameters,keyPairHeader_{{paramName}});
    }
@ -212,17 +224,7 @@ end:
    {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}char *{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}char *{{/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}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}} valueQuery_{{{paramName}}} {{#isString}}{{^isEnum}}= NULL{{/isEnum}}{{/isString}}{{#isInteger}}= NULL{{/isInteger}}{{#isBoolean}}= NULL{{/isBoolean}};
    keyValuePair_t *keyPairQuery_{{paramName}} = 0;
    {{/isArray}}
-    {{#isInteger}}
-    if (1) // Always send integer parameters to the API server
-    {{/isInteger}}
-    {{#isBoolean}}
-    if (1) // Always send boolean parameters to the API server
-    {{/isBoolean}}
-    {{^isInteger}}
-    {{^isBoolean}}
    if ({{paramName}})
-    {{/isBoolean}}
-    {{/isInteger}}
    {
        {{#isArray}}
        list_addElement(localVarQueryParameters,{{paramName}});
@ -231,11 +233,11 @@ end:
        keyQuery_{{{paramName}}} = strdup("{{{baseName}}}");
        {{#isInteger}}
        valueQuery_{{{paramName}}} = calloc(1,MAX_NUMBER_LENGTH);
-        snprintf(valueQuery_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", {{{paramName}}});
+        snprintf(valueQuery_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", *{{{paramName}}});
        {{/isInteger}}
        {{#isBoolean}}
        valueQuery_{{{paramName}}} = calloc(1,MAX_NUMBER_LENGTH);
-        snprintf(valueQuery_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", {{{paramName}}});
+        snprintf(valueQuery_{{{paramName}}}, MAX_NUMBER_LENGTH, "%d", *{{{paramName}}});
        {{/isBoolean}}
        {{^isInteger}}
        {{^isBoolean}}
@ -271,7 +273,19 @@ end:
        {{/isFile}}
        {{^isFile}}
        keyForm_{{paramName}} = strdup("{{{baseName}}}");
+        {{#isInteger}}
+        valueForm_{{paramName}} = calloc(1,MAX_NUMBER_LENGTH);
+        snprintf(valueForm_{{paramName}}, MAX_NUMBER_LENGTH, "%d", *{{{paramName}}});
+        {{/isInteger}}
+        {{#isBoolean}}
+        valueForm_{{paramName}} = calloc(1,MAX_NUMBER_LENGTH);
+        snprintf(valueForm_{{paramName}}, MAX_NUMBER_LENGTH, "%d", *{{{paramName}}});
+        {{/isBoolean}}
+        {{^isInteger}}
+        {{^isBoolean}}
        valueForm_{{paramName}} = {{#isString}}{{^isEnum}}strdup({{/isEnum}}{{/isString}}({{{paramName}}}){{#isString}}{{^isEnum}}){{/isEnum}}{{/isString}};
+        {{/isBoolean}}
+        {{/isInteger}}
        keyPairForm_{{paramName}} = keyValuePair_create(keyForm_{{paramName}},{{#isString}}{{#isEnum}}(void *){{/isEnum}}{{/isString}}{{^isString}}&{{/isString}}valueForm_{{paramName}});
        list_addElement(localVarFormParameters,keyPairForm_{{paramName}});
        {{/isFile}}
--- a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache
@ -33,7 +33,7 @@ typedef enum  { {{projectName}}_{{operationId}}_{{enumName}}_NULL = 0{{#enumVars
 //
 {{/notes}}
 {{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isArray}}{{{.}}}_t*{{/isArray}}{{#isMap}}{{{.}}}{{/isMap}}{{/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}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}{{dataType}}_t *{{/isArray}}{{#isMap}}{{dataType}}{{/isMap}}{{/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}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e {{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e {{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}} {{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}{{dataType}}_t *{{/isArray}}{{#isMap}}{{dataType}} {{/isMap}}{{/isContainer}}{{{paramName}}}{{/allParams}});


 {{/operation}}
--- a/modules/openapi-generator/src/main/resources/C-libcurl/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/api_doc.mustache
@ -28,7 +28,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **apiClient** | **apiClient_t \*** | context containing the client configuration |
 {{#allParams}}
-**{{paramName}}** | {{#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]({{baseType}}.md) \***{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}**{{datatypeWithEnum}}_e**{{/isEnum}}{{^isEnum}}**[{{{dataType}}}_t]({{{baseType}}}.md) \***{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}**{{datatypeWithEnum}}_e**{{/isEnum}}{{/isModel}}{{#isUuid}}**{{dataType}} \***{{/isUuid}}{{#isEmail}}**{{dataType}}**{{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}**[{{dataType}}_t]({{baseType}}.md) \***{{/isArray}}{{#isMap}}**{{dataType}}**{{/isMap}}{{/isContainer}} | {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{.}}]{{/defaultValue}}
+**{{paramName}}** | {{#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]({{baseType}}.md) \***{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}**{{datatypeWithEnum}}_e**{{/isEnum}}{{^isEnum}}**[{{{dataType}}}_t]({{{baseType}}}.md) \***{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}**{{datatypeWithEnum}}_e**{{/isEnum}}{{/isModel}}{{#isUuid}}**{{dataType}} \***{{/isUuid}}{{#isEmail}}**{{dataType}}**{{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}**[{{dataType}}_t]({{baseType}}.md) \***{{/isArray}}{{#isMap}}**{{dataType}}**{{/isMap}}{{/isContainer}} | {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{.}}]{{/defaultValue}}
 {{/allParams}}

 ### Return type
--- 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;
@ -123,7 +123,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_createList();
@ -210,7 +210,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_createList();
    list_t    *localVarHeaderParameters = NULL;
@ -294,7 +294,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_createList();
    list_t    *localVarHeaderParameters = NULL;
@ -378,7 +378,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;
@ -463,7 +463,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;
@ -536,7 +536,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;
@ -643,7 +643,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;
--- a/samples/client/petstore/c/api/PetAPI.h
+++ b/samples/client/petstore/c/api/PetAPI.h
@ -15,13 +15,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
@ -29,7 +29,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
@ -37,7 +37,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
@ -45,24 +45,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);


--- 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;
@ -147,7 +147,7 @@ end:
 // For valid response try integer IDs with value <= 5 or > 10. Other values will generate 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;
@ -232,7 +232,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;
--- a/samples/client/petstore/c/api/StoreAPI.h
+++ b/samples/client/petstore/c/api/StoreAPI.h
@ -13,7 +13,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
@ -29,12 +29,12 @@ StoreAPI_getInventory(apiClient_t *apiClient);
 // For valid response try integer IDs with value <= 5 or > 10. Other values will generate 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);


--- 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;
@ -80,7 +80,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;
@ -171,7 +171,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;
@ -264,7 +264,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;
@ -328,7 +328,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;
@ -409,7 +409,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_createList();
    list_t    *localVarHeaderParameters = NULL;
@ -568,7 +568,7 @@ end:
 // This can test integer and boolean query parameters in API.
 //
 void
-UserAPI_testIntAndBool(apiClient_t *apiClient, int keep , int keepDay )
+UserAPI_testIntAndBool(apiClient_t *apiClient, int *keep, int *keepDay)
 {
    list_t    *localVarQueryParameters = list_createList();
    list_t    *localVarHeaderParameters = NULL;
@ -589,11 +589,11 @@ UserAPI_testIntAndBool(apiClient_t *apiClient, int keep , int keepDay )
    char *keyQuery_keep = NULL;
    char * valueQuery_keep = NULL;
    keyValuePair_t *keyPairQuery_keep = 0;
-    if (1) // Always send boolean parameters to the API server
+    if (keep)
    {
        keyQuery_keep = strdup("keep");
        valueQuery_keep = calloc(1,MAX_NUMBER_LENGTH);
-        snprintf(valueQuery_keep, MAX_NUMBER_LENGTH, "%d", keep);
+        snprintf(valueQuery_keep, MAX_NUMBER_LENGTH, "%d", *keep);
        keyPairQuery_keep = keyValuePair_create(keyQuery_keep, valueQuery_keep);
        list_addElement(localVarQueryParameters,keyPairQuery_keep);
    }
@ -602,11 +602,11 @@ UserAPI_testIntAndBool(apiClient_t *apiClient, int keep , int keepDay )
    char *keyQuery_keepDay = NULL;
    char * valueQuery_keepDay = NULL;
    keyValuePair_t *keyPairQuery_keepDay = 0;
-    if (1) // Always send integer parameters to the API server
+    if (keepDay)
    {
        keyQuery_keepDay = strdup("keepDay");
        valueQuery_keepDay = calloc(1,MAX_NUMBER_LENGTH);
-        snprintf(valueQuery_keepDay, MAX_NUMBER_LENGTH, "%d", keepDay);
+        snprintf(valueQuery_keepDay, MAX_NUMBER_LENGTH, "%d", *keepDay);
        keyPairQuery_keepDay = keyValuePair_create(keyQuery_keepDay, valueQuery_keepDay);
        list_addElement(localVarQueryParameters,keyPairQuery_keepDay);
    }
@ -645,7 +645,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;
--- a/samples/client/petstore/c/api/UserAPI.h
+++ b/samples/client/petstore/c/api/UserAPI.h
@ -13,19 +13,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
@ -33,19 +33,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
@ -59,7 +59,7 @@ UserAPI_logoutUser(apiClient_t *apiClient);
 // This can test integer and boolean query parameters in API.
 //
 void
-UserAPI_testIntAndBool(apiClient_t *apiClient, int keep , int keepDay );
+UserAPI_testIntAndBool(apiClient_t *apiClient, int *keep, int *keepDay);


 // Updated user
@ -67,6 +67,6 @@ UserAPI_testIntAndBool(apiClient_t *apiClient, int keep , int keepDay );
 // 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);


--- a/samples/client/petstore/c/docs/UserAPI.md
+++ b/samples/client/petstore/c/docs/UserAPI.md
@ -231,8 +231,8 @@ void UserAPI_testIntAndBool(apiClient_t *apiClient, int keep, int keepDay);
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
 **apiClient** | **apiClient_t \*** | context containing the client configuration |
-**keep** | **int** | Whether to keep user data after deletion | [optional] 
-**keepDay** | **int** | how many days user data is kept after deletion | [optional] 
+**keep** | **int \*** | Whether to keep user data after deletion | [optional] 
+**keepDay** | **int \*** | how many days user data is kept after deletion | [optional] 

 ### Return type