From 5ba67c8c951b993628b024d9c8e819a60da9b557 Mon Sep 17 00:00:00 2001 From: Hui Yu Date: Thu, 19 Dec 2019 16:29:56 +0800 Subject: [PATCH] [C-libcurl] Escape parameter name of function when it is the C keyword. (#4838) --- .../openapitools/codegen/languages/CLibcurlClientCodegen.java | 2 +- .../src/main/resources/C-libcurl/api-body.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java index cf290dc0de4..bd14a843e64 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java @@ -337,7 +337,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf @Override public String toParamName(String name) { // should be the same as variable name - if (name.matches("^\\d.*")) { + if (isReservedWord(name) || name.matches("^\\d.*")) { name = escapeReservedWord(name); } name = name.replaceAll("-","_"); diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache index 2ef5d0eeec1..56c719f1e08 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache @@ -141,7 +141,7 @@ list_addElement(localVarQueryParameters,{{paramName}}); {{/isListContainer}} {{^isListContainer}} - keyQuery_{{{paramName}}} = strdup("{{{paramName}}}"); + keyQuery_{{{paramName}}} = strdup("{{{baseName}}}"); valueQuery_{{{paramName}}} = {{#isString}}{{^isEnum}}strdup({{/isEnum}}{{/isString}}({{{paramName}}}){{#isString}}{{^isEnum}}){{/isEnum}}{{/isString}}; keyPairQuery_{{paramName}} = keyValuePair_create(keyQuery_{{{paramName}}}, {{#isEnum}}(void *){{/isEnum}}{{^isString}}&{{/isString}}valueQuery_{{{paramName}}}); list_addElement(localVarQueryParameters,keyPairQuery_{{paramName}});