[Commit-gnuradio] [gnuradio] 04/08: blocks: misc. formatting cleanups

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 432b76e822b0508237524b46b5d4d869b5789ea8
Author: Tom Rondeau <address@hidden>
Date:   Thu Dec 18 17:15:15 2014 -0500

    blocks: misc. formatting cleanups
---
 gr-blocks/grc/blocks_repack_bits_bb.xml            |  3 +-
 gr-blocks/lib/pdu_to_tagged_stream_impl.cc         | 18 +++++-----
 gr-blocks/lib/repack_bits_bb_impl.cc               |  6 ++--
 gr-blocks/lib/tagged_stream_mux_impl.cc            | 25 +++++++-------
 .../gnuradio/digital/correlate_and_sync_cc.h       | 11 +++----
 .../gnuradio/digital/packet_header_default.h       | 38 ++++++++++------------
 6 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/gr-blocks/grc/blocks_repack_bits_bb.xml 
b/gr-blocks/grc/blocks_repack_bits_bb.xml
index 3554e30..0c107d8 100644
--- a/gr-blocks/grc/blocks_repack_bits_bb.xml
+++ b/gr-blocks/grc/blocks_repack_bits_bb.xml
@@ -42,7 +42,6 @@
     </option>
   </param>
 
-
   <param>
     <name>Endianness</name>
     <key>endianness</key>
@@ -51,7 +50,7 @@
     <hide>part</hide>
     <option>
       <name>MSB</name>
-     <key>gr.GR_MSB_FIRST</key>
+      <key>gr.GR_MSB_FIRST</key>
     </option>
     <option>
       <name>LSB</name>
diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc 
b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc
index e0da2e5..3a2b50e 100644
--- a/gr-blocks/lib/pdu_to_tagged_stream_impl.cc
+++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.cc
@@ -39,12 +39,12 @@ namespace gr {
 
     pdu_to_tagged_stream_impl::pdu_to_tagged_stream_impl(pdu::vector_type 
type, const std::string& tsb_tag_key)
       : tagged_stream_block("pdu_to_tagged_stream",
-          io_signature::make(0, 0, 0),
-          io_signature::make(1, 1, pdu::itemsize(type)),
-          tsb_tag_key),
-      d_itemsize(pdu::itemsize(type)),
-      d_type(type),
-      d_curr_len(0)
+                            io_signature::make(0, 0, 0),
+                            io_signature::make(1, 1, pdu::itemsize(type)),
+                            tsb_tag_key),
+        d_itemsize(pdu::itemsize(type)),
+        d_type(type),
+        d_curr_len(0)
     {
       message_port_register_in(PDU_PORT_ID);
     }
