am 8124e073: Merge "Fix unused parameter warnings"

* commit '8124e0736208c47a74767170d31e3c24e0f47504':
  Fix unused parameter warnings
This commit is contained in:
Jean-Baptiste Queru 2012-08-15 09:31:23 -07:00 committed by Android Git Automerger
commit 417e3041b8
3 changed files with 10 additions and 7 deletions

View file

@ -73,13 +73,13 @@ typedef struct {
uint32_t esp;
} unwind_state_t;
uintptr_t rewind_pc_arch(const memory_t* memory, uintptr_t pc) {
uintptr_t rewind_pc_arch(const memory_t* memory __attribute__((unused)), uintptr_t pc) {
// TODO: Implement for x86.
return pc;
}
static ssize_t unwind_backtrace_common(const memory_t* memory,
const map_info_t* map_info_list,
const map_info_t* map_info_list __attribute__((unused)),
unwind_state_t* state, backtrace_frame_t* backtrace,
size_t ignore_depth, size_t max_depth) {
size_t ignored_frames = 0;
@ -108,7 +108,7 @@ static ssize_t unwind_backtrace_common(const memory_t* memory,
return returned_frames;
}
ssize_t unwind_backtrace_signal_arch(siginfo_t* siginfo, void* sigcontext,
ssize_t unwind_backtrace_signal_arch(siginfo_t* siginfo __attribute__((unused)), void* sigcontext,
const map_info_t* map_info_list,
backtrace_frame_t* backtrace, size_t ignore_depth, size_t max_depth) {
const ucontext_t* uc = (const ucontext_t*)sigcontext;

View file

@ -21,8 +21,11 @@
#include <cutils/log.h>
void load_ptrace_map_info_data_arch(pid_t pid, map_info_t* mi, map_info_data_t* data) {
void load_ptrace_map_info_data_arch(pid_t pid __attribute__((unused)),
map_info_t* mi __attribute__((unused)),
map_info_data_t* data __attribute__((unused))) {
}
void free_ptrace_map_info_data_arch(map_info_t* mi, map_info_data_t* data) {
void free_ptrace_map_info_data_arch(map_info_t* mi __attribute__((unused)),
map_info_data_t* data __attribute__((unused))) {
}

View file

@ -99,7 +99,7 @@ static volatile struct {
size_t returned_frames;
} g_unwind_signal_state;
static void unwind_backtrace_thread_signal_handler(int n, siginfo_t* siginfo, void* sigcontext) {
static void unwind_backtrace_thread_signal_handler(int n __attribute__((unused)), siginfo_t* siginfo, void* sigcontext) {
if (!android_atomic_acquire_cas(gettid(), STATE_DUMPING, &g_unwind_signal_state.tid_state)) {
g_unwind_signal_state.returned_frames = unwind_backtrace_signal_arch(
siginfo, sigcontext,
@ -282,7 +282,7 @@ void free_backtrace_symbols(backtrace_symbol_t* backtrace_symbols, size_t frames
}
}
void format_backtrace_line(unsigned frameNumber, const backtrace_frame_t* frame,
void format_backtrace_line(unsigned frameNumber, const backtrace_frame_t* frame __attribute__((unused)),
const backtrace_symbol_t* symbol, char* buffer, size_t bufferSize) {
const char* mapName = symbol->map_name ? symbol->map_name : "<unknown>";
const char* symbolName = symbol->demangled_name ? symbol->demangled_name : symbol->symbol_name;