#include <stdlib.h>
#include <string.h>
#include <sigrok.h>
+#include <sigrok-internal.h>
/**
* Convert a numeric samplerate value to its "natural" string representation.
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);
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);
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)
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;