@@ -73,9 +73,9 @@ namespace gr {
 
     int
     pdu_to_tagged_stream_impl::work (int noutput_items,
-                       gr_vector_int &ninput_items,
-                       gr_vector_const_void_star &input_items,
-                       gr_vector_void_star &output_items)
+                                     gr_vector_int &ninput_items,
+                                     gr_vector_const_void_star &input_items,
+                                     gr_vector_void_star &output_items)
     {
       uint8_t *out = (uint8_t*) output_items[0];
 
diff --git a/gr-blocks/lib/repack_bits_bb_impl.cc 
b/gr-blocks/lib/repack_bits_bb_impl.cc
index 947a3c2..c20c997 100644
--- a/gr-blocks/lib/repack_bits_bb_impl.cc
+++ b/gr-blocks/lib/repack_bits_bb_impl.cc
@@ -84,9 +84,9 @@ namespace gr {
 
     int
     repack_bits_bb_impl::work (int noutput_items,
-                       gr_vector_int &ninput_items,
-                       gr_vector_const_void_star &input_items,
-                       gr_vector_void_star &output_items)
+                               gr_vector_int &ninput_items,
+                               gr_vector_const_void_star &input_items,
+                               gr_vector_void_star &output_items)
     {
       gr::thread::scoped_lock guard(d_setlock);
       const unsigned char *in = (const unsigned char *) input_items[0];
diff --git a/gr-blocks/lib/tagged_stream_mux_impl.cc 
b/gr-blocks/lib/tagged_stream_mux_impl.cc
index c49c14c..ac2d1c2 100644
--- a/gr-blocks/lib/tagged_stream_mux_impl.cc
+++ b/gr-blocks/lib/tagged_stream_mux_impl.cc
@@ -31,16 +31,20 @@ namespace gr {
   namespace blocks {
 
     tagged_stream_mux::sptr
-    tagged_stream_mux::make(size_t itemsize, const std::string &lengthtagname, 
unsigned int tag_preserve_head_pos)
+    tagged_stream_mux::make(size_t itemsize, const std::string &lengthtagname,
+                            unsigned int tag_preserve_head_pos)
     {
-      return gnuradio::get_initial_sptr (new tagged_stream_mux_impl(itemsize, 
lengthtagname, tag_preserve_head_pos));
+      return gnuradio::get_initial_sptr
+        (new tagged_stream_mux_impl(itemsize, lengthtagname,
+                                    tag_preserve_head_pos));
     }
 
-    tagged_stream_mux_impl::tagged_stream_mux_impl(size_t itemsize, const 
std::string &lengthtagname, unsigned int tag_preserve_head_pos)
+    tagged_stream_mux_impl::tagged_stream_mux_impl(size_t itemsize, const 
std::string &lengthtagname,
+                                                   unsigned int 
tag_preserve_head_pos)
       : tagged_stream_block("tagged_stream_mux",
-                 io_signature::make(1, -1, itemsize),
-                 io_signature::make(1,  1, itemsize),
-                lengthtagname),
+                            io_signature::make(1, -1, itemsize),
+                            io_signature::make(1,  1, itemsize),
+                            lengthtagname),
         d_itemsize(itemsize),
        d_tag_preserve_head_pos(tag_preserve_head_pos)
     {
@@ -62,10 +66,10 @@ namespace gr {
     }
 
     int
-    tagged_stream_mux_impl::work (int noutput_items,
-                       gr_vector_int &ninput_items,
-                       gr_vector_const_void_star &input_items,
-                       gr_vector_void_star &output_items)
+    tagged_stream_mux_impl::work(int noutput_items,
+                                 gr_vector_int &ninput_items,
+                                 gr_vector_const_void_star &input_items,
+                                 gr_vector_void_star &output_items)
     {
       unsigned char *out = (unsigned char *) output_items[0];
       int n_produced = 0;
@@ -94,4 +98,3 @@ namespace gr {
 
   } /* namespace blocks */
 } /* namespace gr */
-
diff --git a/gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h 
b/gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h
index c84357f..704b866 100644
--- a/gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h
+++ b/gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2013 Free Software Foundation, Inc.
- * 
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -88,4 +88,3 @@ namespace gr {
 } // namespace gr
 
 #endif /* INCLUDED_DIGITAL_CORRELATE_AND_SYNC_CC_H */
-
diff --git a/gr-digital/include/gnuradio/digital/packet_header_default.h 
b/gr-digital/include/gnuradio/digital/packet_header_default.h
index 6567dd7..9ffb3d0 100644
--- a/gr-digital/include/gnuradio/digital/packet_header_default.h
+++ b/gr-digital/include/gnuradio/digital/packet_header_default.h
@@ -1,18 +1,18 @@
 /* -*- c++ -*- */
 /* Copyright 2012 Free Software Foundation, Inc.
- * 
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -46,16 +46,16 @@ namespace gr {
      * gr::digital::packet_headergenerator_bb uses header generators derived 
from
      * this class to create packet headers from data streams.
      */
-    class DIGITAL_API packet_header_default : public 
boost::enable_shared_from_this<gr::digital::packet_header_default>
+    class DIGITAL_API packet_header_default
+      : public 
boost::enable_shared_from_this<gr::digital::packet_header_default>
     {
      public:
       typedef boost::shared_ptr<packet_header_default> sptr;
 
-      packet_header_default(
-                     long header_len,
-                     const std::string &len_tag_key="packet_len",
-                     const std::string &num_tag_key="packet_num",
-                     int bits_per_byte=1);
+      packet_header_default(long header_len,
+                            const std::string &len_tag_key="packet_len",
+                            const std::string &num_tag_key="packet_num",
+                            int bits_per_byte=1);
       virtual ~packet_header_default();
 
       sptr base() { return shared_from_this(); };
@@ -80,11 +80,9 @@ namespace gr {
        * However, it is recommended to stay above 32 Bits, in order to have a 
working
        * CRC.
        */
-      virtual bool header_formatter(
-         long packet_len,
-         unsigned char *out,
-         const std::vector<tag_t> &tags=std::vector<tag_t>()
-      );
+      virtual bool header_formatter(long packet_len,
+                                    unsigned char *out,
+                                    const std::vector<tag_t> 
&tags=std::vector<tag_t>());
 
       /*!
        * \brief Inverse function to header_formatter().
@@ -95,11 +93,10 @@ namespace gr {
        const unsigned char *header,
        std::vector<tag_t> &tags);
 
-      static sptr make(
-             long header_len,
-             const std::string &len_tag_key="packet_len",
-             const std::string &num_tag_key="packet_num",
-             int bits_per_byte=1);
+      static sptr make(long header_len,
+                       const std::string &len_tag_key="packet_len",
+                       const std::string &num_tag_key="packet_num",
+                       int bits_per_byte=1);
 
     protected:
       long d_header_len;
@@ -115,4 +112,3 @@ namespace gr {
 } // namespace gr
 
 #endif /* INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H */
-