aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Phillips <dbphillipsnz@gmail.com>2016-07-20 14:05:18 +1200
committerDavid Phillips <dbphillipsnz@gmail.com>2016-07-20 14:05:21 +1200
commitd64c5ff9dea4537d84ab55964c3d6174bf23f3c9 (patch)
treeaa9f2cea1a34a46c6e7a79c17d6cfe2d5708bd2f
parent8a1964d5d52c3acf1127d4e8051e8282634749e4 (diff)
downloadbrightnessd-d64c5ff9dea4537d84ab55964c3d6174bf23f3c9.tar.xz
Fix style of braces and switch/case
-rw-r--r--brightnessd.c57
1 files changed, 22 insertions, 35 deletions
diff --git a/brightnessd.c b/brightnessd.c
index 4afc3ac..68aad05 100644
--- a/brightnessd.c
+++ b/brightnessd.c
@@ -23,21 +23,17 @@
int setup_fifo()
{
struct stat st;
- if (stat(FIFO_PATH, &st) == 0)
- {
- if (remove(FIFO_PATH))
- {
+ if (stat(FIFO_PATH, &st) == 0) {
+ if (remove(FIFO_PATH)) {
perror("remove("FIFO_PATH")");
return 1;
}
}
- if (mkfifo(FIFO_PATH, 0666))
- {
+ if (mkfifo(FIFO_PATH, 0666)) {
perror("mkfifo");
return 1;
}
- if (chmod(FIFO_PATH, 0666))
- {
+ if (chmod(FIFO_PATH, 0666)) {
perror("chmod");
return 1;
}
@@ -51,14 +47,12 @@ int drop_priv()
/* get group (and more) of USER */
p = getpwnam(USER);
- if (p == NULL)
- {
+ if (p == NULL) {
fprintf(stderr, "Failed to get uid and gid of user \""USER"\", bailing\n");
return 1;
}
- if (setgid(p->pw_gid))
- {
+ if (setgid(p->pw_gid)) {
fprintf(stderr, "Failed to set gid to %d\n", p->pw_gid);
perror("setuid");
return 1;
@@ -71,8 +65,7 @@ int drop_priv()
return 1;
}
- if (!setuid(0) || !setgid(0))
- {
+ if (!setuid(0) || !setgid(0)) {
fprintf(stderr, "Got uid 0 or gid 0 back after dropping, bailing\n");
return 1;
}
@@ -112,20 +105,17 @@ int main(int argc, char **argv)
char buffer[BRIGHT_BUFFER_SIZE];
/* Open brightness file */
- if ((f = fopen(BRIGHT_FILE, "w+")) == NULL)
- {
+ if ((f = fopen(BRIGHT_FILE, "w+")) == NULL) {
perror("fopen");
exit(EXIT_FAILURE);
}
- if (setup_fifo())
- {
+ if (setup_fifo()) {
fclose(f);
return 1;
}
- if (drop_priv() != 0)
- {
+ if (drop_priv() != 0) {
fclose(f);
return 1;
}
@@ -140,26 +130,23 @@ int main(int argc, char **argv)
fds.events = POLLIN;
delay = DELAY_INFINITE;
- while(1)
- {
+ while(1) {
poll(&fds, 1, delay);
- if (fds.revents & POLLIN)
- {
+ if (fds.revents & POLLIN) {
delay = DELAY;
nread = read(fifo, buffer, sizeof(buffer));
if (nread == 0)
perror("read");
- switch(buffer[0])
- {
- case '+':
- target += BIG_STEP;
- break;
- case '-':
- target -= BIG_STEP;
- break;
- default:
- target = atoi(buffer);
- break;
+ switch(buffer[0]) {
+ case '+':
+ target += BIG_STEP;
+ break;
+ case '-':
+ target -= BIG_STEP;
+ break;
+ default:
+ target = atoi(buffer);
+ break;
}
target = brightness_within_bounds(target, 1, 255);
}