hiro/bspwm
1
0
Fork 0
mirror of https://github.com/vale981/bspwm synced 2025-03-06 02:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use consistent variable names

Browse source
This commit is contained in:
Bastien Dejean 2017-07-23 10:22:24 +02:00
parent 225561a18d
commit e9f9bedbb5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/bspc.c
View file

@ -35,7 +35,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int fd; int sock_fd;
struct sockaddr_un sock_address; struct sockaddr_un sock_address;
char msg[BUFSIZ], rsp[BUFSIZ]; char msg[BUFSIZ], rsp[BUFSIZ];
@ -46,7 +46,7 @@ int main(int argc, char *argv[])
sock_address.sun_family = AF_UNIX; sock_address.sun_family = AF_UNIX;
char *sp; char *sp;
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) { if ((sock_fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
err("Failed to create the socket.\n"); err("Failed to create the socket.\n");
} }
@ -62,7 +62,7 @@ int main(int argc, char *argv[])
free(host); free(host);
} }
if (connect(fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1) { if (connect(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1) {
err("Failed to connect to the socket.\n"); err("Failed to connect to the socket.\n");
} }
@ -74,14 +74,14 @@ int main(int argc, char *argv[])
msg_len += n; msg_len += n;
} }
if (send(fd, msg, msg_len, 0) == -1) { if (send(sock_fd, msg, msg_len, 0) == -1) {
err("Failed to send the data.\n"); err("Failed to send the data.\n");
} }
int ret = EXIT_SUCCESS, nb; int ret = EXIT_SUCCESS, nb;
struct pollfd fds[] = { struct pollfd fds[] = {
{fd, POLLIN, 0}, {sock_fd, POLLIN, 0},
{STDOUT_FILENO, POLLHUP, 0}, {STDOUT_FILENO, POLLHUP, 0},
}; };
@ -90,7 +90,7 @@ int main(int argc, char *argv[])
break; break;
} }
if (fds[0].revents & POLLIN) { if (fds[0].revents & POLLIN) {
if ((nb = recv(fd, rsp, sizeof(rsp)-1, 0)) > 0) { if ((nb = recv(sock_fd, rsp, sizeof(rsp)-1, 0)) > 0) {
rsp[nb] = '\0'; rsp[nb] = '\0';
if (rsp[0] == FAILURE_MESSAGE[0]) { if (rsp[0] == FAILURE_MESSAGE[0]) {
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
@ -105,6 +105,6 @@ int main(int argc, char *argv[])
} }
} }
close(fd); close(sock_fd);
return ret; return ret;
} }