mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

shm: Don't use "sun" as a variable name, breaks on Solaris

Browse source 
Seems like the Solaris compiler has -Dsun=1, so don't use
sun as a variable name

Patch by Tim Mooney <mooney@dogbert.cc.ndsu.nodak.edu>

https://bugzilla.gnome.org/show_bug.cgi?id=645053
This commit is contained in:
Olivier Crête 2011-03-17 16:41:52 -04:00
parent e2445e26ff
commit 81b0d87746
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/shm/shmpipe.c
View file

@ -192,7 +192,7 @@ sp_writer_create (const char *path, size_t size, mode_t perms)
{ {
ShmPipe *self = spalloc_new (ShmPipe); ShmPipe *self = spalloc_new (ShmPipe);
int flags; int flags;
struct sockaddr_un sun; struct sockaddr_un sock_un;
int i = 0; int i = 0;
memset (self, 0, sizeof (ShmPipe)); memset (self, 0, sizeof (ShmPipe));
@ -211,10 +211,10 @@ sp_writer_create (const char *path, size_t size, mode_t perms)
if (fcntl (self->main_socket, F_SETFL, flags | O_NONBLOCK | FD_CLOEXEC) < 0) if (fcntl (self->main_socket, F_SETFL, flags | O_NONBLOCK | FD_CLOEXEC) < 0)
RETURN_ERROR ("fcntl(F_SETFL) failed (%d): %s\n", errno, strerror (errno)); RETURN_ERROR ("fcntl(F_SETFL) failed (%d): %s\n", errno, strerror (errno));
sun.sun_family = AF_UNIX; sock_un.sun_family = AF_UNIX;
strncpy (sun.sun_path, path, sizeof (sun.sun_path) - 1); strncpy (sock_un.sun_path, path, sizeof (sock_un.sun_path) - 1);
while (bind (self->main_socket, (struct sockaddr *) &sun, while (bind (self->main_socket, (struct sockaddr *) &sock_un,
sizeof (struct sockaddr_un)) < 0) { sizeof (struct sockaddr_un)) < 0) {
if (errno != EADDRINUSE) if (errno != EADDRINUSE)
RETURN_ERROR ("bind() failed (%d): %s\n", errno, strerror (errno)); RETURN_ERROR ("bind() failed (%d): %s\n", errno, strerror (errno));
@ -222,11 +222,11 @@ sp_writer_create (const char *path, size_t size, mode_t perms)
if (i > 256) if (i > 256)
RETURN_ERROR ("Could not find a free socket name for %s", path); RETURN_ERROR ("Could not find a free socket name for %s", path);
snprintf (sun.sun_path, sizeof (sun.sun_path), "%s.%d", path, i); snprintf (sock_un.sun_path, sizeof (sock_un.sun_path), "%s.%d", path, i);
i++; i++;
} }
self->socket_path = strdup (sun.sun_path); self->socket_path = strdup (sock_un.sun_path);
if (listen (self->main_socket, LISTEN_BACKLOG) < 0) if (listen (self->main_socket, LISTEN_BACKLOG) < 0)
RETURN_ERROR ("listen() failed (%d): %s\n", errno, strerror (errno)); RETURN_ERROR ("listen() failed (%d): %s\n", errno, strerror (errno));
@ -744,7 +744,7 @@ ShmPipe *
sp_client_open (const char *path) sp_client_open (const char *path)
{ {
ShmPipe *self = spalloc_new (ShmPipe); ShmPipe *self = spalloc_new (ShmPipe);
struct sockaddr_un sun; struct sockaddr_un sock_un;
memset (self, 0, sizeof (ShmPipe)); memset (self, 0, sizeof (ShmPipe));
@ -754,10 +754,10 @@ sp_client_open (const char *path)
if (self->main_socket < 0) if (self->main_socket < 0)
goto error; goto error;
sun.sun_family = AF_UNIX; sock_un.sun_family = AF_UNIX;
strncpy (sun.sun_path, path, sizeof (sun.sun_path) - 1); strncpy (sock_un.sun_path, path, sizeof (sock_un.sun_path) - 1);
if (connect (self->main_socket, (struct sockaddr *) &sun, if (connect (self->main_socket, (struct sockaddr *) &sock_un,
sizeof (struct sockaddr_un)) < 0) sizeof (struct sockaddr_un)) < 0)
goto error; goto error;