From 4a474de96b61c44793598870953e203fb624a8bd Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Wed, 22 Jun 2016 13:43:21 +0300 Subject: fix warnings, segfault --- brightnessctl.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'brightnessctl.c') diff --git a/brightnessctl.c b/brightnessctl.c index 6913ffb..f3f939d 100644 --- a/brightnessctl.c +++ b/brightnessctl.c @@ -1,12 +1,10 @@ -#ifdef linux -#define _GNU_SOURCE -#endif #include #include #include #include #include #include +#include #include #include #include @@ -78,15 +76,16 @@ struct params { static struct params p; static const struct option options[] = { + {"class", required_argument, NULL, 'c'}, + {"device", required_argument, NULL, 'd'}, + {"help", no_argument, NULL, 'h'}, {"list", no_argument, NULL, 'l'}, + {"machine-readable", no_argument, NULL, 'm'}, {"quiet", no_argument, NULL, 'q'}, {"pretend", no_argument, NULL, 'p'}, - {"machine-readable", no_argument, NULL, 'm'}, - {"save", no_argument, NULL, 's'}, {"restore", no_argument, NULL, 'r'}, - {"help", no_argument, NULL, 'h'}, - {"class", required_argument, NULL, 'c'}, - {"device", required_argument, NULL, 'd'}, + {"save", no_argument, NULL, 's'}, + {NULL,} }; int main(int argc, char **argv) { @@ -124,7 +123,6 @@ int main(int argc, char **argv) { case 'h': usage(); exit(EXIT_SUCCESS); - break; case 'c': p.class = strdup(optarg); break; @@ -215,7 +213,7 @@ int parse_value(struct value *val, char *str) { n = strtol(str, &buf, 10); if (errno || buf == str) return -1; - val->val = labs(n); + val->val = labs(n) % LONG_MAX; val->v_type = ABSOLUTE; val->d_type = DIRECT; val->sign = PLUS; -- cgit v1.2.3