From d50a0ce27329f5e07a889954e1a58396fcbd2b75 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 27 Feb 2013 19:42:26 +0000 Subject: [PATCH] * windows-nat.c: Throughout, fix format strings and casts of printf-like functions to avoid type related warnings on all platforms. (handle_output_debug_string): Fetch context information address from debug string using string_to_core_addr. --- gdb/ChangeLog | 8 ++++++ gdb/windows-nat.c | 66 ++++++++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7c9c9172350..a3bdecd3986 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2013-02-27 Corinna Vinschen + + * windows-nat.c: Throughout, fix format strings and casts of + printf-like functions to avoid type related warnings on all + platforms. + (handle_output_debug_string): Fetch context information address + from debug string using string_to_core_addr. + 2013-02-27 Jiong Wang * regformats/reg-tilegx.dat (name): Change abi name to "tilegx". diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index a69d561074b..977b9680b8f 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -289,8 +289,8 @@ static void check (BOOL ok, const char *file, int line) { if (!ok) - printf_filtered ("error return %s:%d was %lu\n", file, line, - GetLastError ()); + printf_filtered ("error return %s:%d was %u\n", file, line, + (unsigned) GetLastError ()); } /* Find a thread record given a thread id. If GET_CONTEXT is not 0, @@ -311,8 +311,8 @@ thread_rec (DWORD id, int get_context) if (SuspendThread (th->h) == (DWORD) -1) { DWORD err = GetLastError (); - warning (_("SuspendThread failed. (winerr %d)"), - (int) err); + warning (_("SuspendThread failed. (winerr %u)"), + (unsigned) err); return NULL; } th->suspended = 1; @@ -576,7 +576,8 @@ get_module_name (LPVOID base_address, char *dll_name_ret) len = GetModuleFileNameEx (current_process_handle, DllHandle[i], pathbuf, __PMAX); if (len == 0) - error (_("Error getting dll name: %lu."), GetLastError ()); + error (_("Error getting dll name: %u."), + (unsigned) GetLastError ()); if (cygwin_conv_path (CCP_WIN_W_TO_POSIX, pathbuf, dll_name_ret, __PMAX) < 0) error (_("Error converting dll name to POSIX: %d."), errno); @@ -977,7 +978,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus) retval = strtoul (p, &p, 0); if (!retval) retval = main_thread_id; - else if ((x = (LPCVOID) strtoul (p, &p, 0)) + else if ((x = (LPCVOID) string_to_core_addr (p)) && ReadProcessMemory (current_process_handle, x, &saved_context, __COPY_CONTEXT_SIZE, &n) @@ -1000,7 +1001,7 @@ display_selector (HANDLE thread, DWORD sel) if (GetThreadSelectorEntry (thread, sel, &info)) { int base, limit; - printf_filtered ("0x%03lx: ", sel); + printf_filtered ("0x%03x: ", (unsigned) sel); if (!info.HighWord.Bits.Pres) { puts_filtered ("Segment not present\n"); @@ -1064,7 +1065,7 @@ display_selector (HANDLE thread, DWORD sel) if (err == ERROR_NOT_SUPPORTED) printf_filtered ("Function not supported\n"); else - printf_filtered ("Invalid selector 0x%lx.\n",sel); + printf_filtered ("Invalid selector 0x%x.\n", (unsigned) sel); return 0; } } @@ -1228,8 +1229,8 @@ handle_exception (struct target_waitstatus *ourstatus) /* Treat unhandled first chance exceptions specially. */ if (current_event.u.Exception.dwFirstChance) return -1; - printf_unfiltered ("gdb: unknown target exception 0x%08lx at %s\n", - current_event.u.Exception.ExceptionRecord.ExceptionCode, + printf_unfiltered ("gdb: unknown target exception 0x%08x at %s\n", + (unsigned) current_event.u.Exception.ExceptionRecord.ExceptionCode, host_address_to_string ( current_event.u.Exception.ExceptionRecord.ExceptionAddress)); ourstatus->value.sig = GDB_SIGNAL_UNKNOWN; @@ -1249,8 +1250,9 @@ windows_continue (DWORD continue_status, int id) thread_info *th; BOOL res; - DEBUG_EVENTS (("ContinueDebugEvent (cpid=%ld, ctid=%lx, %s);\n", - current_event.dwProcessId, current_event.dwThreadId, + DEBUG_EVENTS (("ContinueDebugEvent (cpid=%d, ctid=%x, %s);\n", + (unsigned) current_event.dwProcessId, + (unsigned) current_event.dwThreadId, continue_status == DBG_CONTINUE ? "DBG_CONTINUE" : "DBG_EXCEPTION_NOT_HANDLED")); @@ -1297,8 +1299,8 @@ fake_create_process (void) open_process_used = 1; else { - error (_("OpenProcess call failed, GetLastError = %lud"), - GetLastError ()); + error (_("OpenProcess call failed, GetLastError = %u"), + (unsigned) GetLastError ()); /* We can not debug anything in that case. */ } main_thread_id = current_event.dwThreadId; @@ -1457,7 +1459,7 @@ get_windows_debug_event (struct target_ops *ops, switch (event_code) { case CREATE_THREAD_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "CREATE_THREAD_DEBUG_EVENT")); @@ -1486,7 +1488,7 @@ get_windows_debug_event (struct target_ops *ops, break; case EXIT_THREAD_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "EXIT_THREAD_DEBUG_EVENT")); @@ -1500,7 +1502,7 @@ get_windows_debug_event (struct target_ops *ops, break; case CREATE_PROCESS_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "CREATE_PROCESS_DEBUG_EVENT")); @@ -1522,7 +1524,7 @@ get_windows_debug_event (struct target_ops *ops, break; case EXIT_PROCESS_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "EXIT_PROCESS_DEBUG_EVENT")); @@ -1542,7 +1544,7 @@ get_windows_debug_event (struct target_ops *ops, break; case LOAD_DLL_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "LOAD_DLL_DEBUG_EVENT")); @@ -1556,7 +1558,7 @@ get_windows_debug_event (struct target_ops *ops, break; case UNLOAD_DLL_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "UNLOAD_DLL_DEBUG_EVENT")); @@ -1569,7 +1571,7 @@ get_windows_debug_event (struct target_ops *ops, break; case EXCEPTION_DEBUG_EVENT: - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "EXCEPTION_DEBUG_EVENT")); @@ -1591,7 +1593,7 @@ get_windows_debug_event (struct target_ops *ops, break; case OUTPUT_DEBUG_STRING_EVENT: /* Message from the kernel. */ - DEBUG_EVENTS (("gdb: kernel event for pid=%d tid=%x code=%s)\n", + DEBUG_EVENTS (("gdb: kernel event for pid=%u tid=%x code=%s)\n", (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "OUTPUT_DEBUG_STRING_EVENT")); @@ -1603,11 +1605,11 @@ get_windows_debug_event (struct target_ops *ops, default: if (saw_create != 1) break; - printf_unfiltered ("gdb: kernel event for pid=%ld tid=%ld\n", - (DWORD) current_event.dwProcessId, - (DWORD) current_event.dwThreadId); - printf_unfiltered (" unknown event code %ld\n", - current_event.dwDebugEventCode); + printf_unfiltered ("gdb: kernel event for pid=%u tid=%x\n", + (unsigned) current_event.dwProcessId, + (unsigned) current_event.dwThreadId); + printf_unfiltered (" unknown event code %u\n", + (unsigned) current_event.dwDebugEventCode); break; } @@ -1865,8 +1867,8 @@ windows_detach (struct target_ops *ops, char *args, int from_tty) if (!DebugActiveProcessStop (current_event.dwProcessId)) { - error (_("Can't detach process %lu (error %lu)"), - current_event.dwProcessId, GetLastError ()); + error (_("Can't detach process %u (error %u)"), + (unsigned) current_event.dwProcessId, (unsigned) GetLastError ()); detached = 0; } DebugSetProcessKillOnExit (FALSE); @@ -1876,8 +1878,8 @@ windows_detach (struct target_ops *ops, char *args, int from_tty) char *exec_file = get_exec_file (0); if (exec_file == 0) exec_file = ""; - printf_unfiltered ("Detaching from program: %s, Pid %lu\n", exec_file, - current_event.dwProcessId); + printf_unfiltered ("Detaching from program: %s, Pid %u\n", exec_file, + (unsigned) current_event.dwProcessId); gdb_flush (gdb_stdout); } @@ -2264,7 +2266,7 @@ windows_create_inferior (struct target_ops *ops, char *exec_file, #endif if (!ret) - error (_("Error creating process %s, (error %d)."), + error (_("Error creating process %s, (error %u)."), exec_file, (unsigned) GetLastError ()); CloseHandle (pi.hThread); -- 2.30.2