X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fraw_analog.c;h=f6a02635ddde8f6ebc178e2a1abc47c9c24d5ad2;hb=692716f5d1aae4ef06c67b57aaf253f46f538c33;hp=5241e74ca5261c005861ac3eca15f2d198523710;hpb=4c55ea47a7047fe25717aa8b19f64ed8b33ddb8c;p=libsigrok.git diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c index 5241e74c..f6a02635 100644 --- a/src/input/raw_analog.c +++ b/src/input/raw_analog.c @@ -31,9 +31,9 @@ #define LOG_PREFIX "input/raw_analog" /* How many bytes at a time to process and send to the session bus. */ -#define CHUNK_SIZE 4096 -#define DEFAULT_NUM_CHANNELS 1 -#define DEFAULT_SAMPLERATE 0 +#define CHUNK_SIZE 4096 +#define DEFAULT_NUM_CHANNELS 1 +#define DEFAULT_SAMPLERATE 0 struct context { gboolean started; @@ -105,7 +105,7 @@ static int init(struct sr_input *in, GHashTable *options) { struct context *inc; int num_channels; - char channelname[8]; + char channelname[16]; const char *format; int fmt_index; @@ -130,7 +130,7 @@ static int init(struct sr_input *in, GHashTable *options) in->priv = inc = g_malloc0(sizeof(struct context)); for (int i = 0; i < num_channels; i++) { - snprintf(channelname, 8, "CH%d", i + 1); + snprintf(channelname, sizeof(channelname) - 1, "CH%d", i + 1); sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname); } @@ -151,7 +151,7 @@ static int process_buffer(struct sr_input *in) inc = in->priv; if (!inc->started) { - std_session_send_df_header(in->sdi, LOG_PREFIX); + std_session_send_df_header(in->sdi); if (inc->samplerate) { packet.type = SR_DF_META; @@ -227,7 +227,7 @@ static int end(struct sr_input *in) inc = in->priv; if (inc->started) - std_session_send_df_end(in->sdi, LOG_PREFIX); + std_session_send_df_end(in->sdi); return ret; }