Lots of trivial changes to remove extraneous semicolons throughout ASan.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@159128 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_interceptors.h b/lib/asan/asan_interceptors.h
index 8ebc417..3281692 100644
--- a/lib/asan/asan_interceptors.h
+++ b/lib/asan/asan_interceptors.h
@@ -17,16 +17,16 @@
#include "asan_internal.h"
#include "interception/interception.h"
-DECLARE_REAL(int, memcmp, const void *a1, const void *a2, uptr size);
-DECLARE_REAL(void*, memcpy, void *to, const void *from, uptr size);
-DECLARE_REAL(void*, memset, void *block, int c, uptr size);
-DECLARE_REAL(char*, strchr, const char *str, int c);
-DECLARE_REAL(uptr, strlen, const char *s);
-DECLARE_REAL(char*, strncpy, char *to, const char *from, uptr size);
-DECLARE_REAL(uptr, strnlen, const char *s, uptr maxlen);
+DECLARE_REAL(int, memcmp, const void *a1, const void *a2, uptr size)
+DECLARE_REAL(void*, memcpy, void *to, const void *from, uptr size)
+DECLARE_REAL(void*, memset, void *block, int c, uptr size)
+DECLARE_REAL(char*, strchr, const char *str, int c)
+DECLARE_REAL(uptr, strlen, const char *s)
+DECLARE_REAL(char*, strncpy, char *to, const char *from, uptr size)
+DECLARE_REAL(uptr, strnlen, const char *s, uptr maxlen)
struct sigaction;
DECLARE_REAL(int, sigaction, int signum, const struct sigaction *act,
- struct sigaction *oldact);
+ struct sigaction *oldact)
namespace __asan {
diff --git a/lib/asan/asan_malloc_linux.cc b/lib/asan/asan_malloc_linux.cc
index ac1c840..6c5682b 100644
--- a/lib/asan/asan_malloc_linux.cc
+++ b/lib/asan/asan_malloc_linux.cc
@@ -103,7 +103,7 @@
return asan_malloc_usable_size(ptr, &stack);
}
-INTERCEPTOR(struct mallinfo, mallinfo) {
+INTERCEPTOR(struct mallinfo, mallinfo, void) {
struct mallinfo res;
REAL(memset)(&res, 0, sizeof(res));
return res;
diff --git a/lib/asan/asan_stack.h b/lib/asan/asan_stack.h
index 101408a..35a6af2 100644
--- a/lib/asan/asan_stack.h
+++ b/lib/asan/asan_stack.h
@@ -63,7 +63,7 @@
uptr bp = GET_CURRENT_FRAME(); \
uptr pc = GET_CALLER_PC(); \
uptr local_stack; \
- uptr sp = (uptr)&local_stack;
+ uptr sp = (uptr)&local_stack
// Use this macro if you want to print stack trace with the current
// function in the top frame.
@@ -71,7 +71,7 @@
uptr bp = GET_CURRENT_FRAME(); \
uptr pc = AsanStackTrace::GetCurrentPc(); \
uptr local_stack; \
- uptr sp = (uptr)&local_stack;
+ uptr sp = (uptr)&local_stack
// Get the stack trace with the given pc and bp.
// The pc will be in the position 0 of the resulting stack trace.
@@ -79,7 +79,7 @@
// fast_unwind is currently unused.
#define GET_STACK_TRACE_WITH_PC_AND_BP(max_s, pc, bp) \
AsanStackTrace stack; \
- stack.GetStackTrace(max_s, pc, bp); \
+ stack.GetStackTrace(max_s, pc, bp)
// NOTE: A Rule of thumb is to retrieve stack trace in the interceptors
// as early as possible (in functions exposed to the user), as we generally
@@ -87,7 +87,7 @@
#define GET_STACK_TRACE_HERE(max_size) \
GET_STACK_TRACE_WITH_PC_AND_BP(max_size, \
- AsanStackTrace::GetCurrentPc(), GET_CURRENT_FRAME()) \
+ AsanStackTrace::GetCurrentPc(), GET_CURRENT_FRAME())
#define GET_STACK_TRACE_HERE_FOR_MALLOC \
GET_STACK_TRACE_HERE(FLAG_malloc_context_size)
@@ -99,6 +99,6 @@
{ \
GET_STACK_TRACE_HERE(kStackTraceMax); \
stack.PrintStack(); \
- } \
+ }
#endif // ASAN_STACK_H