Skip to content

[C] Fixed enum function declaration #1178

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 2 commits into from
Oct 6, 2018
Merged

[C] Fixed enum function declaration #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733a3e7
fixed enum function declaration in model headers
zhemant Oct 5, 2018
cdf2634
fixed enum declaration in header files for sample
zhemant Oct 5, 2018
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
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down Expand Up @@ -127,7 +127,7 @@ typedef struct {{classname}}_t {
{{/isContainer}}
{{/vars}}
);

void {{classname}}_free({{classname}}_t *{{classname}});

{{classname}}_t *{{classname}}_parseFromJSON(char *jsonString);
Expand All @@ -137,4 +137,4 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}});


#endif /* _{{classname}}_H_ */
{{/model}}{{/models}}
{{/model}}{{/models}}
4 changes: 2 additions & 2 deletions samples/client/petstore/c/model/order.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/c/model/pet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down