diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | xdriinfo.c | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b99b4bc..063bd49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,14 +35,14 @@ variables: # -# Verify that commit messages are as expected, signed-off, etc. +# Verify that commit messages are as expected # check-commits: extends: - .fdo.ci-fairy stage: prep script: - - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + - ci-fairy check-commits --junit-xml=results.xml except: - master@xorg/app/xdriinfo variables: diff --git a/configure.ac b/configure.ac index 37a479d..3dcf488 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xdriinfo], [1.0.6], - [https://gitlab.freedesktop.org/xorg/app/xdriinfo/issues], [xdriinfo]) +AC_INIT([xdriinfo], [1.0.7], + [https://gitlab.freedesktop.org/xorg/app/xdriinfo/-/issues], [xdriinfo]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -58,7 +58,7 @@ void printUsage (void) { int main (int argc, char *argv[]) { Display *dpy; - int nScreens, screenNum, i; + int nScreens, screenNum; enum INFO_FUNC func = LIST; char *funcArg = NULL; char *dpyName = NULL; @@ -71,7 +71,7 @@ int main (int argc, char *argv[]) { } /* parse the command line */ - for (i = 1; i < argc; ++i) { + for (int i = 1; i < argc; ++i) { char **argPtr = NULL; if (!strcmp (argv[i], "-display")) argPtr = &dpyName; @@ -112,6 +112,8 @@ int main (int argc, char *argv[]) { return 1; } } + else + screenNum = -1; /* driver command needs a valid screen number */ if (func == DRIVER && screenNum == -1) { @@ -179,7 +181,7 @@ int main (int argc, char *argv[]) { break; } case LIST: - for (i = 0; i < nScreens; ++i) { + for (int i = 0; i < nScreens; ++i) { const char *name = (*GetScreenDriver) (dpy, i); if (name) printf ("Screen %d: %s\n", i, name); |