From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sa-prd-fep-049.btinternet.com (mailomta19-sa.btinternet.com [213.120.69.25]) by sourceware.org (Postfix) with ESMTPS id 76CDB396D83D for ; Thu, 2 Jun 2022 14:13:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 76CDB396D83D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=dronecode.org.uk Received: from sa-prd-rgout-002.btmx-prd.synchronoss.net ([10.2.38.5]) by sa-prd-fep-049.btinternet.com with ESMTP id <20220602141321.EGDM3227.sa-prd-fep-049.btinternet.com@sa-prd-rgout-002.btmx-prd.synchronoss.net>; Thu, 2 Jun 2022 15:13:21 +0100 Authentication-Results: btinternet.com; none X-SNCR-Rigid: 6139417C27485A70 X-Originating-IP: [86.139.167.41] X-OWM-Source-IP: 86.139.167.41 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgedvfedrledvgdejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemuceutffkvffkuffjvffgnffgvefqofdpqfgfvfenuceurghilhhouhhtmecufedtudenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeflohhnucfvuhhrnhgvhicuoehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkqeenucggtffrrghtthgvrhhnpeeliedtjefhtdevkeehueegffegveeftdejjeevfefhiefffeektddvteehheeijeenucfkphepkeeirddufeelrdduieejrdegudenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhephhgvlhhopehlohgtrghlhhhoshhtrdhlohgtrghlughomhgrihhnpdhinhgvthepkeeirddufeelrdduieejrdeguddpmhgrihhlfhhrohhmpehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepghgusgdqphgrthgthhgvshesshhouhhrtggvfigrrhgvrdhorhhgpdhrtghpthhtohepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukh X-RazorGate-Vade-Verdict: clean 0 X-RazorGate-Vade-Classification: clean Received: from localhost.localdomain (86.139.167.41) by sa-prd-rgout-002.btmx-prd.synchronoss.net (5.8.716.04) (authenticated as jonturney@btinternet.com) id 6139417C27485A70; Thu, 2 Jun 2022 15:13:21 +0100 From: Jon Turney To: gdb-patches@sourceware.org Cc: Jon Turney Subject: [PATCH 2/2] Simplify __USEWIDE Date: Thu, 2 Jun 2022 15:12:58 +0100 Message-Id: <20220602141258.18968-3-jon.turney@dronecode.org.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220602141258.18968-1-jon.turney@dronecode.org.uk> References: <20220602141258.18968-1-jon.turney@dronecode.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1198.7 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 14:13:24 -0000 Prior to c6ca3dab dropping support for Cygwin 1.5, __USEWIDE not defined for Cygwin 1.5. After that, it's always defined if __CYGWIN__ is, so remove __USEWIDE conditionals inside __CYGWIN__ conditionals. --- gdb/windows-nat.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index ab438750186..78db4e99d40 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -89,7 +89,6 @@ static windows_process_info windows_process; /* The starting and ending address of the cygwin1.dll text segment. */ static CORE_ADDR cygwin_load_start; static CORE_ADDR cygwin_load_end; -# define __USEWIDE # define STARTUPINFO STARTUPINFOW # define CreateProcess CreateProcessW #endif @@ -688,17 +687,10 @@ windows_make_so (const char *name, LPVOID load_addr) if (access (name, F_OK) != 0) { if (strcasecmp (name, "ntdll.dll") == 0) -#ifdef __USEWIDE { GetSystemDirectoryW (buf, sizeof (buf) / sizeof (wchar_t)); wcscat (buf, L"\\ntdll.dll"); } -#else - { - GetSystemDirectoryA (buf, sizeof (buf) / sizeof (wchar_t)); - strcat (buf, "\\ntdll.dll"); - } -#endif } #endif solibs.emplace_back (); @@ -2405,32 +2397,21 @@ windows_nat_target::create_inferior (const char *exec_file, __PMAX * sizeof (wchar_t)) < 0) error (_("Error starting executable: %d"), errno); toexec = real_path; -#ifdef __USEWIDE len = mbstowcs (NULL, allargs, 0) + 1; if (len == (size_t) -1) error (_("Error starting executable: %d"), errno); cygallargs = (wchar_t *) alloca (len * sizeof (wchar_t)); mbstowcs (cygallargs, allargs, len); -#else /* !__USEWIDE */ - cygallargs = allargs; -#endif } else { sh = get_shell (); if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, sh, shell, __PMAX) < 0) error (_("Error starting executable via shell: %d"), errno); -#ifdef __USEWIDE len = sizeof (L" -c 'exec '") + mbstowcs (NULL, exec_file, 0) + mbstowcs (NULL, allargs, 0) + 2; cygallargs = (wchar_t *) alloca (len * sizeof (wchar_t)); swprintf (cygallargs, len, L" -c 'exec %s %s'", exec_file, allargs); -#else /* !__USEWIDE */ - len = (sizeof (" -c 'exec '") + strlen (exec_file) - + strlen (allargs) + 2); - cygallargs = (char *) alloca (len); - xsnprintf (cygallargs, len, " -c 'exec %s %s'", exec_file, allargs); -#endif /* __USEWIDE */ toexec = shell; flags |= DEBUG_PROCESS; } @@ -2440,18 +2421,11 @@ windows_nat_target::create_inferior (const char *exec_file, infcwd, strlen (inferior_cwd)) < 0) error (_("Error converting inferior cwd: %d"), errno); -#ifdef __USEWIDE args = (wchar_t *) alloca ((wcslen (toexec) + wcslen (cygallargs) + 2) * sizeof (wchar_t)); wcscpy (args, toexec); wcscat (args, L" "); wcscat (args, cygallargs); -#else /* !__USEWIDE */ - args = (char *) alloca (strlen (toexec) + strlen (cygallargs) + 2); - strcpy (args, toexec); - strcat (args, " "); - strcat (args, cygallargs); -#endif /* !__USEWIDE */ #ifdef CW_CVT_ENV_TO_WINENV /* First try to create a direct Win32 copy of the POSIX environment. */ -- 2.36.1