Skip to content

Commit 2653777

Browse files
authored
[C][Client] Fix default enum value being -1 (#18040)
1 parent 62d0e3a commit 2653777

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ fail:
845845
{{^isPrimitiveType}}
846846
{{#isModel}}
847847
{{#isEnum}}
848-
{{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim_enum{{^required}} : -1{{/required}}{{^-last}},{{/-last}}
848+
{{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim_enum{{^required}} : {{projectName}}_{{classVarName}}_{{enumName}}_NULL{{/required}}{{^-last}},{{/-last}}
849849
{{/isEnum}}
850850
{{^isEnum}}
851851
{{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim{{^required}} : NULL{{/required}}{{^-last}},{{/-last}}
@@ -875,7 +875,7 @@ fail:
875875
{{/isBoolean}}
876876
{{#isEnum}}
877877
{{#isString}}
878-
{{^required}}{{{name}}} ? {{/required}}{{name}}Variable{{^required}} : -1{{/required}}{{^-last}},{{/-last}}
878+
{{^required}}{{{name}}} ? {{/required}}{{name}}Variable{{^required}} : {{projectName}}_{{classVarName}}_{{enumName}}_NULL{{/required}}{{^-last}},{{/-last}}
879879
{{/isString}}
880880
{{/isEnum}}
881881
{{^isEnum}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ order_t *order_parseFromJSON(cJSON *orderJSON){
182182
pet_id ? pet_id->valuedouble : 0,
183183
quantity ? quantity->valuedouble : 0,
184184
ship_date && !cJSON_IsNull(ship_date) ? strdup(ship_date->valuestring) : NULL,
185-
status ? statusVariable : -1,
185+
status ? statusVariable : openapi_petstore_order_STATUS_NULL,
186186
complete ? complete->valueint : 0
187187
);
188188

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ pet_t *pet_parseFromJSON(cJSON *petJSON){
263263
strdup(name->valuestring),
264264
photo_urlsList,
265265
tags ? tagsList : NULL,
266-
status ? statusVariable : -1
266+
status ? statusVariable : openapi_petstore_pet_STATUS_NULL
267267
);
268268

269269
return pet_local_var;

0 commit comments

Comments
 (0)