From ee87c46227c838961250bb8d50edca57ac154462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sat, 12 Jun 2021 20:07:47 +0800 Subject: Further simplify icclient_results function --- icclient/catalog.h | 5 ----- icclient/client.h | 56 ++++++++++++++++++++++++++---------------------------- 2 files changed, 27 insertions(+), 34 deletions(-) (limited to 'icclient') diff --git a/icclient/catalog.h b/icclient/catalog.h index 9d15a1a..677d691 100644 --- a/icclient/catalog.h +++ b/icclient/catalog.h @@ -6,11 +6,6 @@ struct icclient_catalog { struct icclient_product *products[]; }; -struct icclient_catalog_callback { - struct icclient_catalog **catalog; - void (*callback)(struct icclient_catalog *); -}; - #ifdef __cplusplus extern "C" { #endif diff --git a/icclient/client.h b/icclient/client.h index 5e0f01b..ae2a766 100644 --- a/icclient/client.h +++ b/icclient/client.h @@ -1,7 +1,7 @@ #ifndef ICCLIENT_CLIENT_H #define ICCLIENT_CLIENT_H -#define icclient_allproducts(callback, catalog, handler) icclient_results("All-Products", callback, catalog, handler) +#define icclient_allproducts(callback, handler) icclient_results("All-Products", callback, handler) struct icclient_product; struct icclient_catalog; @@ -10,34 +10,32 @@ struct icclient_catalog; extern "C" { #endif - /*! - * \brief A function that needs to be run first. - * \param url Server root URL. - * \param certificate Path to the CA certificate file. - * \return True if the initialisation works, false otherwise. - */ - bool icclient_init(const char *url, const char *certificate); - - /*! - * \brief For fetching data about products that belong a specific group. - * \param prod_group The name of the product group. - * \param callback A pointer to the function that needs to be called after the catalog is ready. - * \param catalog A pointer to pointer to the catalog to store the data. - * \param handler A pointer to the function when a custom handler is needed to arrange the data into the catalog. - */ - void icclient_results(const char *prod_group, void (*callback)(struct icclient_catalog *), - struct icclient_catalog **catalog, icclient_handler handler); - - /*! - * \brief For fetching data about a specific product. - * \param sku The SKU of the product. - * \param handler A pointer to a cURL write function callback. - * \param productptr A pointer to pointer to the product to store the data. - */ - void icclient_flypage(const char *sku, icclient_handler handler, struct icclient_product **productptr); - - void icclient_page(const char *path, icclient_handler handler, void **dataptr); - void icclient_cleanup(); +/*! + * \brief A function that needs to be run first. + * \param url Server root URL. + * \param certificate Path to the CA certificate file. + * \return True if the initialisation works, false otherwise. + */ +bool icclient_init(const char *url, const char *certificate); + +/*! + * \brief For fetching data about products that belong a specific group. + * \param prod_group The name of the product group. + * \param callback A pointer to the function that needs to be called after the catalog is ready. + * \param handler A pointer to the function when a custom handler is needed to arrange the data into the catalog. + */ +void icclient_results(const char *prod_group, void (*callback)(struct icclient_catalog *), icclient_handler handler); + +/*! + * \brief For fetching data about a specific product. + * \param sku The SKU of the product. + * \param handler A pointer to a cURL write function callback. + * \param productptr A pointer to pointer to the product to store the data. + */ +void icclient_flypage(const char *sku, icclient_handler handler, struct icclient_product **productptr); + +void icclient_page(const char *path, icclient_handler handler, void **dataptr); +void icclient_cleanup(); #ifdef __cplusplus } -- cgit v1.2.3