Author: bonefish Date: 2011-05-24 00:01:23 +0200 (Tue, 24 May 2011) New Revision: 41692 Changeset: https://dev.haiku-os.org/changeset/41692 Modified: haiku/branches/developer/bonefish/signals/src/bin/debug/strace/strace.cpp Log: Some style cleanup. Modified: haiku/branches/developer/bonefish/signals/src/bin/debug/strace/strace.cpp =================================================================== --- haiku/branches/developer/bonefish/signals/src/bin/debug/strace/strace.cpp 2011-05-23 21:53:43 UTC (rev 41691) +++ haiku/branches/developer/bonefish/signals/src/bin/debug/strace/strace.cpp 2011-05-23 22:01:23 UTC (rev 41692) @@ -31,6 +31,7 @@ using std::string; using std::vector; + extern void get_syscalls0(vector<Syscall*> &syscalls); extern void get_syscalls1(vector<Syscall*> &syscalls); extern void get_syscalls2(vector<Syscall*> &syscalls); @@ -52,9 +53,11 @@ extern void get_syscalls18(vector<Syscall*> &syscalls); extern void get_syscalls19(vector<Syscall*> &syscalls); + extern const char *__progname; static const char *kCommandName = __progname; + // usage static const char *kUsage = "Usage: %s [ <options> ] [ <thread or team ID> | <executable with args> ]\n" @@ -84,6 +87,7 @@ " -g - turns off signal tracing.\n" ; + // terminal color escape sequences // (http://www.dee.ufcg.edu.br/~rrbrandt/tools/ansi.html) static const char *kTerminalTextNormal = "\33[0m"; @@ -100,26 +104,24 @@ static vector<Syscall*> sSyscallVector; static map<string, Syscall*> sSyscallMap; -// print_usage -void + +static void print_usage(bool error) { // print usage fprintf((error ? stderr : stdout), kUsage, kCommandName); } -// print_usage_and_exit -static -void + +static void print_usage_and_exit(bool error) { print_usage(error); exit(error ? 1 : 0); } -// get_id -static -bool + +static bool get_id(const char *str, int32 &id) { int32 len = strlen(str); @@ -132,7 +134,7 @@ return true; } -// get_syscall + Syscall * get_syscall(const char *name) { @@ -143,7 +145,7 @@ return i->second; } -// patch_syscalls + static void patch_syscalls() { @@ -155,9 +157,8 @@ patch_ioctl(); } -// init_syscalls -static -void + +static void init_syscalls() { // init the syscall vector @@ -192,9 +193,8 @@ patch_syscalls(); } -// print_to_string -static -void + +static void print_to_string(char **_buffer, int32 *_length, const char *format, ...) { va_list list; @@ -206,9 +206,8 @@ *_length -= length; } -// print_syscall -static -void + +static void print_syscall(FILE *outputFile, debug_post_syscall &message, MemoryReader &memoryReader, bool printArguments, uint32 contentsFlags, bool printReturnValue, bool colorize, bool decimal) @@ -294,8 +293,8 @@ _kern_debug_output(buffer); } -static -const char * + +static const char * signal_name(int signal) { if (signal >= 0 && signal < NSIG) @@ -306,9 +305,8 @@ return buffer; } -// print_signal -static -void + +static void print_signal(FILE *outputFile, debug_signal_received &message, bool colorize) { @@ -334,7 +332,7 @@ _kern_debug_output(buffer); } -// main + int main(int argc, const char *const *argv) {