From 614b88275ed238d74ead0254bafd0c5ed71f4235 Mon Sep 17 00:00:00 2001
From: Bastian Bloessl <bloessl@ccs-labs.org>
Date: Sat, 23 Apr 2016 11:29:53 +0200
Subject: [PATCH] random: fix initialization order and cleanup

---
 lib/random_periodic_msg_source_impl.cc | 15 +++++++--------
 lib/random_periodic_msg_source_impl.h  |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/random_periodic_msg_source_impl.cc b/lib/random_periodic_msg_source_impl.cc
index 5201d3f..7a1f55b 100644
--- a/lib/random_periodic_msg_source_impl.cc
+++ b/lib/random_periodic_msg_source_impl.cc
@@ -107,15 +107,14 @@ random_periodic_msg_source_impl::run(random_periodic_msg_source_impl *instance)
 // Generate a random message
 pmt::pmt_t
 random_periodic_msg_source_impl::generate_msg() {
-	// Construct random vector of specified length
-	std::vector<unsigned char> vec(d_msg_len);
-	// Fill w/random bytes
-	for( int i=0; i<d_msg_len; i++ ) {
-		vec[i] = ((unsigned char) d_randbytes());
+	uint8_t vec[d_msg_len];
+
+	for(int i = 0; i < d_msg_len; i++) {
+		vec[i] = d_randbytes();
 	}
-	// Construct the PDU
-	pmt::pmt_t vecpmt(pmt::make_blob(&vec[0], d_msg_len));
-	return pmt::cons(pmt::PMT_NIL, vecpmt);
+
+	pmt::pmt_t blob = pmt::make_blob(vec, d_msg_len);
+	return pmt::cons(pmt::PMT_NIL, blob);
 }
 void
 random_periodic_msg_source_impl::set_nmsg(int nmsg) {
diff --git a/lib/random_periodic_msg_source_impl.h b/lib/random_periodic_msg_source_impl.h
index 0ea921e..20f31da 100644
--- a/lib/random_periodic_msg_source_impl.h
+++ b/lib/random_periodic_msg_source_impl.h
@@ -39,8 +39,8 @@ namespace foo {
 			boost::thread *d_thread;
 			gr::thread::mutex d_mutex;
 			boost::mt19937 d_rng;
-			boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_randbytes;
 			boost::uniform_int<> d_brange;
+			boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_randbytes;
 
 		public:
 			random_periodic_msg_source_impl(int msg_len,