libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-28 03:27:46 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: AF_UNIX: rename {create,open}_file to {create,open}_socket

Browse Source
This commit is contained in:
Ken Brown 2021-05-05 17:15:22 -04:00
parent 1b2475d7b9
commit 700c140ba6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/fhandler.h
View File

@ -1085,10 +1085,10 @@ class fhandler_socket_unix : public fhandler_socket
const char *mqueue_name); const char *mqueue_name);
static HANDLE create_reparse_point (const sun_name_t *sun, static HANDLE create_reparse_point (const sun_name_t *sun,
const char *mqueue_name); const char *mqueue_name);
HANDLE create_file (const sun_name_t *sun); HANDLE create_socket (const sun_name_t *sun);
static int open_abstract_link (sun_name_t *sun, char *mqueue_name); static int open_abstract_link (sun_name_t *sun, char *mqueue_name);
static int open_reparse_point (sun_name_t *sun, char *mqueue_name); static int open_reparse_point (sun_name_t *sun, char *mqueue_name);
static int open_file (sun_name_t *sun, int &type, char *mqueue_name); static int open_socket (sun_name_t *sun, int &type, char *mqueue_name);
HANDLE autobind (sun_name_t *sun); HANDLE autobind (sun_name_t *sun);
char get_type_char (); char get_type_char ();
void set_pipe_non_blocking (bool nonblocking); void set_pipe_non_blocking (bool nonblocking);

10
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -406,7 +406,7 @@ out:
} }
HANDLE HANDLE
fhandler_socket_unix::create_file (const sun_name_t *sun) fhandler_socket_unix::create_socket (const sun_name_t *sun)
{ {
if (sun->un_len <= (socklen_t) sizeof (sa_family_t) if (sun->un_len <= (socklen_t) sizeof (sa_family_t)
|| (sun->un_len == 3 && sun->un.sun_path[0] == '\0')) || (sun->un_len == 3 && sun->un.sun_path[0] == '\0'))
@ -528,8 +528,8 @@ fhandler_socket_unix::open_reparse_point (sun_name_t *sun,
} }
int int
fhandler_socket_unix::open_file (sun_name_t *sun, int &type, fhandler_socket_unix::open_socket (sun_name_t *sun, int &type,
char *mqueue_name) char *mqueue_name)
{ {
int ret = -1; int ret = -1;
@ -1511,7 +1511,7 @@ fhandler_socket_unix::bind (const struct sockaddr *name, int namelen)
} }
set_handle (pipe); set_handle (pipe);
} }
backing_file_handle = unnamed ? autobind (&sun) : create_file (&sun); backing_file_handle = unnamed ? autobind (&sun) : create_socket (&sun);
if (!backing_file_handle) if (!backing_file_handle)
{ {
set_handle (NULL); set_handle (NULL);
@ -1731,7 +1731,7 @@ fhandler_socket_unix::connect (const struct sockaddr *name, int namelen)
return -1; return -1;
} }
/* Check if peer address exists. */ /* Check if peer address exists. */
if (open_file (&sun, peer_type, mqueue_name) < 0) if (open_socket (&sun, peer_type, mqueue_name) < 0)
{ {
connect_state (unconnected); connect_state (unconnected);
return -1; return -1;