mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol-native: small cleanups

Browse source 
Style fixes.
Use new variable for fd to avoid casts.
Generate an error when  the fd is invalid.
This commit is contained in:
Wim Taymans 2022-08-17 19:56:52 +02:00
parent 0883a0163b
commit 0532d194ad
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/module-protocol-native.c
View file

@ -765,35 +765,37 @@ socket_data(void *data, int fd, uint32_t mask)
} }
} }
static int write_socket_address(struct server *s) { static int write_socket_address(struct server *s)
{
long v; long v;
int res = 0; int fd, res = 0;
char *endptr; char *endptr;
const char *env = getenv("PIPEWIRE_NOTIFICATION_FD"); const char *env = getenv("PIPEWIRE_NOTIFICATION_FD");
if (env == NULL || env[0] == '\0') { if (env == NULL || env[0] == '\0')
return 0; return 0;
}
errno = 0; errno = 0;
v = strtol(env, &endptr, 10); v = strtol(env, &endptr, 10);
if (endptr[0] != '\0') { if (endptr[0] != '\0')
errno = EINVAL; errno = EINVAL;
}
if (errno != 0) { if (errno != 0) {
res = -errno; res = -errno;
pw_log_error("server %p: strtol() failed with error: %m", s); pw_log_error("server %p: strtol() failed with error: %m", s);
goto error; goto error;
} }
if (v != (int)v) fd = (int)v;
return 0; if (v != fd) {
res = -ERANGE;
if (dprintf((int)v, "%s\n", s->addr.sun_path) < 0) { pw_log_error("server %p: invalid fd %ld: %s", s, v, spa_strerror(res));
goto error;
}
if (dprintf(fd, "%s\n", s->addr.sun_path) < 0) {
res = -errno; res = -errno;
pw_log_error("server %p: dprintf() failed with error: %m", s); pw_log_error("server %p: dprintf() failed with error: %m", s);
goto error; goto error;
} }
close((int)v); close(fd);
unsetenv("PIPEWIRE_NOTIFICATION_FD"); unsetenv("PIPEWIRE_NOTIFICATION_FD");
return 0; return 0;
@ -857,7 +859,8 @@ static int add_socket(struct pw_protocol *protocol, struct server *s)
res = write_socket_address(s); res = write_socket_address(s);
if (res < 0) { if (res < 0) {
pw_log_error("server %p: failed to write socket address", s); pw_log_error("server %p: failed to write socket address: %s", s,
spa_strerror(res));
goto error_close; goto error_close;
} }
s->activated = activated; s->activated = activated;