X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=f3321ba099a3f7b481a2020dce99bbecce7b1db2;hp=2dbbd930095be243ef5fc71d44af31857ad58b35;hb=548b7ddc8144ca0430f852c89ae4f2e61ab487d7;hpb=350beb4bff20be4fd766715a75d69989f301ede3

diff --git a/parsers.c b/parsers.c
index 2dbbd93..f3321ba 100644
--- a/parsers.c
+++ b/parsers.c
@@ -33,7 +33,9 @@ char **parse_probestring(int max_probes, const char *probestring)
 
 	error = FALSE;
 	range = NULL;
-	probelist = g_malloc0(max_probes * sizeof(char *));
+	if (!(probelist = g_try_malloc0(max_probes * sizeof(char *)))) {
+		/* TODO: Handle errors. */
+	}
 	tokens = g_strsplit(probestring, ",", max_probes);
 
 	for (i = 0; tokens[i]; i++) {
@@ -144,10 +146,10 @@ struct sr_device *parse_devicestring(const char *devicestring)
 			return NULL;
 
 		device_cnt = 0;
-		devices = sr_device_list();
+		devices = sr_dev_list();
 		for (l = devices; l; l = l->next) {
 			d = l->data;
-			if (sr_device_has_hwcap(d, SR_HWCAP_DEMO_DEVICE))
+			if (sr_dev_has_hwcap(d, SR_HWCAP_DEMO_DEVICE))
 				continue;
 			if (device_cnt == device_num) {
 				if (device_num == device_cnt) {
@@ -162,14 +164,14 @@ struct sr_device *parse_devicestring(const char *devicestring)
 		 * no need to let them all scan
 		 */
 		device = NULL;
-		plugins = sr_list_hwplugins();
+		plugins = sr_hwplugins_list();
 		for (p = plugins; p; p = p->next) {
 			plugin = p->data;
 			if (strcmp(plugin->name, devicestring))
 				continue;
-			num_devices = sr_init_hwplugins(plugin);
+			num_devices = sr_hwplugin_init(plugin);
 			if (num_devices == 1) {
-				devices = sr_device_list();
+				devices = sr_dev_list();
 				device = devices->data;
 			} else if (num_devices > 1) {
 				printf("driver '%s' found %d devices, select by ID instead.\n",