5 files changed, 37 insertions, 36 deletions
diff --git a/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc b/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc
index f17c3e00d..56f5931fd 100644
--- a/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc
+++ b/gnuradio-core/src/lib/general/gr_keep_m_in_n.cc
@@ -30,9 +30,9 @@
 #include <stdio.h>
 
 gr_keep_m_in_n_sptr
-gr_make_keep_m_in_n (size_t item_size, int m, int n, int offset)
+gr_make_keep_m_in_n(size_t item_size, int m, int n, int offset)
 {
-  return gnuradio::get_initial_sptr(new gr_keep_m_in_n (item_size, m, n, offset));
+  return gnuradio::get_initial_sptr(new gr_keep_m_in_n(item_size, m, n, offset));
 }
 
 
@@ -40,16 +40,16 @@ gr_make_keep_m_in_n (size_t item_size, int m, int n, int offset)
 *
 * offset = 0, starts with 0th item
 * offset = 1, starts with 1st item, etc...
-* 
+*
 * we take m items out of each n
 */
-gr_keep_m_in_n::gr_keep_m_in_n (size_t item_size, int m, int n, int offset)
+gr_keep_m_in_n::gr_keep_m_in_n(size_t item_size, int m, int n, int offset)
   : gr_sync_block ("keep_m_in_n",
-	      gr_make_io_signature (1, 1, n*item_size),
-	      gr_make_io_signature (1, 1, m*item_size)),
+	      gr_make_io_signature(1, 1, n*item_size),
+	      gr_make_io_signature(1, 1, m*item_size)),
     d_n(n),
     d_m(m),
-    d_offset( offset )
+    d_offset(offset)
 {
     // sanity checking
     assert(d_m > 0);
@@ -59,27 +59,28 @@ gr_keep_m_in_n::gr_keep_m_in_n (size_t item_size, int m, int n, int offset)
 }
 
 
-void gr_keep_m_in_n::set_offset(int offset){
+void gr_keep_m_in_n::set_offset(int offset)
+{
     d_offset = offset;
 }
 
 
 int
-gr_keep_m_in_n::work (int noutput_items,
-				gr_vector_const_void_star &input_items,
-				gr_vector_void_star &output_items)
+gr_keep_m_in_n::work(int noutput_items,
+		     gr_vector_const_void_star &input_items,
+		     gr_vector_void_star &output_items)
 {
-  uint8_t* out = (uint8_t*) output_items[0];
-  const uint8_t* in = (const uint8_t*) input_items[0];
+  uint8_t* out = (uint8_t*)output_items[0];
+  const uint8_t* in = (const uint8_t*)input_items[0];
   
   int in_item( input_signature()->sizeof_stream_item(0) );
   int out_item( output_signature()->sizeof_stream_item(0) );
   int single_size = in_item/d_n;
 
   // iterate over data blocks of size {n, input : m, output}
-  for(int i=0; i<noutput_items; i++){
-    memcpy( &out[out_item*i], &in[in_item*i + single_size*d_offset], out_item);
-    } 
+  for(int i = 0; i < noutput_items; i++) {
+    memcpy(&out[out_item*i], &in[in_item*i + single_size*d_offset], out_item);
+  }
  
   return noutput_items;
 }
diff --git a/gnuradio-core/src/lib/general/gr_keep_m_in_n.h b/gnuradio-core/src/lib/general/gr_keep_m_in_n.h
index f9d5a268b..e627ca0ea 100644
--- a/gnuradio-core/src/lib/general/gr_keep_m_in_n.h
+++ b/gnuradio-core/src/lib/general/gr_keep_m_in_n.h
@@ -29,7 +29,7 @@
 class gr_keep_m_in_n;
 typedef boost::shared_ptr<gr_keep_m_in_n> gr_keep_m_in_n_sptr;
 
-GR_CORE_API gr_keep_m_in_n_sptr 
+GR_CORE_API gr_keep_m_in_n_sptr
 gr_make_keep_m_in_n (size_t item_size, int m, int n, int offset);
 
 
diff --git a/gnuradio-core/src/lib/general/gr_keep_m_in_n.i b/gnuradio-core/src/lib/general/gr_keep_m_in_n.i
index cb5c63683..de89cec2c 100644
--- a/gnuradio-core/src/lib/general/gr_keep_m_in_n.i
+++ b/gnuradio-core/src/lib/general/gr_keep_m_in_n.i
@@ -22,7 +22,7 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,keep_m_in_n)
 
