Browse Source

Merge pull request #3302 from PX4/fix_unused

fixed unused variable
sbg
Roman Bapst 9 years ago
parent
commit
bbc307e254
  1. 12
      src/modules/simulator/simulator_mavlink.cpp
  2. 3
      src/platforms/posix/work_queue/hrt_thread.c

12
src/modules/simulator/simulator_mavlink.cpp

@ -358,12 +358,12 @@ void Simulator::send() @@ -358,12 +358,12 @@ void Simulator::send()
fds[0].fd = _actuator_outputs_sub;
fds[0].events = POLLIN;
int rv;
// set the threads name
#ifdef __PX4_DARWIN
rv = pthread_setname_np("sim_send");
pthread_setname_np("sim_send");
#else
rv = pthread_setname_np(pthread_self(), "sim_send");
pthread_setname_np(pthread_self(), "sim_send");
#endif
int pret;
@ -523,12 +523,12 @@ void Simulator::pollForMAVLinkMessages(bool publish) @@ -523,12 +523,12 @@ void Simulator::pollForMAVLinkMessages(bool publish)
pthread_create(&sender_thread, &sender_thread_attr, Simulator::sending_trampoline, NULL);
pthread_attr_destroy(&sender_thread_attr);
int rv;
// set the threads name
#ifdef __PX4_DARWIN
rv = pthread_setname_np("sim_rcv");
pthread_setname_np("sim_rcv");
#else
rv = pthread_setname_np(pthread_self(), "sim_rcv");
pthread_setname_np(pthread_self(), "sim_rcv");
#endif
// wait for new mavlink messages to arrive

3
src/platforms/posix/work_queue/hrt_thread.c

@ -119,10 +119,9 @@ static void hrt_work_process() @@ -119,10 +119,9 @@ static void hrt_work_process()
uint32_t remaining;
uint32_t next;
int rv;
// set the threads name
#ifdef __PX4_DARWIN
rv = pthread_setname_np("HRT");
pthread_setname_np("HRT");
#else
// The Linux headers do not actually contain this
//rv = pthread_setname_np(pthread_self(), "HRT");

Loading…
Cancel
Save