From d2a354bbe4b8ecd81f5c3bdb459a9ae822f91e9a Mon Sep 17 00:00:00 2001 From: Andrej Rode Date: Tue, 25 Apr 2017 12:30:33 -0700 Subject: uhd: cast thread_group.create_thread() return value to void to avoid memory leak --- host/examples/network_relay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host/examples') diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp index b16bcaaa5..7e354934a 100644 --- a/host/examples/network_relay.cpp +++ b/host/examples/network_relay.cpp @@ -100,9 +100,9 @@ public: std::cout << "spawning relay threads... " << _port << std::endl; boost::unique_lock lock(spawn_mutex); // lock in preparation to wait for threads to spawn - _thread_group.create_thread(boost::bind(&udp_relay_type::server_thread, this)); + (void)_thread_group.create_thread(boost::bind(&udp_relay_type::server_thread, this)); wait_for_thread.wait(lock); // wait for thread to spin up - _thread_group.create_thread(boost::bind(&udp_relay_type::client_thread, this)); + (void)_thread_group.create_thread(boost::bind(&udp_relay_type::client_thread, this)); wait_for_thread.wait(lock); // wait for thread to spin up std::cout << " done!" << std::endl << std::endl; } -- cgit v1.2.3 From a96fdcfe275451c2a217c6ccf34cdd73c5719905 Mon Sep 17 00:00:00 2001 From: Andrej Rode Date: Tue, 25 Apr 2017 12:32:39 -0700 Subject: examples: fix device_args parsing in tx_samples_c --- host/examples/tx_samples_c.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'host/examples') diff --git a/host/examples/tx_samples_c.c b/host/examples/tx_samples_c.c index f04d4b26c..333c7e820 100644 --- a/host/examples/tx_samples_c.c +++ b/host/examples/tx_samples_c.c @@ -57,7 +57,7 @@ int main(int argc, char* argv[]){ double freq = 2e9; double rate = 1e6; double gain = 0; - char* device_args = ""; + char* device_args; size_t channel = 0; uint64_t total_num_samps = 0; bool verbose = false; @@ -106,6 +106,9 @@ int main(int argc, char* argv[]){ fprintf(stderr, "Unable to set thread priority. Continuing anyway.\n"); } + if (device_args == NULL){ + device_args = ""; + } // Create USRP uhd_usrp_handle usrp; fprintf(stderr, "Creating USRP with args \"%s\"...\n", device_args); @@ -246,7 +249,7 @@ int main(int argc, char* argv[]){ uhd_usrp_free(&usrp); free_option_strings: - if(strcmp(device_args,"")){ + if(device_args != NULL){ free(device_args); } -- cgit v1.2.3