Skip to content

[C][Client] Fix enum function names not matching headers in the model… #17512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Jan 5, 2024
Merged

[C][Client] Fix enum function names not matching headers in the model… #17512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ end:
{{^isContainer}}
{{^isModel}}
{{#isEnum}}
char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
char* {{classname}}_{{name}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
char* {{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
return {{name}}Array[{{name}}];
}

{{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{classname}}_FromString(char* {{name}}){
{{projectName}}_{{classVarName}}_{{enumName}}_e {{classname}}_{{name}}_FromString(char* {{name}}){
int stringToReturn = 0;
char *{{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
size_t sizeofArray = sizeof({{name}}Array) / sizeof({{name}}Array[0]);
Expand All @@ -101,12 +101,12 @@ char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName
{{#items}}
{{^isModel}}
{{#isEnum}}
char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
char* {{classname}}_{{name}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
char *{{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
return {{name}}Array[{{name}} - 1];
}

{{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{classname}}_FromString(char* {{name}}) {
{{projectName}}_{{classVarName}}_{{enumName}}_e {{classname}}_{{name}}_FromString(char* {{name}}) {
int stringToReturn = 0;
char *{{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
size_t sizeofArray = sizeof({{name}}Array) / sizeof({{name}}Array[0]);
Expand Down Expand Up @@ -629,7 +629,7 @@ fail:
{
goto end; //Enum
}
{{name}}Variable = {{name}}{{classname}}_FromString({{{name}}}->valuestring);
{{name}}Variable = {{classname}}_{{name}}_FromString({{{name}}}->valuestring);
{{/isString}}
{{/isEnum}}
{{^isEnum}}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/c/model/order.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#include "order.h"


char* statusorder_ToString(openapi_petstore_order_STATUS_e status) {
char* order_status_ToString(openapi_petstore_order_STATUS_e status) {
char* statusArray[] = { "NULL", "placed", "approved", "delivered" };
return statusArray[status];
}

openapi_petstore_order_STATUS_e statusorder_FromString(char* status){
openapi_petstore_order_STATUS_e order_status_FromString(char* status){
int stringToReturn = 0;
char *statusArray[] = { "NULL", "placed", "approved", "delivered" };
size_t sizeofArray = sizeof(statusArray) / sizeof(statusArray[0]);
Expand Down Expand Up @@ -164,7 +164,7 @@ order_t *order_parseFromJSON(cJSON *orderJSON){
{
goto end; //Enum
}
statusVariable = statusorder_FromString(status->valuestring);
statusVariable = order_status_FromString(status->valuestring);
}

// order->complete
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/c/model/pet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#include "pet.h"


char* statuspet_ToString(openapi_petstore_pet_STATUS_e status) {
char* pet_status_ToString(openapi_petstore_pet_STATUS_e status) {
char* statusArray[] = { "NULL", "available", "pending", "sold" };
return statusArray[status];
}

openapi_petstore_pet_STATUS_e statuspet_FromString(char* status){
openapi_petstore_pet_STATUS_e pet_status_FromString(char* status){
int stringToReturn = 0;
char *statusArray[] = { "NULL", "available", "pending", "sold" };
size_t sizeofArray = sizeof(statusArray) / sizeof(statusArray[0]);
Expand Down Expand Up @@ -253,7 +253,7 @@ pet_t *pet_parseFromJSON(cJSON *petJSON){
{
goto end; //Enum
}
statusVariable = statuspet_FromString(status->valuestring);
statusVariable = pet_status_FromString(status->valuestring);
}


Expand Down