Skip to content

Commit 34c3f8c

Browse files
bookerdjDan Booker
and
Dan Booker
authored
[C][Client] Fix enum function names not matching headers in the model template (OpenAPITools#17512)
- fixes OpenAPITools#17510 Co-authored-by: Dan Booker <[email protected]>
1 parent 3d91fa8 commit 34c3f8c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ end:
7777
{{^isContainer}}
7878
{{^isModel}}
7979
{{#isEnum}}
80-
char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
80+
char* {{classname}}_{{name}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
8181
char* {{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
8282
return {{name}}Array[{{name}}];
8383
}
8484

85-
{{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{classname}}_FromString(char* {{name}}){
85+
{{projectName}}_{{classVarName}}_{{enumName}}_e {{classname}}_{{name}}_FromString(char* {{name}}){
8686
int stringToReturn = 0;
8787
char *{{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
8888
size_t sizeofArray = sizeof({{name}}Array) / sizeof({{name}}Array[0]);
@@ -101,12 +101,12 @@ char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName
101101
{{#items}}
102102
{{^isModel}}
103103
{{#isEnum}}
104-
char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
104+
char* {{classname}}_{{name}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
105105
char *{{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
106106
return {{name}}Array[{{name}} - 1];
107107
}
108108

109-
{{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{classname}}_FromString(char* {{name}}) {
109+
{{projectName}}_{{classVarName}}_{{enumName}}_e {{classname}}_{{name}}_FromString(char* {{name}}) {
110110
int stringToReturn = 0;
111111
char *{{name}}Array[] = { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
112112
size_t sizeofArray = sizeof({{name}}Array) / sizeof({{name}}Array[0]);
@@ -629,7 +629,7 @@ fail:
629629
{
630630
goto end; //Enum
631631
}
632-
{{name}}Variable = {{name}}{{classname}}_FromString({{{name}}}->valuestring);
632+
{{name}}Variable = {{classname}}_{{name}}_FromString({{{name}}}->valuestring);
633633
{{/isString}}
634634
{{/isEnum}}
635635
{{^isEnum}}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
#include "order.h"
55

66

7-
char* statusorder_ToString(openapi_petstore_order_STATUS_e status) {
7+
char* order_status_ToString(openapi_petstore_order_STATUS_e status) {
88
char* statusArray[] = { "NULL", "placed", "approved", "delivered" };
99
return statusArray[status];
1010
}
1111

12-
openapi_petstore_order_STATUS_e statusorder_FromString(char* status){
12+
openapi_petstore_order_STATUS_e order_status_FromString(char* status){
1313
int stringToReturn = 0;
1414
char *statusArray[] = { "NULL", "placed", "approved", "delivered" };
1515
size_t sizeofArray = sizeof(statusArray) / sizeof(statusArray[0]);
@@ -164,7 +164,7 @@ order_t *order_parseFromJSON(cJSON *orderJSON){
164164
{
165165
goto end; //Enum
166166
}
167-
statusVariable = statusorder_FromString(status->valuestring);
167+
statusVariable = order_status_FromString(status->valuestring);
168168
}
169169

170170
// order->complete

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
#include "pet.h"
55

66

7-
char* statuspet_ToString(openapi_petstore_pet_STATUS_e status) {
7+
char* pet_status_ToString(openapi_petstore_pet_STATUS_e status) {
88
char* statusArray[] = { "NULL", "available", "pending", "sold" };
99
return statusArray[status];
1010
}
1111

12-
openapi_petstore_pet_STATUS_e statuspet_FromString(char* status){
12+
openapi_petstore_pet_STATUS_e pet_status_FromString(char* status){
1313
int stringToReturn = 0;
1414
char *statusArray[] = { "NULL", "available", "pending", "sold" };
1515
size_t sizeofArray = sizeof(statusArray) / sizeof(statusArray[0]);
@@ -253,7 +253,7 @@ pet_t *pet_parseFromJSON(cJSON *petJSON){
253253
{
254254
goto end; //Enum
255255
}
256-
statusVariable = statuspet_FromString(status->valuestring);
256+
statusVariable = pet_status_FromString(status->valuestring);
257257
}
258258

259259

0 commit comments

Comments
 (0)