aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB/uORB.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-21 14:41:03 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-21 14:41:03 +0100
commitdcdde8ea88bf57b0432d2b64ed3ce606795c8d00 (patch)
tree0bf6e997ffe7f7a9cda98c832dbce39601a9242f /src/modules/uORB/uORB.cpp
parent3a38b0fe359296aa19ec43ab82743aebeadb335c (diff)
parente8e4a3b5da058bd2ab8575c095dd74a5484333be (diff)
downloadpx4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.gz
px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.bz2
px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.zip
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts: src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp src/modules/uORB/topics/vehicle_attitude.h
Diffstat (limited to 'src/modules/uORB/uORB.cpp')
-rw-r--r--src/modules/uORB/uORB.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/modules/uORB/uORB.cpp b/src/modules/uORB/uORB.cpp
index 149b8f6d2..3373aac83 100644
--- a/src/modules/uORB/uORB.cpp
+++ b/src/modules/uORB/uORB.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
*
- * Copyright (C) 2012 PX4 Development Team. All rights reserved.
+ * Copyright (Cc) 2012-2015 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -230,7 +230,7 @@ ORBDevNode::open(struct file *filp)
ret = CDev::open(filp);
if (ret != OK)
- free(sd);
+ delete sd;
return ret;
}
@@ -817,18 +817,6 @@ uorb_main(int argc, char *argv[])
namespace
{
-void debug(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- va_end(ap);
- fprintf(stderr, "\n");
- fflush(stderr);
- usleep(100000);
-}
-
/**
* Advertise a node; don't consider it an error if the node has
* already been advertised.