From 5c5f791fd820fac1a59fb7064173ec2d2704945b Mon Sep 17 00:00:00 2001 From: bookerdj <131356154+bookerdj@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:23:35 +0000 Subject: [PATCH] [C][Client] Fix default enum value being -1 --- .../src/main/resources/C-libcurl/model-body.mustache | 4 ++-- samples/client/petstore/c/model/order.c | 2 +- samples/client/petstore/c/model/pet.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 98bbfd37998f..e8f0841d6095 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 @@ -845,7 +845,7 @@ fail: {{^isPrimitiveType}} {{#isModel}} {{#isEnum}} - {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim_enum{{^required}} : -1{{/required}}{{^-last}},{{/-last}} + {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim_enum{{^required}} : {{projectName}}_{{classVarName}}_{{enumName}}_NULL{{/required}}{{^-last}},{{/-last}} {{/isEnum}} {{^isEnum}} {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim{{^required}} : NULL{{/required}}{{^-last}},{{/-last}} @@ -875,7 +875,7 @@ fail: {{/isBoolean}} {{#isEnum}} {{#isString}} - {{^required}}{{{name}}} ? {{/required}}{{name}}Variable{{^required}} : -1{{/required}}{{^-last}},{{/-last}} + {{^required}}{{{name}}} ? {{/required}}{{name}}Variable{{^required}} : {{projectName}}_{{classVarName}}_{{enumName}}_NULL{{/required}}{{^-last}},{{/-last}} {{/isString}} {{/isEnum}} {{^isEnum}} diff --git a/samples/client/petstore/c/model/order.c b/samples/client/petstore/c/model/order.c index 734ff110252c..b18413bf6e7b 100644 --- a/samples/client/petstore/c/model/order.c +++ b/samples/client/petstore/c/model/order.c @@ -182,7 +182,7 @@ order_t *order_parseFromJSON(cJSON *orderJSON){ pet_id ? pet_id->valuedouble : 0, quantity ? quantity->valuedouble : 0, ship_date && !cJSON_IsNull(ship_date) ? strdup(ship_date->valuestring) : NULL, - status ? statusVariable : -1, + status ? statusVariable : openapi_petstore_order_STATUS_NULL, complete ? complete->valueint : 0 ); diff --git a/samples/client/petstore/c/model/pet.c b/samples/client/petstore/c/model/pet.c index 7ca8b7a422a2..b84be2a3511b 100644 --- a/samples/client/petstore/c/model/pet.c +++ b/samples/client/petstore/c/model/pet.c @@ -263,7 +263,7 @@ pet_t *pet_parseFromJSON(cJSON *petJSON){ strdup(name->valuestring), photo_urlsList, tags ? tagsList : NULL, - status ? statusVariable : -1 + status ? statusVariable : openapi_petstore_pet_STATUS_NULL ); return pet_local_var;