scpi_usbtmc: fix reading of blocks bigger than the 2048 bytes buffer

[libsigrok.git] / input / vcd.c

diff --git a/input/vcd.c b/input/vcd.c
index 5bd7c24bec425a1feb9da6d4a7a10d1d14c86a3f..d20d4a64fd0c524566103ec1d1d2fe0a9515c293 100644 (file)
--- a/input/vcd.c
+++ b/input/vcd.c
@@ -63,14 +63,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "input/vcd: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "input/vcd"
 
 #define DEFAULT_NUM_PROBES 8
 #define CHUNKSIZE 1024
@@ -318,6 +311,9 @@ static int init(struct sr_input *in, const char *filename)
                        if (num_probes < 1) {
                                release_context(ctx);
                                return SR_ERR;
+                       } else if (num_probes > 64) {
+                               sr_err("No more than 64 probes supported.");
+                               return SR_ERR;
                        }
                }