aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2019-10-07 20:25:06 +0200
committerMattias Andrée <maandree@kth.se>2019-10-07 20:25:06 +0200
commitf4c4ba55c74982e03bc41852156dac857d91b06d (patch)
tree581201eac6899473c5b9ec871d0f4b95961c5526
parentChange coding style and fix warnings (diff)
downloadcg-tools-1.4.tar.gz
cg-tools-1.4.tar.bz2
cg-tools-1.4.tar.xz
Minor fixes1.4
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--cg-base.c4
-rw-r--r--cg-limits.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/cg-base.c b/cg-base.c
index d98c9ed..ad03937 100644
--- a/cg-base.c
+++ b/cg-base.c
@@ -572,7 +572,9 @@ main(int argc, char *argv[])
}
opt[0] = *args++;
opt[2] = '\0';
- if ((*opt != '-') && (*opt != '+'))
+ if (*opt != '-' && *opt != '+')
+ break;
+ if (!*args)
break;
while (*args) {
opt[1] = *args++;
diff --git a/cg-limits.c b/cg-limits.c
index 242d46b..8f596f2 100644
--- a/cg-limits.c
+++ b/cg-limits.c
@@ -648,7 +648,7 @@ start(void)
r = update_filter(i, 0);
if (r == -2 || (r == -1 && errno != EAGAIN))
return cleanup(r);
- if (!crtc_updates[i].slaves) {
+ if (crtc_updates[i].slaves) {
for (j = 0; crtc_updates[i].slaves[j]; j++) {
r = update_filter(crtc_updates[i].slaves[j], 0);
if (r == -2 || (r == -1 && errno != EAGAIN))