Use g_try_malloc/g_free/g_strdup consistently.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 8f6bed0fb6c159719ddf414f7cf13a29a5d131dc..b582d97f3a5078c519dad88e14dcc9df80396cd2 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -35,7 +34,7 @@ static GSList *plugins;
  * options.
  */
 /* TODO: This shouldn't be a global. */
-struct sr_hwcap_option sr_hwcap_options[] = {
+SR_API struct sr_hwcap_option sr_hwcap_options[] = {
        {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"},
        {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"},
        {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"},
@@ -59,7 +58,7 @@ extern struct sr_device_plugin zeroplus_logic_cube_plugin_info;
 extern struct sr_device_plugin asix_sigma_plugin_info;
 #endif
 #ifdef HAVE_LA_CHRONOVU_LA8
-extern struct device_plugin chronovu_la8_plugin_info;
+extern SR_PRIV struct device_plugin chronovu_la8_plugin_info;
 #endif
 #ifdef HAVE_LA_LINK_MSO19
 extern struct sr_device_plugin link_mso19_plugin_info;
@@ -69,7 +68,7 @@ extern struct sr_device_plugin alsa_plugin_info;
 #endif
 
 /* TODO: No linked list needed, this can be a simple array. */
-int load_hwplugins(void)
+SR_PRIV int load_hwplugins(void)
 {
 #ifdef HAVE_LA_DEMO
        plugins = g_slist_append(plugins, (gpointer *)&demo_plugin_info);
@@ -101,12 +100,12 @@ int load_hwplugins(void)
        return SR_OK;
 }
 
-GSList *sr_list_hwplugins(void)
+SR_API GSList *sr_list_hwplugins(void)
 {
        return plugins;
 }
 
-int sr_init_hwplugins(struct sr_device_plugin *plugin)
+SR_API int sr_init_hwplugins(struct sr_device_plugin *plugin)
 {
        int num_devices, num_probes, i, j;
        int num_initialized_devices = 0;
@@ -136,7 +135,7 @@ int sr_init_hwplugins(struct sr_device_plugin *plugin)
        return num_initialized_devices;
 }
 
-void sr_cleanup_hwplugins(void)
+SR_API void sr_cleanup_hwplugins(void)
 {
        struct sr_device_plugin *plugin;
        GSList *l;
@@ -148,13 +147,15 @@ void sr_cleanup_hwplugins(void)
        }
 }
 
-struct sr_device_instance *sr_device_instance_new(int index, int status,
+SR_API struct sr_device_instance *sr_device_instance_new(int index, int status,
                const char *vendor, const char *model, const char *version)
 {
        struct sr_device_instance *sdi;
 
-       if (!(sdi = g_malloc(sizeof(struct sr_device_instance))))
+       if (!(sdi = g_try_malloc(sizeof(struct sr_device_instance)))) {
+               sr_err("hwplugin: %s: sdi malloc failed", __func__);
                return NULL;
+       }
 
        sdi->index = index;
        sdi->status = status;
@@ -163,13 +164,12 @@ struct sr_device_instance *sr_device_instance_new(int index, int status,
        sdi->model = model ? g_strdup(model) : NULL;
        sdi->version = version ? g_strdup(version) : NULL;
        sdi->priv = NULL;
-       sdi->usb = NULL;
 
        return sdi;
 }
 
-struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
-                                                 int device_index)
+SR_API struct sr_device_instance *sr_get_device_instance(
+               GSList *device_instances, int device_index)
 {
        struct sr_device_instance *sdi;
        GSList *l;
@@ -184,25 +184,9 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
        return NULL;
 }
 
-void sr_device_instance_free(struct sr_device_instance *sdi)
+SR_API void sr_device_instance_free(struct sr_device_instance *sdi)
 {
-       switch (sdi->instance_type) {
-#ifdef HAVE_LIBUSB_1_0
-       case SR_USB_INSTANCE:
-               sr_usb_device_instance_free(sdi->usb);
-               break;
-#endif
-       case SR_SERIAL_INSTANCE:
-               sr_serial_device_instance_free(sdi->serial);
-               break;
-       default:
-               /* No specific type, nothing extra to free. */
-               break;
-       }
-
-       if (sdi->priv)
-               g_free(sdi->priv);
-
+       g_free(sdi->priv);
        g_free(sdi->vendor);
        g_free(sdi->model);
        g_free(sdi->version);
@@ -211,13 +195,15 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
 
 #ifdef HAVE_LIBUSB_1_0
 
-struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
+SR_PRIV struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
                        uint8_t address, struct libusb_device_handle *hdl)
 {
        struct sr_usb_device_instance *udi;
 
-       if (!(udi = malloc(sizeof(struct sr_usb_device_instance))))
+       if (!(udi = g_try_malloc(sizeof(struct sr_usb_device_instance)))) {
+               sr_err("hwplugin: %s: udi malloc failed", __func__);
                return NULL;
+       }
 
        udi->bus = bus;
        udi->address = address;
@@ -226,7 +212,7 @@ struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
        return udi;
 }
 
-void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
+SR_PRIV void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
 {
        /* Avoid compiler warnings. */
        (void)usb;
@@ -236,26 +222,29 @@ void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
 
 #endif
 
-struct sr_serial_device_instance *sr_serial_device_instance_new(
+SR_PRIV struct sr_serial_device_instance *sr_serial_device_instance_new(
                                                const char *port, int fd)
 {
        struct sr_serial_device_instance *serial;
 
-       if (!(serial = malloc(sizeof(struct sr_serial_device_instance))))
+       if (!(serial = g_try_malloc(sizeof(struct sr_serial_device_instance)))) {
+               sr_err("hwplugin: %s: serial malloc failed", __func__);
                return NULL;
+       }
 
-       serial->port = strdup(port);
+       serial->port = g_strdup(port);
        serial->fd = fd;
 
        return serial;
 }
 
-void sr_serial_device_instance_free(struct sr_serial_device_instance *serial)
+SR_PRIV void sr_serial_device_instance_free(
+               struct sr_serial_device_instance *serial)
 {
-       free(serial->port);
+       g_free(serial->port);
 }
 
-int sr_find_hwcap(int *capabilities, int hwcap)
+SR_API int sr_find_hwcap(int *capabilities, int hwcap)
 {
        int i;
 
@@ -267,7 +256,7 @@ int sr_find_hwcap(int *capabilities, int hwcap)
        return FALSE;
 }
 
-struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
+SR_API struct sr_hwcap_option *sr_find_hwcap_option(int hwcap)
 {
        int i;