-gr_keep_m_in_n_sptr 
+gr_keep_m_in_n_sptr
 gr_make_keep_m_in_n (size_t itemsize, int m, int n, int offset);
 
 class gr_keep_m_in_n : public gr_sync_block
diff --git a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc
index 0237a4d69..bd51c2ec5 100644
--- a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc
+++ b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.cc
@@ -29,41 +29,41 @@
 #include <stdexcept>
 #include <iostream>
 
-gr_pack_k_bits_bb_sptr gr_make_pack_k_bits_bb (unsigned k)
+gr_pack_k_bits_bb_sptr gr_make_pack_k_bits_bb(unsigned k)
 {
-  return gnuradio::get_initial_sptr(new gr_pack_k_bits_bb (k));
+  return gnuradio::get_initial_sptr(new gr_pack_k_bits_bb(k));
 }
 
 
 gr_pack_k_bits_bb::gr_pack_k_bits_bb (unsigned k)
-  : gr_sync_decimator ("pack_k_bits_bb",
-			  gr_make_io_signature (1, 1, sizeof (unsigned char)),
-			  gr_make_io_signature (1, 1, sizeof (unsigned char)),
-			  k),
+  : gr_sync_decimator("pack_k_bits_bb",
+		      gr_make_io_signature (1, 1, sizeof(unsigned char)),
+		      gr_make_io_signature (1, 1, sizeof(unsigned char)),
+		      k),
     d_k (k)
 {
   if (d_k == 0)
-    throw std::out_of_range ("interpolation must be > 0");
+    throw std::out_of_range("interpolation must be > 0");
 }
 
-gr_pack_k_bits_bb::~gr_pack_k_bits_bb ()
+gr_pack_k_bits_bb::~gr_pack_k_bits_bb()
 {
 }
 
 int
-gr_pack_k_bits_bb::work (int noutput_items,
-			   gr_vector_const_void_star &input_items,
-			   gr_vector_void_star &output_items)
+gr_pack_k_bits_bb::work(int noutput_items,
+			gr_vector_const_void_star &input_items,
+			gr_vector_void_star &output_items)
 {
-  const unsigned char *in = (const unsigned char *) input_items[0];
-  unsigned char *out = (unsigned char *) output_items[0];
+  const unsigned char *in = (const unsigned char *)input_items[0];
+  unsigned char *out = (unsigned char *)output_items[0];
 
-  for (int i = 0; i < noutput_items; i++){
+  for(int i = 0; i < noutput_items; i++) {
     out[i] = 0x00;
-    for (unsigned int j = 0; j < d_k; j++){
-        out[i] |=  (0x01 & in[i*d_k+j])<<j;
+    for(unsigned int j = 0; j < d_k; j++) {
+      out[i] |=  (0x01 & in[i*d_k+j])<<j;
     }
   }
-  
+
   return noutput_items;
 }
diff --git a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h
index 00b8f8f13..caf6d7992 100644
--- a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h
+++ b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h
@@ -33,7 +33,7 @@ GR_CORE_API gr_pack_k_bits_bb_sptr gr_make_pack_k_bits_bb (unsigned k);
 class gr_pack_k_bits_bb;
 
 /*!
- * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
+ * \brief Converts a stream of bytes with 1 bit in the LSB to a byte with  k relevent bits.
  * \ingroup converter_blk
  */
 class GR_CORE_API gr_pack_k_bits_bb : public gr_sync_decimator