Skip to content

Commit 43f59ba

Browse files
imaamiimaami
authored
[C][Client] Remove broken intToStr() macro, update samples (OpenAPITools#20383)
Note: this does not fix anything else; for example all numerical types, including float and double, are still incorrectly cast to to long int before string conversion.
1 parent 46260ee commit 43f59ba

File tree

8 files changed

+16
-56
lines changed

8 files changed

+16
-56
lines changed

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149
{{#operations}}
1510
{{#operation}}
@@ -140,7 +135,7 @@ end:
140135
snprintf(localVarToReplace_{{paramName}}, sizeOfPathParams_{{paramName}}, "{%s}", "{{baseName}}");
141136

142137
char localVarBuff_{{paramName}}[256];
143-
intToStr(localVarBuff_{{paramName}}, {{paramName}});
138+
snprintf(localVarBuff_{{paramName}}, sizeof localVarBuff_{{paramName}}, "%ld", (long){{paramName}});
144139

145140
localVarPath = strReplace(localVarPath, localVarToReplace_{{paramName}}, localVarBuff_{{paramName}});
146141

@@ -153,7 +148,7 @@ end:
153148
snprintf(localVarToReplace_{{paramName}}, sizeOfPathParams_{{paramName}}, "{%s}", "{{baseName}}");
154149

155150
char localVarBuff_{{paramName}}[256];
156-
intToStr(localVarBuff_{{paramName}}, *{{paramName}});
151+
snprintf(localVarBuff_{{paramName}}, sizeof localVarBuff_{{paramName}}, "%ld", (long)*{{paramName}});
157152

158153
localVarPath = strReplace(localVarPath, localVarToReplace_{{paramName}}, localVarBuff_{{paramName}});
159154

@@ -166,7 +161,7 @@ end:
166161
snprintf(localVarToReplace_{{paramName}}, sizeOfPathParams_{{paramName}}, "{%s}", "{{baseName}}");
167162

168163
char localVarBuff_{{paramName}}[256];
169-
intToStr(localVarBuff_{{paramName}}, {{paramName}});
164+
snprintf(localVarBuff_{{paramName}}, sizeof localVarBuff_{{paramName}}, "%ld", (long){{paramName}});
170165

171166
localVarPath = strReplace(localVarPath, localVarToReplace_{{paramName}}, localVarBuff_{{paramName}});
172167

@@ -179,7 +174,7 @@ end:
179174
snprintf(localVarToReplace_{{paramName}}, sizeOfPathParams_{{paramName}}, "{%s}", "{{baseName}}");
180175

181176
char localVarBuff_{{paramName}}[256];
182-
intToStr(localVarBuff_{{paramName}}, {{paramName}});
177+
snprintf(localVarBuff_{{paramName}}, sizeof localVarBuff_{{paramName}}, "%ld", {{paramName}});
183178

184179
localVarPath = strReplace(localVarPath, localVarToReplace_{{paramName}}, localVarBuff_{{paramName}});
185180

‎samples/client/others/c/bearerAuth/api/DefaultAPI.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149

1510
// Returns private information.

‎samples/client/petstore/c-useJsonUnformatted/api/PetAPI.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149
// Functions for enum STATUS for PetAPI_findPetsByStatus
1510

@@ -159,7 +154,7 @@ PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key)
159154
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
160155

161156
char localVarBuff_petId[256];
162-
intToStr(localVarBuff_petId, petId);
157+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
163158

164159
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
165160

@@ -501,7 +496,7 @@ PetAPI_getPetById(apiClient_t *apiClient, long petId)
501496
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
502497

503498
char localVarBuff_petId[256];
504-
intToStr(localVarBuff_petId, petId);
499+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
505500

506501
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
507502

@@ -658,7 +653,7 @@ PetAPI_isPetAvailable(apiClient_t *apiClient, long petId)
658653
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
659654

660655
char localVarBuff_petId[256];
661-
intToStr(localVarBuff_petId, petId);
656+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
662657

663658
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
664659

@@ -965,7 +960,7 @@ PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name, char *s
965960
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
966961

967962
char localVarBuff_petId[256];
968-
intToStr(localVarBuff_petId, petId);
963+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
969964

970965
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
971966

@@ -1078,7 +1073,7 @@ PetAPI_uploadFile(apiClient_t *apiClient, long petId, char *additionalMetadata,
10781073
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
10791074

10801075
char localVarBuff_petId[256];
1081-
intToStr(localVarBuff_petId, petId);
1076+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
10821077

10831078
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
10841079

‎samples/client/petstore/c-useJsonUnformatted/api/StoreAPI.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149
// Functions for enum RATING for StoreAPI_sendRating
1510

@@ -245,7 +240,7 @@ StoreAPI_getOrderById(apiClient_t *apiClient, long orderId)
245240
snprintf(localVarToReplace_orderId, sizeOfPathParams_orderId, "{%s}", "orderId");
246241

247242
char localVarBuff_orderId[256];
248-
intToStr(localVarBuff_orderId, orderId);
243+
snprintf(localVarBuff_orderId, sizeof localVarBuff_orderId, "%ld", orderId);
249244

250245
localVarPath = strReplace(localVarPath, localVarToReplace_orderId, localVarBuff_orderId);
251246

‎samples/client/petstore/c-useJsonUnformatted/api/UserAPI.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149

1510
// Create user

‎samples/client/petstore/c/api/PetAPI.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149
// Functions for enum STATUS for PetAPI_findPetsByStatus
1510

@@ -159,7 +154,7 @@ PetAPI_deletePet(apiClient_t *apiClient, long petId, char *api_key)
159154
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
160155

161156
char localVarBuff_petId[256];
162-
intToStr(localVarBuff_petId, petId);
157+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
163158

164159
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
165160

@@ -501,7 +496,7 @@ PetAPI_getPetById(apiClient_t *apiClient, long petId)
501496
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
502497

503498
char localVarBuff_petId[256];
504-
intToStr(localVarBuff_petId, petId);
499+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
505500

506501
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
507502

@@ -658,7 +653,7 @@ PetAPI_isPetAvailable(apiClient_t *apiClient, long petId)
658653
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
659654

660655
char localVarBuff_petId[256];
661-
intToStr(localVarBuff_petId, petId);
656+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
662657

663658
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
664659

@@ -965,7 +960,7 @@ PetAPI_updatePetWithForm(apiClient_t *apiClient, long petId, char *name, char *s
965960
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
966961

967962
char localVarBuff_petId[256];
968-
intToStr(localVarBuff_petId, petId);
963+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
969964

970965
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
971966

@@ -1078,7 +1073,7 @@ PetAPI_uploadFile(apiClient_t *apiClient, long petId, char *additionalMetadata,
10781073
snprintf(localVarToReplace_petId, sizeOfPathParams_petId, "{%s}", "petId");
10791074

10801075
char localVarBuff_petId[256];
1081-
intToStr(localVarBuff_petId, petId);
1076+
snprintf(localVarBuff_petId, sizeof localVarBuff_petId, "%ld", petId);
10821077

10831078
localVarPath = strReplace(localVarPath, localVarToReplace_petId, localVarBuff_petId);
10841079

‎samples/client/petstore/c/api/StoreAPI.c‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149
// Functions for enum RATING for StoreAPI_sendRating
1510

@@ -245,7 +240,7 @@ StoreAPI_getOrderById(apiClient_t *apiClient, long orderId)
245240
snprintf(localVarToReplace_orderId, sizeOfPathParams_orderId, "{%s}", "orderId");
246241

247242
char localVarBuff_orderId[256];
248-
intToStr(localVarBuff_orderId, orderId);
243+
snprintf(localVarBuff_orderId, sizeof localVarBuff_orderId, "%ld", orderId);
249244

250245
localVarPath = strReplace(localVarPath, localVarToReplace_orderId, localVarBuff_orderId);
251246

‎samples/client/petstore/c/api/UserAPI.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
#define MAX_NUMBER_LENGTH 16
77
#define MAX_BUFFER_LENGTH 4096
8-
#define intToStr(dst, src) \
9-
do {\
10-
char dst[256];\
11-
snprintf(dst, 256, "%ld", (long int)(src));\
12-
}while(0)
138

149

1510
// Create user

0 commit comments

Comments
 (0)