Merge pull request #3302 from PX4/fix_unused

fixed unused variable
This commit is contained in:
Roman Bapst
2015-12-01 15:56:19 +01:00
2 changed files with 7 additions and 8 deletions
+6 -6
View File
@@ -358,12 +358,12 @@ void Simulator::send()
fds[0].fd = _actuator_outputs_sub; fds[0].fd = _actuator_outputs_sub;
fds[0].events = POLLIN; fds[0].events = POLLIN;
int rv;
// set the threads name // set the threads name
#ifdef __PX4_DARWIN #ifdef __PX4_DARWIN
rv = pthread_setname_np("sim_send"); pthread_setname_np("sim_send");
#else #else
rv = pthread_setname_np(pthread_self(), "sim_send"); pthread_setname_np(pthread_self(), "sim_send");
#endif #endif
int pret; int pret;
@@ -523,12 +523,12 @@ void Simulator::pollForMAVLinkMessages(bool publish)
pthread_create(&sender_thread, &sender_thread_attr, Simulator::sending_trampoline, NULL); pthread_create(&sender_thread, &sender_thread_attr, Simulator::sending_trampoline, NULL);
pthread_attr_destroy(&sender_thread_attr); pthread_attr_destroy(&sender_thread_attr);
int rv;
// set the threads name // set the threads name
#ifdef __PX4_DARWIN #ifdef __PX4_DARWIN
rv = pthread_setname_np("sim_rcv"); pthread_setname_np("sim_rcv");
#else #else
rv = pthread_setname_np(pthread_self(), "sim_rcv"); pthread_setname_np(pthread_self(), "sim_rcv");
#endif #endif
// wait for new mavlink messages to arrive // wait for new mavlink messages to arrive
+1 -2
View File
@@ -119,10 +119,9 @@ static void hrt_work_process()
uint32_t remaining; uint32_t remaining;
uint32_t next; uint32_t next;
int rv;
// set the threads name // set the threads name
#ifdef __PX4_DARWIN #ifdef __PX4_DARWIN
rv = pthread_setname_np("HRT"); pthread_setname_np("HRT");
#else #else
// The Linux headers do not actually contain this // The Linux headers do not actually contain this
//rv = pthread_setname_np(pthread_self(), "HRT"); //rv = pthread_setname_np(pthread_self(), "HRT");