public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Jon TURNEY <jturney@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Simplify cygwin_buf_t Date: Sun, 12 Jun 2022 16:07:56 +0000 (GMT) [thread overview] Message-ID: <20220612160756.6D0F33858C2C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7d941aa3aafca1c01547f88dae83522c8b9fc97f commit 7d941aa3aafca1c01547f88dae83522c8b9fc97f Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Thu Jun 2 14:49:45 2022 +0100 Simplify cygwin_buf_t Prior to c6ca3dab dropping support for Cygwin 1.5, cygwin_buf_t was defined as char for Cygwin 1.5. After that, it's always wchar_t, so just use that. Diff: --- gdb/nat/windows-nat.c | 3 +-- gdb/windows-nat.c | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index e52da16d9ce..5bd561ae63f 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -28,7 +28,6 @@ #else #include <sys/cygwin.h> #define __USEWIDE -typedef wchar_t cygwin_buf_t; #define GetModuleFileNameEx GetModuleFileNameExW #endif @@ -200,7 +199,7 @@ windows_process_info::get_exec_module_filename (char *exe_name_ret, /* Cygwin prefers that the path be in /x/y/z format, so extract the filename into a temporary buffer first, and then convert it to POSIX format into the destination buffer. */ - cygwin_buf_t *pathbuf = (cygwin_buf_t *) alloca (exe_name_max_len * sizeof (cygwin_buf_t)); + wchar_t *pathbuf = (wchar_t *) alloca (exe_name_max_len * sizeof (wchar_t)); len = GetModuleFileNameEx (handle, dh_buf, pathbuf, exe_name_max_len); diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 277507ddf09..611193cd94a 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -157,7 +157,6 @@ static windows_per_inferior windows_process; #else # define __PMAX PATH_MAX # define __USEWIDE - typedef wchar_t cygwin_buf_t; # define STARTUPINFO STARTUPINFOW #endif @@ -689,7 +688,7 @@ windows_make_so (const char *name, LPVOID load_addr) strcat (buf, "\\ntdll.dll"); } #else - cygwin_buf_t buf[__PMAX]; + wchar_t buf[__PMAX]; buf[0] = 0; if (access (name, F_OK) != 0) @@ -2351,13 +2350,13 @@ windows_nat_target::create_inferior (const char *exec_file, { STARTUPINFO si; #ifdef __CYGWIN__ - cygwin_buf_t real_path[__PMAX]; - cygwin_buf_t shell[__PMAX]; /* Path to shell */ - cygwin_buf_t infcwd[__PMAX]; + wchar_t real_path[__PMAX]; + wchar_t shell[__PMAX]; /* Path to shell */ + wchar_t infcwd[__PMAX]; const char *sh; - cygwin_buf_t *toexec; - cygwin_buf_t *cygallargs; - cygwin_buf_t *args; + wchar_t *toexec; + wchar_t *cygallargs; + wchar_t *args; char **old_env = NULL; PWCHAR w32_env; size_t len; @@ -2414,7 +2413,7 @@ windows_nat_target::create_inferior (const char *exec_file, { flags |= DEBUG_ONLY_THIS_PROCESS; if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, exec_file, real_path, - __PMAX * sizeof (cygwin_buf_t)) < 0) + __PMAX * sizeof (wchar_t)) < 0) error (_("Error starting executable: %d"), errno); toexec = real_path; #ifdef __USEWIDE @@ -2453,13 +2452,13 @@ windows_nat_target::create_inferior (const char *exec_file, error (_("Error converting inferior cwd: %d"), errno); #ifdef __USEWIDE - args = (cygwin_buf_t *) alloca ((wcslen (toexec) + wcslen (cygallargs) + 2) - * sizeof (wchar_t)); + args = (wchar_t *) alloca ((wcslen (toexec) + wcslen (cygallargs) + 2) + * sizeof (wchar_t)); wcscpy (args, toexec); wcscat (args, L" "); wcscat (args, cygallargs); #else /* !__USEWIDE */ - args = (cygwin_buf_t *) alloca (strlen (toexec) + strlen (cygallargs) + 2); + args = (char *) alloca (strlen (toexec) + strlen (cygallargs) + 2); strcpy (args, toexec); strcat (args, " "); strcat (args, cygallargs);
reply other threads:[~2022-06-12 16:07 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220612160756.6D0F33858C2C@sourceware.org \ --to=jturney@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).