[c] regenerate petstore and fix manual unit-tests

Author: hirishh

samples/client/petstore/c/model/api_response.c

@@ -6,15 +6,23 @@
 
 
 static api_response_t *api_response_create_internal(
-    int code,
+    int *code,
     char *type,
     char *message
     ) {
     api_response_t *api_response_local_var = malloc(sizeof(api_response_t));
     if (!api_response_local_var) {
         return NULL;
     }
-    api_response_local_var->code = code;
+    memset(api_response_local_var, 0, sizeof(api_response_t));
+    if (code) {
+        api_response_local_var->code = malloc(sizeof(int));
+        if (!api_response_local_var->code) {
+            api_response_free(api_response_local_var);
+            return NULL;
+        }
+        *api_response_local_var->code = *code;
+    }
     api_response_local_var->type = type;
     api_response_local_var->message = message;
 
@@ -23,7 +31,7 @@ static api_response_t *api_response_create_internal(
 }
 
 __attribute__((deprecated)) api_response_t *api_response_create(
-    int code,
+    int *code,
     char *type,
     char *message
     ) {
@@ -43,6 +51,10 @@ void api_response_free(api_response_t *api_response) {
         return ;
     }
     listEntry_t *listEntry;
+    if (api_response->code) {
+        free(api_response->code);
+        api_response->code = NULL;
+    }
     if (api_response->type) {
         free(api_response->type);
         api_response->type = NULL;
@@ -59,7 +71,7 @@ cJSON *api_response_convertToJSON(api_response_t *api_response) {
 
     // api_response->code
     if(api_response->code) {
-    if(cJSON_AddNumberToObject(item, "code", api_response->code) == NULL) {
+    if(cJSON_AddNumberToObject(item, "code", *api_response->code) == NULL) {
     goto fail; //Numeric
     }
     }
@@ -92,6 +104,9 @@ api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON){
 
     api_response_t *api_response_local_var = NULL;
 
+    // define the local variable for api_response->code
+    int *code_local_var = NULL;
+
     // api_response->code
     cJSON *code = cJSON_GetObjectItemCaseSensitive(api_responseJSON, "code");
     if (cJSON_IsNull(code)) {
@@ -102,6 +117,12 @@ api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON){
     {
     goto end; //Numeric
     }
+    code_local_var = malloc(sizeof(int));
+    if(!code_local_var)
+    {
+        goto end;
+    }
+    *code_local_var = code->valuedouble;
     }
 
     // api_response->type
@@ -130,13 +151,17 @@ api_response_t *api_response_parseFromJSON(cJSON *api_responseJSON){
 
 
     api_response_local_var = api_response_create_internal (
-        code ? code->valuedouble : 0,
+        code_local_var,
         type && !cJSON_IsNull(type) ? strdup(type->valuestring) : NULL,
         message && !cJSON_IsNull(message) ? strdup(message->valuestring) : NULL
         );
 
     return api_response_local_var;
 end:
+    if (code_local_var) {
+        free(code_local_var);
+        code_local_var = NULL;
+    }
     return NULL;
 
 }

samples/client/petstore/c/model/api_response.h

@@ -19,15 +19,15 @@ typedef struct api_response_t api_response_t;
 
 
 typedef struct api_response_t {
-    int code; //numeric
+    int *code; //numeric
     char *type; // string
     char *message; // string
 
     int _library_owned; // Is the library responsible for freeing this object?
 } api_response_t;
 
 __attribute__((deprecated)) api_response_t *api_response_create(
-    int code,
+    int *code,
     char *type,
     char *message
 );

samples/client/petstore/c/model/category.c

@@ -6,22 +6,30 @@
 
 
 static category_t *category_create_internal(
-    long id,
+    long *id,
     char *name
     ) {
     category_t *category_local_var = malloc(sizeof(category_t));
     if (!category_local_var) {
         return NULL;
     }
-    category_local_var->id = id;
+    memset(category_local_var, 0, sizeof(category_t));
+    if (id) {
+        category_local_var->id = malloc(sizeof(long));
+        if (!category_local_var->id) {
+            category_free(category_local_var);
+            return NULL;
+        }
+        *category_local_var->id = *id;
+    }
     category_local_var->name = name;
 
     category_local_var->_library_owned = 1;
     return category_local_var;
 }
 
 __attribute__((deprecated)) category_t *category_create(
-    long id,
+    long *id,
     char *name
     ) {
     return category_create_internal (
@@ -39,6 +47,10 @@ void category_free(category_t *category) {
         return ;
     }
     listEntry_t *listEntry;
+    if (category->id) {
+        free(category->id);
+        category->id = NULL;
+    }
     if (category->name) {
         free(category->name);
         category->name = NULL;
@@ -51,7 +63,7 @@ cJSON *category_convertToJSON(category_t *category) {
 
     // category->id
     if(category->id) {
-    if(cJSON_AddNumberToObject(item, "id", category->id) == NULL) {
+    if(cJSON_AddNumberToObject(item, "id", *category->id) == NULL) {
     goto fail; //Numeric
     }
     }
@@ -76,6 +88,9 @@ category_t *category_parseFromJSON(cJSON *categoryJSON){
 
     category_t *category_local_var = NULL;
 
+    // define the local variable for category->id
+    long *id_local_var = NULL;
+
     // category->id
     cJSON *id = cJSON_GetObjectItemCaseSensitive(categoryJSON, "id");
     if (cJSON_IsNull(id)) {
@@ -86,6 +101,12 @@ category_t *category_parseFromJSON(cJSON *categoryJSON){
     {
     goto end; //Numeric
     }
+    id_local_var = malloc(sizeof(long));
+    if(!id_local_var)
+    {
+        goto end;
+    }
+    *id_local_var = id->valuedouble;
     }
 
     // category->name
@@ -102,12 +123,16 @@ category_t *category_parseFromJSON(cJSON *categoryJSON){
 
 
     category_local_var = category_create_internal (
-        id ? id->valuedouble : 0,
+        id_local_var,
         name && !cJSON_IsNull(name) ? strdup(name->valuestring) : NULL
         );
 
     return category_local_var;
 end:
+    if (id_local_var) {
+        free(id_local_var);
+        id_local_var = NULL;
+    }
     return NULL;
 
 }

samples/client/petstore/c/model/category.h

@@ -19,14 +19,14 @@ typedef struct category_t category_t;
 
 
 typedef struct category_t {
-    long id; //numeric
+    long *id; //numeric
     char *name; // string
 
     int _library_owned; // Is the library responsible for freeing this object?
 } category_t;
 
 __attribute__((deprecated)) category_t *category_create(
-    long id,
+    long *id,
     char *name
 );
 

samples/client/petstore/c/model/mapped_model.c

@@ -6,22 +6,30 @@
 
 
 static MappedModel_t *MappedModel_create_internal(
-    int another_property,
+    int *another_property,
     char *uuid_property
     ) {
     MappedModel_t *MappedModel_local_var = malloc(sizeof(MappedModel_t));
     if (!MappedModel_local_var) {
         return NULL;
     }
-    MappedModel_local_var->another_property = another_property;
+    memset(MappedModel_local_var, 0, sizeof(MappedModel_t));
+    if (another_property) {
+        MappedModel_local_var->another_property = malloc(sizeof(int));
+        if (!MappedModel_local_var->another_property) {
+            MappedModel_free(MappedModel_local_var);
+            return NULL;
+        }
+        *MappedModel_local_var->another_property = *another_property;
+    }
     MappedModel_local_var->uuid_property = uuid_property;
 
     MappedModel_local_var->_library_owned = 1;
     return MappedModel_local_var;
 }
 
 __attribute__((deprecated)) MappedModel_t *MappedModel_create(
-    int another_property,
+    int *another_property,
     char *uuid_property
     ) {
     return MappedModel_create_internal (
@@ -39,6 +47,10 @@ void MappedModel_free(MappedModel_t *MappedModel) {
         return ;
     }
     listEntry_t *listEntry;
+    if (MappedModel->another_property) {
+        free(MappedModel->another_property);
+        MappedModel->another_property = NULL;
+    }
     if (MappedModel->uuid_property) {
         free(MappedModel->uuid_property);
         MappedModel->uuid_property = NULL;
@@ -51,7 +63,7 @@ cJSON *MappedModel_convertToJSON(MappedModel_t *MappedModel) {
 
     // MappedModel->another_property
     if(MappedModel->another_property) {
-    if(cJSON_AddNumberToObject(item, "another_property", MappedModel->another_property) == NULL) {
+    if(cJSON_AddNumberToObject(item, "another_property", *MappedModel->another_property) == NULL) {
     goto fail; //Numeric
     }
     }
@@ -76,6 +88,9 @@ MappedModel_t *MappedModel_parseFromJSON(cJSON *MappedModelJSON){
 
     MappedModel_t *MappedModel_local_var = NULL;
 
+    // define the local variable for MappedModel->another_property
+    int *another_property_local_var = NULL;
+
     // MappedModel->another_property
     cJSON *another_property = cJSON_GetObjectItemCaseSensitive(MappedModelJSON, "another_property");
     if (cJSON_IsNull(another_property)) {
@@ -86,6 +101,12 @@ MappedModel_t *MappedModel_parseFromJSON(cJSON *MappedModelJSON){
     {
     goto end; //Numeric
     }
+    another_property_local_var = malloc(sizeof(int));
+    if(!another_property_local_var)
+    {
+        goto end;
+    }
+    *another_property_local_var = another_property->valuedouble;
     }
 
     // MappedModel->uuid_property
@@ -102,12 +123,16 @@ MappedModel_t *MappedModel_parseFromJSON(cJSON *MappedModelJSON){
 
 
     MappedModel_local_var = MappedModel_create_internal (
-        another_property ? another_property->valuedouble : 0,
+        another_property_local_var,
         uuid_property && !cJSON_IsNull(uuid_property) ? strdup(uuid_property->valuestring) : NULL
         );
 
     return MappedModel_local_var;
 end:
+    if (another_property_local_var) {
+        free(another_property_local_var);
+        another_property_local_var = NULL;
+    }
     return NULL;
 
 }

samples/client/petstore/c/model/mapped_model.h

@@ -19,14 +19,14 @@ typedef struct MappedModel_t MappedModel_t;
 
 
 typedef struct MappedModel_t {
-    int another_property; //numeric
+    int *another_property; //numeric
     char *uuid_property; // string
 
     int _library_owned; // Is the library responsible for freeing this object?
 } MappedModel_t;
 
 __attribute__((deprecated)) MappedModel_t *MappedModel_create(
-    int another_property,
+    int *another_property,
     char *uuid_property
 );
 

samples/client/petstore/c/model/model_with_set_propertes.c

@@ -13,6 +13,7 @@ static model_with_set_propertes_t *model_with_set_propertes_create_internal(
     if (!model_with_set_propertes_local_var) {
         return NULL;
     }
+    memset(model_with_set_propertes_local_var, 0, sizeof(model_with_set_propertes_t));
     model_with_set_propertes_local_var->tag_set = tag_set;
     model_with_set_propertes_local_var->string_set = string_set;