ols: Minor whitespace and coding style fixes.

[libsigrok.git] / strutil.c

diff --git a/strutil.c b/strutil.c
index 1c3d023f014cae475df73389afcb029dfdb2737f..8b0203b01765cd06ff8fb35b07fb0df0309f0a1c 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 /**
  * Convert a numeric samplerate value to its "natural" string representation.
@@ -41,11 +42,11 @@ char *sr_samplerate_string(uint64_t samplerate)
        if (!o)
                return NULL;
 
-       if (samplerate >= GHZ(1))
+       if (samplerate >= SR_GHZ(1))
                r = snprintf(o, 30, "%" PRIu64 " GHz", samplerate / 1000000000);
-       else if (samplerate >= MHZ(1))
+       else if (samplerate >= SR_MHZ(1))
                r = snprintf(o, 30, "%" PRIu64 " MHz", samplerate / 1000000);
-       else if (samplerate >= KHZ(1))
+       else if (samplerate >= SR_KHZ(1))
                r = snprintf(o, 30, "%" PRIu64 " kHz", samplerate / 1000);
        else
                r = snprintf(o, 30, "%" PRIu64 " Hz", samplerate);
@@ -78,11 +79,11 @@ char *sr_period_string(uint64_t frequency)
        if (!o)
                return NULL;
 
-       if (frequency >= GHZ(1))
+       if (frequency >= SR_GHZ(1))
                r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000);
-       else if (frequency >= MHZ(1))
+       else if (frequency >= SR_MHZ(1))
                r = snprintf(o, 30, "%" PRIu64 " us", frequency / 1000000);
-       else if (frequency >= KHZ(1))
+       else if (frequency >= SR_KHZ(1))
                r = snprintf(o, 30, "%" PRIu64 " ms", frequency / 1000);
        else
                r = snprintf(o, 30, "%" PRIu64 " s", frequency);
@@ -114,7 +115,12 @@ char **sr_parse_triggerstring(struct sr_device *device,
 
        max_probes = g_slist_length(device->probes);
        error = FALSE;
-       triggerlist = g_malloc0(max_probes * sizeof(char *));
+
+       if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) {
+               sr_err("session file: %s: metafile malloc failed", __func__);
+               return NULL;
+       }
+
        tokens = g_strsplit(triggerstring, ",", max_probes);
        trigger_types = device->plugin->get_device_info(0, SR_DI_TRIGGER_TYPES);
        if (trigger_types == NULL)
@@ -198,15 +204,15 @@ uint64_t sr_parse_sizestring(const char *sizestring)
                        break;
                case 'k':
                case 'K':
-                       multiplier = KHZ(1);
+                       multiplier = SR_KHZ(1);
                        break;
                case 'm':
                case 'M':
-                       multiplier = MHZ(1);
+                       multiplier = SR_MHZ(1);
                        break;
                case 'g':
                case 'G':
-                       multiplier = GHZ(1);
+                       multiplier = SR_GHZ(1);
                        break;
                default:
                        val = 0;