Cleanup and fix lint errors

This commit is contained in:
Christophe Bedard 2019-06-18 10:11:05 +02:00
parent f728cd467b
commit f4d20163bd
4 changed files with 6 additions and 8 deletions

View file

@ -18,8 +18,8 @@
#undef TRACEPOINT_INCLUDE #undef TRACEPOINT_INCLUDE
#define TRACEPOINT_INCLUDE "tracetools/tp_call.h" #define TRACEPOINT_INCLUDE "tracetools/tp_call.h"
#if !defined(___INCLUDE_TP_CALL_H) || defined(TRACEPOINT_HEADER_MULTI_READ) #if !defined(TRACETOOLS__TP_CALL_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
#define ___INCLUDE_TP_CALL_H #define TRACETOOLS__TP_CALL_H_
#include <lttng/tracepoint.h> #include <lttng/tracepoint.h>
@ -216,6 +216,6 @@ TRACEPOINT_EVENT(
) )
) )
#endif /* ___INCLUDE_TP_CALL_H */ #endif // TRACETOOLS__TP_CALL_H_
#include <lttng/tracepoint-event.h> #include <lttng/tracepoint-event.h>

View file

@ -150,4 +150,4 @@ void TRACEPOINT(
} }
#endif #endif
#endif /* TRACETOOLS__TRACETOOLS_H_ */ #endif // TRACETOOLS__TRACETOOLS_H_

View file

@ -27,7 +27,7 @@ void * get_address(std::function<T(U...)> f)
if (fnPointer == nullptr) { if (fnPointer == nullptr) {
return 0; return 0;
} }
return (void *)*fnPointer; return reinterpret_cast<void *>(*fnPointer);
} }
const char * get_symbol(void * funptr); const char * get_symbol(void * funptr);

View file

@ -13,8 +13,6 @@
// limitations under the License. // limitations under the License.
#define TRACEPOINT_CREATE_PROBES #define TRACEPOINT_CREATE_PROBES
/*
* The header containing our TRACEPOINT_EVENTs.
*/
#define TRACEPOINT_DEFINE #define TRACEPOINT_DEFINE
#include "tracetools/tp_call.h" #include "tracetools/tp_call.h"