libsigrok: More coding style fixes.

[libsigrok.git] / filter.c

diff --git a/filter.c b/filter.c
index 40a47ca3ff7d28e6684c066146ea8c4f34cd6172..be53768d629f939e2062880cfc4274df33029d03 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -20,14 +20,16 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include "sigrok.h"
+#include <sigrok.h>
 
-/* convert sample from maximum probes -- the way the hardware driver sent
+/*
+ * Convert sample from maximum probes -- the way the hardware driver sent
  * it -- to a sample taking up only as much space as required, with
  * unused probes removed.
  */
 int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
-               char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
+                 char *data_in, uint64_t length_in, char **data_out,
+                 uint64_t * length_out)
 {
        unsigned int in_offset, out_offset;
        int num_enabled_probes, out_bit, i;
@@ -35,33 +37,31 @@ int filter_probes(int in_unitsize, int out_unitsize, int *probelist,
 
        *data_out = malloc(length_in);
        num_enabled_probes = 0;
-       for(i = 0; probelist[i]; i++)
+       for (i = 0; probelist[i]; i++)
                num_enabled_probes++;
 
-       if(num_enabled_probes != in_unitsize * 8) {
+       if (num_enabled_probes != in_unitsize * 8) {
                in_offset = out_offset = 0;
-               while(in_offset <= length_in - in_unitsize) {
+               while (in_offset <= length_in - in_unitsize) {
                        memcpy(&sample_in, data_in + in_offset, in_unitsize);
                        sample_out = 0;
                        out_bit = 0;
-                       for(i = 0; probelist[i]; i++) {
-                               if(sample_in & (1 << (probelist[i]-1)))
+                       for (i = 0; probelist[i]; i++) {
+                               if (sample_in & (1 << (probelist[i] - 1)))
                                        sample_out |= 1 << out_bit;
                                out_bit++;
                        }
-                       memcpy((*data_out) + out_offset, &sample_out, out_unitsize);
+                       memcpy((*data_out) + out_offset, &sample_out,
+                              out_unitsize);
                        in_offset += in_unitsize;
                        out_offset += out_unitsize;
                }
                *length_out = out_offset;
-       }
-       else {
-               /* all probes are used -- no need to compress anything */
+       } else {
+               /* All probes are used -- no need to compress anything. */
                memcpy(*data_out, data_in, length_in);
                *length_out = length_in;
        }
 
        return SIGROK_OK;
 }
-
-