tests: Fix a few warnings.

[libsigrok.git] / filter.c

diff --git a/filter.c b/filter.c
index 80c0d67afa5dab0635ff15c28333e08cb3687bd2..eaf69e5cf1ae3bea19d7744b009430d94edcb523 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "filter: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "filter"
 
 /**
  * @file
@@ -95,6 +88,8 @@
  *         or SR_ERR_ARG upon invalid arguments.
  *         If something other than SR_OK is returned, the values of
  *         out_unitsize, data_out, and length_out are undefined.
+ *
+ * @since 0.2.0
  */
 SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize,
                            const GArray *probe_array, const uint8_t *data_in,
@@ -104,7 +99,7 @@ SR_API int sr_filter_probes(unsigned int in_unitsize, unsigned int out_unitsize,
        unsigned int in_offset, out_offset;
        int *probelist, out_bit;
        unsigned int i;
-       uint64_t sample_in, sample_out;
+       uint8_t *sample_in, *sample_out;
 
        if (!probe_array) {
                sr_err("%s: probe_array was NULL", __func__);
@@ -149,14 +144,15 @@ 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) {
-               memcpy(&sample_in, data_in + in_offset, in_unitsize);
-               sample_out = out_bit = 0;
+               sample_in = (uint8_t *)data_in + in_offset;
+               sample_out = (*data_out) + out_offset;
+               memset(sample_out, 0, out_unitsize);
+               out_bit = 0;
                for (i = 0; i < probe_array->len; i++) {
-                       if (sample_in & (1 << (probelist[i])))
-                               sample_out |= (1 << out_bit);
+                       if (sample_in[probelist[i]>>3] & (1 << (probelist[i]&7)))
+                               sample_out[out_bit>>3] |= (1 << (out_bit&7));
                        out_bit++;
                }
-               memcpy((*data_out) + out_offset, &sample_out, out_unitsize);
                in_offset += in_unitsize;
                out_offset += out_unitsize;
        }