diff options
author | Ken Brown <kbrown@cornell.edu> | 2022-05-24 17:20:23 +0300 |
---|---|---|
committer | Ken Brown <kbrown@cornell.edu> | 2022-05-30 00:45:52 +0300 |
commit | 3e917daec121ae5fd5cdcbb25d0d4e9d1cfd0a2a (patch) | |
tree | 157954d2ed631f496c3c5db2c5010579d3dfb16e /winsup | |
parent | 2126f966aeba1616c3bb8b3886061f6235126dcc (diff) |
Cygwin: remove some 32-bit only path conversion functions
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/cygwin/include/sys/cygwin.h | 23 | ||||
-rw-r--r-- | winsup/cygwin/path.cc | 64 | ||||
-rw-r--r-- | winsup/testsuite/winsup.api/cygload.cc | 2 |
3 files changed, 0 insertions, 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" { #define _CYGWIN_SIGNAL_STRING "cYgSiGw00f" -#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 void *from) return to; } -#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. */ extern "C" char * @@ -4211,36 +4177,6 @@ env_PATH_to_posix (const void *win32, void *posix, size_t size) size, ENV_CVT)); } -#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/winsup.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); // Note that you need to be running an interruptible cygwin function if // you want to receive signals. You can use the standard signal() |