From 710f7c9e9fad765bfe4c31071a82460c473abee7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 28 Jul 2022 17:30:21 -0700 Subject: gitlab CI: stop requiring Signed-off-by in commits Signed-off-by: Alan Coopersmith --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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: -- cgit v1.2.3 From a318124b38bbfac36f6bfe537839b0d3a9065b94 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 8 Dec 2022 14:45:02 -0800 Subject: Variable scope reduction Signed-off-by: Alan Coopersmith --- xdriinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xdriinfo.c b/xdriinfo.c index c7e7482..1bca9c4 100644 --- a/xdriinfo.c +++ b/xdriinfo.c @@ -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; @@ -179,7 +179,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); -- cgit v1.2.3 From c311687d90564f670e1ec943371c5cab4711f3e3 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 8 Dec 2022 14:47:33 -0800 Subject: Ensure screenNum is always initialized Clears this warning from clang, even though it seems like a false positive, as all the uses are behind the same conditions: xdriinfo.c:117:27: warning: variable 'screenNum' may be uninitialized when used here [-Wconditional-uninitialized] if (func == DRIVER && screenNum == -1) { ^~~~~~~~~ xdriinfo.c:61:28: note: initialize the variable 'screenNum' to silence this warning int nScreens, screenNum; Signed-off-by: Alan Coopersmith --- xdriinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xdriinfo.c b/xdriinfo.c index 1bca9c4..35d7458 100644 --- a/xdriinfo.c +++ b/xdriinfo.c @@ -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) { -- cgit v1.2.3 From 149e46f06a661bd51f3a247dd41a49b553fdca65 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 19 Dec 2022 18:33:43 -0800 Subject: xdriiinfo 1.0.7 Signed-off-by: Alan Coopersmith --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e918893..8ef5619 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]) -- cgit v1.2.3