X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=filter.c;h=eaf69e5cf1ae3bea19d7744b009430d94edcb523;hb=fa0d6afe19c3a545f3f940933ed079966525d142;hp=005b8984c8507ccf5a7e32e7e1935f9654d539ce;hpb=764e7bbfec52f0530f1f965879b0d81a7fc9acb2;p=libsigrok.git

diff --git a/filter.c b/filter.c
index 005b8984..eaf69e5c 100644
--- a/filter.c
+++ b/filter.c
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "filter: "
-#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 "filter"
 
 /**
  * @file
@@ -151,7 +144,7 @@ SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize,
 	/* If we reached this point, not all probes are used, so "compress". */
 	in_offset = out_offset = 0;
 	while (in_offset <= length_in - in_unitsize) {
-		sample_in = data_in + in_offset;
+		sample_in = (uint8_t *)data_in + in_offset;
 		sample_out = (*data_out) + out_offset;
 		memset(sample_out, 0, out_unitsize);
 		out_bit = 0;