diff options
| -rw-r--r-- | catalog.c | 2 | ||||
| -rw-r--r-- | icclient/product.h | 3 | ||||
| -rw-r--r-- | ord.c | 2 | ||||
| -rw-r--r-- | product.c | 15 |
4 files changed, 3 insertions, 19 deletions
@@ -41,7 +41,7 @@ size_t icclient_catalog_results(void *data, size_t size, size_t nmemb, void *use for (size_t i = 0; i < length; i++) { catalog->products[i] = malloc(sizeof(struct icclient_product)); struct icclient_product *product = catalog->products[i]; - icclient_product_init(product); + memset(product, '\0', sizeof(struct icclient_product)); json_object *object = json_object_array_get_idx(products, i); struct json_object_iterator iterator = json_object_iter_begin(object); struct json_object_iterator iterator_end = json_object_iter_end(object); diff --git a/icclient/product.h b/icclient/product.h index c3e91bd..8fa6bc3 100644 --- a/icclient/product.h +++ b/icclient/product.h @@ -23,11 +23,10 @@ struct icclient_product { extern "C" { #endif - void icclient_product_init(struct icclient_product *product); void icclient_product_free(struct icclient_product *product); #ifdef __cplusplus } #endif -#endif // ICCLIENT_PRODUCT_H +#endif @@ -36,7 +36,7 @@ void icclient_ord_order(const char *sku, const icclient_catalog *catalog, icclient_product **products = ((icclient_catalog *)catalog)->products; qsort(products, catalog->length, sizeof(icclient_product *), prodcmp); icclient_product *key_product = malloc(sizeof(icclient_product)); - icclient_product_init(key_product); + memset(key_product, '\0', sizeof(icclient_product)); key_product->sku = malloc(strlen(sku) + 1); strcpy(key_product->sku, sku); icclient_product *product = *(icclient_product **)bsearch(&key_product @@ -1,20 +1,6 @@ #include <stdlib.h> #include "icclient/product.h" -void icclient_product_init(struct icclient_product *product) -{ - product->sku = NULL; - product->description = NULL; - product->comment = NULL; - product->thumb = NULL; - product->image = NULL; - product->price = .0; - product->prod_group = NULL; - product->weight = .0; - product->author = NULL; - product->crosssell = NULL; -} - void icclient_product_free(struct icclient_product *product) { if (product->crosssell) @@ -34,5 +20,4 @@ void icclient_product_free(struct icclient_product *product) free(product->description); free(product->sku); free(product); - product = NULL; } |