From 733a3e7e295b2f1cea55af130903c15377ed75e6 Mon Sep 17 00:00:00 2001 From: Hemant Zope Date: Fri, 5 Oct 2018 10:33:56 +0200 Subject: [PATCH 1/2] fixed enum function declaration in model headers --- .../src/main/resources/C-libcurl/model-header.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache index a79647aa43be..d514f24c064a 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache @@ -31,9 +31,9 @@ typedef enum { {{#enumVars}} {{{value}}}{{^-last}},{{/-last}}{{/enumVars}} } {{ {{#vars}} {{#isEnum}} -char* {{baseName}}_ToString({{baseName}}_e {{baseName}}); +char* {{baseName}}{{classname}}_ToString({{baseName}}_e {{baseName}}); -{{baseName}}_e {{baseName}}FromString(char* {{baseName}}); +{{baseName}}_e {{baseName}}{{classname}}_FromString(char* {{baseName}}); {{/isEnum}} {{/vars}} @@ -127,7 +127,7 @@ typedef struct {{classname}}_t { {{/isContainer}} {{/vars}} ); - + void {{classname}}_free({{classname}}_t *{{classname}}); {{classname}}_t *{{classname}}_parseFromJSON(char *jsonString); @@ -137,4 +137,4 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}); #endif /* _{{classname}}_H_ */ -{{/model}}{{/models}} \ No newline at end of file +{{/model}}{{/models}} From cdf26342a8a03c649cfd22a37ee10404c19a4a76 Mon Sep 17 00:00:00 2001 From: Hemant Zope Date: Fri, 5 Oct 2018 10:34:53 +0200 Subject: [PATCH 2/2] fixed enum declaration in header files for sample --- samples/client/petstore/c/model/order.h | 4 ++-- samples/client/petstore/c/model/pet.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/client/petstore/c/model/order.h b/samples/client/petstore/c/model/order.h index caca5fa7d380..e49144e920fd 100644 --- a/samples/client/petstore/c/model/order.h +++ b/samples/client/petstore/c/model/order.h @@ -16,9 +16,9 @@ typedef int bool; typedef enum { placed, approved, delivered } status_e; -char *status_ToString(status_e status); +char *statusorder_ToString(status_e status); -status_e statusFromString(char *status); +status_e statusorder_FromString(char *status); typedef struct order_t { long id; // numeric diff --git a/samples/client/petstore/c/model/pet.h b/samples/client/petstore/c/model/pet.h index 3a628c18768a..28b3c8956232 100644 --- a/samples/client/petstore/c/model/pet.h +++ b/samples/client/petstore/c/model/pet.h @@ -16,9 +16,9 @@ typedef enum { available, pending, sold } status_e; -char *status_ToString(status_e status); +char *statuspet_ToString(status_e status); -status_e statusFromString(char *status); +status_e statuspet_FromString(char *status); typedef struct pet_t { long id; // numeric