From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2210) id 62AEA383E80A; Mon, 30 May 2022 15:06:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 62AEA383E80A Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: remove some 32-bit only path conversion functions X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown X-Git-Refname: refs/heads/master X-Git-Oldrev: 2126f966aeba1616c3bb8b3886061f6235126dcc X-Git-Newrev: 3e917daec121ae5fd5cdcbb25d0d4e9d1cfd0a2a Message-Id: <20220530150655.62AEA383E80A@sourceware.org> Date: Mon, 30 May 2022 15:06:55 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2022 15:06:55 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D3e917daec12= 1ae5fd5cdcbb25d0d4e9d1cfd0a2a commit 3e917daec121ae5fd5cdcbb25d0d4e9d1cfd0a2a Author: Ken Brown Date: Tue May 24 10:20:23 2022 -0400 Cygwin: remove some 32-bit only path conversion functions Diff: --- winsup/cygwin/include/sys/cygwin.h | 23 ------------ winsup/cygwin/path.cc | 64 ------------------------------= ---- winsup/testsuite/winsup.api/cygload.cc | 2 -- 3 files changed, 89 deletions(-) diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys= /cygwin.h index 0c3c2d65d..4923caacb 100644 --- a/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h @@ -20,29 +20,6 @@ extern "C" { =20 #define _CYGWIN_SIGNAL_STRING "cYgSiGw00f" =20 -#ifdef __i386__ -/* DEPRECATED INTERFACES. These are restricted to MAX_PATH length. - Don't use in modern applications. They don't exist on x86_64. */ -extern int cygwin_win32_to_posix_path_list (const char *, char *) - __attribute__ ((__deprecated__)); -extern int cygwin_win32_to_posix_path_list_buf_size (const char *) - __attribute__ ((__deprecated__)); -extern int cygwin_posix_to_win32_path_list (const char *, char *) - __attribute__ ((__deprecated__)); -extern int cygwin_posix_to_win32_path_list_buf_size (const char *) - __attribute__ ((__deprecated__)); -extern int cygwin_conv_to_win32_path (const char *, char *) - __attribute__ ((__deprecated__)); -extern int cygwin_conv_to_full_win32_path (const char *, char *) - __attribute__ ((__deprecated__)); -extern int cygwin_conv_to_posix_path (const char *, char *) - __attribute__ ((__deprecated__)); -extern int cygwin_conv_to_full_posix_path (const char *, char *) - __attribute__ ((__deprecated__)); -#endif /* __i386__ */ - -/* Use these interfaces in favor of the above. */ - /* Possible 'what' values in calls to cygwin_conv_path/cygwin_create_path.= */ enum { diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 98f7aa1db..bd3ffdce6 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -4029,40 +4029,6 @@ cygwin_create_path (cygwin_conv_path_t what, const v= oid *from) return to; } =20 -#ifdef __i386__ - -extern "C" int -cygwin_conv_to_win32_path (const char *path, char *win32_path) -{ - return cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_RELATIVE, path, win32_= path, - MAX_PATH); -} - -extern "C" int -cygwin_conv_to_full_win32_path (const char *path, char *win32_path) -{ - return cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_ABSOLUTE, path, win32_= path, - MAX_PATH); -} - -/* This is exported to the world as cygwin_foo by cygwin.din. */ - -extern "C" int -cygwin_conv_to_posix_path (const char *path, char *posix_path) -{ - return cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_RELATIVE, path, posix_= path, - MAX_PATH); -} - -extern "C" int -cygwin_conv_to_full_posix_path (const char *path, char *posix_path) -{ - return cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, path, posix_= path, - MAX_PATH); -} - -#endif /* __i386__ */ - /* The realpath function is required by POSIX:2008. */ =20 extern "C" char * @@ -4211,36 +4177,6 @@ env_PATH_to_posix (const void *win32, void *posix, s= ize_t size) size, ENV_CVT)); } =20 -#ifdef __i386__ - -extern "C" int -cygwin_win32_to_posix_path_list_buf_size (const char *path_list) -{ - return conv_path_list_buf_size (path_list, true); -} - -extern "C" int -cygwin_posix_to_win32_path_list_buf_size (const char *path_list) -{ - return conv_path_list_buf_size (path_list, false); -} - -extern "C" int -cygwin_win32_to_posix_path_list (const char *win32, char *posix) -{ - return_with_errno (conv_path_list (win32, posix, MAX_PATH, - CCP_WIN_A_TO_POSIX | CCP_RELATIVE)); -} - -extern "C" int -cygwin_posix_to_win32_path_list (const char *posix, char *win32) -{ - return_with_errno (conv_path_list (posix, win32, MAX_PATH, - CCP_POSIX_TO_WIN_A | CCP_RELATIVE)); -} - -#endif /* __i386__ */ - extern "C" ssize_t cygwin_conv_path_list (cygwin_conv_path_t what, const void *from, void *to, size_t size) diff --git a/winsup/testsuite/winsup.api/cygload.cc b/winsup/testsuite/wins= up.api/cygload.cc index ad4599666..faad5ce0e 100644 --- a/winsup/testsuite/winsup.api/cygload.cc +++ b/winsup/testsuite/winsup.api/cygload.cc @@ -152,8 +152,6 @@ cygwin::connector::connector (const char *dll) // Pick up the function pointers for the basic infrastructure. get_symbol ("__errno", _errno); get_symbol ("strerror", _strerror); - get_symbol ("cygwin_conv_to_full_posix_path", _conv_to_full_posix_path); - get_symbol ("cygwin_conv_to_full_win32_path", _conv_to_full_win32_path); =20 // Note that you need to be running an interruptible cygwin function if // you want to receive signals. You can use the standard signal()