Re: [Nouveau] Individuals interested in VESA memberships?
On Sat, 2 Nov 2019 at 07:06, Lyude Paul wrote: > Hi! Recently I've been working with the rest of the X.Org board to try to > get > X.org access to VESA memberships so that contributors that don't have an > employer who is able/willing to join VESA can potentially get access to the > various benefits of a VESA membership, such as access to DisplayPort > specifications. Since I need to gather a list of interested X.org members, > I'd > like to know who all might be interested in a membership like this. There > are > no costs involved, as the VESA membership we're looking at in particular > comes > at no cost to us since we're a non-profit. > > The current plan is to extend VESA membership to X.Org members who > specifically request it. If you think you'd be at all interested in this, > or > know any projects or contributors who would be, please feel free to > respond to > this message and let me know! > Hi Lyude, This is super helpful, thank you for advancing this with X.org <> VESA. I would be interested, as recently released nvidia register documentation on crc functionality in the display block removes another roadblock for nouveau testing support in igt-gpu-tools. My time to work on nouveau independently remains limited, so if there's a limit on the number of VESA memberships available -- I'd rather not be at the top of that list over other more active open source contributors. Regards, Rhys > -- > Cheers, > Lyude Paul > > ___ > Nouveau mailing list > nouv...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/nouveau ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xts] xts5: Fix clang error - non-void function 'tet_main' should return a value
On 27 December 2016 at 20:45, Rhys Kidd <rhysk...@gmail.com> wrote: > Amongst examples: > > XDisplayString/Test1.c:151:3: error: non-void function 'tet_main' should > return > a value [-Wreturn-type] > return; > ^ > > Signed-off-by: Rhys Kidd <rhysk...@gmail.com> > Gentle ping. > --- > xts5/Xlib12/XDisplayName/Test1.c | 3 ++- > xts5/Xlib15/XSetWMProperties/Test1.c | 6 -- > xts5/Xlib15/XSetWMProperties/Test2.c | 6 -- > xts5/Xlib17/XGetDefault/Test3.c | 3 ++- > xts5/Xlib17/XGetDefault/Test4.c | 3 ++- > xts5/Xlib17/XGetDefault/Test5.c | 6 -- > xts5/Xlib3/XDisplayString/Test1.c| 8 +--- > xts5/Xlib3/XOpenDisplay/Test1.c | 6 -- > 8 files changed, 27 insertions(+), 14 deletions(-) > > diff --git a/xts5/Xlib12/XDisplayName/Test1.c b/xts5/Xlib12/XDisplayName/ > Test1.c > index a1bb851..e54d926 100644 > --- a/xts5/Xlib12/XDisplayName/Test1.c > +++ b/xts5/Xlib12/XDisplayName/Test1.c > @@ -156,7 +156,8 @@ char*str; > > if((dispstr = getenv("DISPLAY")) == NULL) { > delete("Environment variable DISPLAY is not set."); > - return; > + UNRESOLVED; > + return(False); > } else > CHECK; > > diff --git a/xts5/Xlib15/XSetWMProperties/Test1.c b/xts5/Xlib15/ > XSetWMProperties/Test1.c > index 7c2cf28..6825f2c 100644 > --- a/xts5/Xlib15/XSetWMProperties/Test1.c > +++ b/xts5/Xlib15/XSetWMProperties/Test1.c > @@ -156,7 +156,8 @@ XClassHint rclass_hints; > > if( (res_name = getenv("RESOURCE_NAME")) == NULL) { > delete("RESOURCE_NAME environment variable is not set."); > - return; > + UNRESOLVED; > + return(False); > } else > CHECK; > > @@ -172,7 +173,8 @@ XClassHint rclass_hints; > > if( XGetClassHint(Dsp, win, _hints) == 0 ) { > delete("XGetClassHints returned zero."); > - return; > + UNRESOLVED; > + return(False); > } else > CHECK; > > diff --git a/xts5/Xlib15/XSetWMProperties/Test2.c b/xts5/Xlib15/ > XSetWMProperties/Test2.c > index d52cef3..f94f239 100644 > --- a/xts5/Xlib15/XSetWMProperties/Test2.c > +++ b/xts5/Xlib15/XSetWMProperties/Test2.c > @@ -156,7 +156,8 @@ XClassHint rclass_hints; > > if( getenv("RESOURCE_NAME") != (char *)NULL) { > delete("RESOURCE_NAME environment variable was set to > \"%s\" instead of being undefined."); > - return; > + UNRESOLVED; > + return(False); > } else > CHECK; > > @@ -172,7 +173,8 @@ XClassHint rclass_hints; > > if( XGetClassHint(Dsp, win, _hints) == 0 ) { > delete("XGetClassHints returned zero."); > - return; > + UNRESOLVED; > + return(False); > } else > CHECK; > > diff --git a/xts5/Xlib17/XGetDefault/Test3.c b/xts5/Xlib17/XGetDefault/ > Test3.c > index 05ba128..14542b6 100644 > --- a/xts5/Xlib17/XGetDefault/Test3.c > +++ b/xts5/Xlib17/XGetDefault/Test3.c > @@ -151,7 +151,8 @@ char*pval="XTest.testval31:pval_a\ > nXTest.testval32:pval_b\nXTest.testval33:pva > > if(getenv("HOME") == NULL) { > delete("Environment variable \"HOME\" is not set."); > - return; > + UNRESOLVED; > + return(False); > } else > CHECK; > > diff --git a/xts5/Xlib17/XGetDefault/Test4.c b/xts5/Xlib17/XGetDefault/ > Test4.c > index 958fa91..5c53dd7 100644 > --- a/xts5/Xlib17/XGetDefault/Test4.c > +++ b/xts5/Xlib17/XGetDefault/Test4.c > @@ -154,7 +154,8 @@ static char*result[] = { "pVAL_1", > "eVAL_5","eVAL_6" }; > > if(getenv("XENVIRONMENT") == NULL) { > delete("XENVIRONMENT environment variable not set."); > - return; > + UNRESOLVED; > + return(False); > } else > CHECK; > > diff --git a/xts5/Xlib17/XGetDefault/Test5.c b/xts5/Xlib17/XGetDefault/ > Test5.c > index 628ba7d..5e506ae 100644 > --- a/xts5/Xlib17/XGetDefault/Test5.c > +++ b/xts5/Xlib17/XGetDefault/Test5.c > @@ -157,13 +157,15 @@ staticchar*result[] = { "pVAL_1", > "hVAL_5","hVAL_6" , "hVAL_7
[PATCH xts] xts5: Fix clang error - non-void function 'tet_main' should return a value
Amongst examples: XDisplayString/Test1.c:151:3: error: non-void function 'tet_main' should return a value [-Wreturn-type] return; ^ Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- xts5/Xlib12/XDisplayName/Test1.c | 3 ++- xts5/Xlib15/XSetWMProperties/Test1.c | 6 -- xts5/Xlib15/XSetWMProperties/Test2.c | 6 -- xts5/Xlib17/XGetDefault/Test3.c | 3 ++- xts5/Xlib17/XGetDefault/Test4.c | 3 ++- xts5/Xlib17/XGetDefault/Test5.c | 6 -- xts5/Xlib3/XDisplayString/Test1.c| 8 +--- xts5/Xlib3/XOpenDisplay/Test1.c | 6 -- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/xts5/Xlib12/XDisplayName/Test1.c b/xts5/Xlib12/XDisplayName/Test1.c index a1bb851..e54d926 100644 --- a/xts5/Xlib12/XDisplayName/Test1.c +++ b/xts5/Xlib12/XDisplayName/Test1.c @@ -156,7 +156,8 @@ char*str; if((dispstr = getenv("DISPLAY")) == NULL) { delete("Environment variable DISPLAY is not set."); - return; + UNRESOLVED; + return(False); } else CHECK; diff --git a/xts5/Xlib15/XSetWMProperties/Test1.c b/xts5/Xlib15/XSetWMProperties/Test1.c index 7c2cf28..6825f2c 100644 --- a/xts5/Xlib15/XSetWMProperties/Test1.c +++ b/xts5/Xlib15/XSetWMProperties/Test1.c @@ -156,7 +156,8 @@ XClassHint rclass_hints; if( (res_name = getenv("RESOURCE_NAME")) == NULL) { delete("RESOURCE_NAME environment variable is not set."); - return; + UNRESOLVED; + return(False); } else CHECK; @@ -172,7 +173,8 @@ XClassHint rclass_hints; if( XGetClassHint(Dsp, win, _hints) == 0 ) { delete("XGetClassHints returned zero."); - return; + UNRESOLVED; + return(False); } else CHECK; diff --git a/xts5/Xlib15/XSetWMProperties/Test2.c b/xts5/Xlib15/XSetWMProperties/Test2.c index d52cef3..f94f239 100644 --- a/xts5/Xlib15/XSetWMProperties/Test2.c +++ b/xts5/Xlib15/XSetWMProperties/Test2.c @@ -156,7 +156,8 @@ XClassHint rclass_hints; if( getenv("RESOURCE_NAME") != (char *)NULL) { delete("RESOURCE_NAME environment variable was set to \"%s\" instead of being undefined."); - return; + UNRESOLVED; + return(False); } else CHECK; @@ -172,7 +173,8 @@ XClassHint rclass_hints; if( XGetClassHint(Dsp, win, _hints) == 0 ) { delete("XGetClassHints returned zero."); - return; + UNRESOLVED; + return(False); } else CHECK; diff --git a/xts5/Xlib17/XGetDefault/Test3.c b/xts5/Xlib17/XGetDefault/Test3.c index 05ba128..14542b6 100644 --- a/xts5/Xlib17/XGetDefault/Test3.c +++ b/xts5/Xlib17/XGetDefault/Test3.c @@ -151,7 +151,8 @@ char *pval="XTest.testval31:pval_a\nXTest.testval32:pval_b\nXTest.testval33:pva if(getenv("HOME") == NULL) { delete("Environment variable \"HOME\" is not set."); - return; + UNRESOLVED; + return(False); } else CHECK; diff --git a/xts5/Xlib17/XGetDefault/Test4.c b/xts5/Xlib17/XGetDefault/Test4.c index 958fa91..5c53dd7 100644 --- a/xts5/Xlib17/XGetDefault/Test4.c +++ b/xts5/Xlib17/XGetDefault/Test4.c @@ -154,7 +154,8 @@ static char*result[] = { "pVAL_1","eVAL_5", "eVAL_6" }; if(getenv("XENVIRONMENT") == NULL) { delete("XENVIRONMENT environment variable not set."); - return; + UNRESOLVED; + return(False); } else CHECK; diff --git a/xts5/Xlib17/XGetDefault/Test5.c b/xts5/Xlib17/XGetDefault/Test5.c index 628ba7d..5e506ae 100644 --- a/xts5/Xlib17/XGetDefault/Test5.c +++ b/xts5/Xlib17/XGetDefault/Test5.c @@ -157,13 +157,15 @@ staticchar*result[] = { "pVAL_1","hVAL_5", "hVAL_6" , "hVAL_7"}; if(getenv("XENVIRONMENT") != NULL) { delete("XENVIRONMENT environment variable was set."); - return; + UNRESOLVED; + return(False); } else CHECK; if(getenv("HOME") == NULL) { delete("HOME environment variable was not set."); - return; + UNRESOLVED; + return(False); } else CHECK; diff --git a/xts5/Xlib3/XDisplayString/Test1.c b/xts5/Xlib3/XDisplayString/Test1.c index 119d790..d6bce99 100644 --- a/xts5/Xlib3/XDisplayString/Test1.c +
[PATCH xts v2] xts5: Fix clang error - non-void function 'outfile' should return a value
files.c:267:3: error: non-void function 'outfile' should return a value [-Wreturn-type] return; ^ v2: Correct declaration (Peter Hutterer) --- xts5/src/bin/mc/files.c | 2 +- xts5/src/bin/mc/mcproto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xts5/src/bin/mc/files.c b/xts5/src/bin/mc/files.c index ee88a40..a9198e1 100644 --- a/xts5/src/bin/mc/files.c +++ b/xts5/src/bin/mc/files.c @@ -236,7 +236,7 @@ char *tmpfile; * Combine all the files in the right order onto * stdout. */ -outfile(fp) +void outfile(fp) FILE *fp; { static FILE*fout; diff --git a/xts5/src/bin/mc/mcproto.h b/xts5/src/bin/mc/mcproto.h index 32dd711..16df294 100644 --- a/xts5/src/bin/mc/mcproto.h +++ b/xts5/src/bin/mc/mcproto.h @@ -105,7 +105,7 @@ void mepcomment(char *buf); FILE *nextfile(struct mclist *sources); void outcopy(char *file); FILE *cretmpfile(char *file, char **crefile); -int outfile(FILE *fp); +void outfile(FILE *fp); int remfiles(void); int includefile(char *file, char *bp); void filetemp(char *name); -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xts] xts5: Fix clang warning - non-void function 'outfile' should return a value
On Sun, Nov 13, 2016 at 1:50 PM Rhys Kidd <rhysk...@gmail.com> wrote: > files.c:267:3: error: non-void function 'outfile' should return a value > [-Wreturn-type] > return; > ^ > > Signed-off-by: Rhys Kidd <rhysk...@gmail.com> > --- > xts5/src/bin/mc/files.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xts5/src/bin/mc/files.c b/xts5/src/bin/mc/files.c > index ee88a40..a9198e1 100644 > --- a/xts5/src/bin/mc/files.c > +++ b/xts5/src/bin/mc/files.c > @@ -236,7 +236,7 @@ char *tmpfile; > * Combine all the files in the right order onto > * stdout. > */ > -outfile(fp) > +void outfile(fp) > FILE *fp; > { > static FILE*fout; > -- > 2.9.3 > > Gentle ping. ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xserver] test: Fix stray Makefile reference to removed os test
On Fri, Oct 28, 2016 at 8:27 PM Keith Packard <kei...@keithp.com> wrote: > Rhys Kidd <rhysk...@gmail.com> writes: > > > Fixes the following warning: > > > > test/Makefile.am:69: warning: variable 'os_LDADD' is defined but no > program or > > test/Makefile.am:69: library has 'os' as canonical name (possible typo) > > > > Introduced upon the removal of test/os in: > > > > commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 > > Author: Keith Packard <kei...@keithp.com> > > Date: Tue Dec 8 14:39:46 2015 -0800 > > > > Remove SIGIO support for input [v5] > > > > This removes all of the SIGIO handling support used for input > > throughout the X server, preparing the way for using threads for > input > > handling instead. > > > > Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls > > to stub functions input_lock/input_unlock so that we don't lose this > > information. > > > > xfree86 SIGIO support is reworked to use internal versions of > > OsBlockSIGIO and OsReleaseSIGIO. > > > > v2: Don't change locking order (Peter Hutterer) > > v3: Comment weird && FALSE in xf86Helper.c > > Leave errno save/restore in xf86ReadInput > > Squash with stub adding patch (Peter Hutterer) > > v4: Leave UseSIGIO config parameter so that > > existing config files don't break (Peter Hutterer) > > v5: Split a couple of independent patch bits out > > of kinput.c (Peter Hutterer) > > > > Signed-off-by: Keith Packard <kei...@keithp.com> > > Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> > > > > Signed-off-by: Rhys Kidd <rhysk...@gmail.com> > > Reviewed-by: Keith Packard <kei...@keithp.com> > > (we'll wait until after 1.19 to merge this to master) > > -- > -keith > Gentle ping now that 1.19 is out. ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xts] xts5: Fix clang warning - non-void function 'outfile' should return a value
files.c:267:3: error: non-void function 'outfile' should return a value [-Wreturn-type] return; ^ Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- xts5/src/bin/mc/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xts5/src/bin/mc/files.c b/xts5/src/bin/mc/files.c index ee88a40..a9198e1 100644 --- a/xts5/src/bin/mc/files.c +++ b/xts5/src/bin/mc/files.c @@ -236,7 +236,7 @@ char *tmpfile; * Combine all the files in the right order onto * stdout. */ -outfile(fp) +void outfile(fp) FILE *fp; { static FILE*fout; -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xts] Don't sleep(2) at the beginning of Xt test setup
On Wednesday, November 2, 2016, Eric Anholtwrote: > Adam Jackson > writes: > > > Regeneration is fast enough these days, we can skip this. This > > eliminates about 40 minutes of wall time from a full xts run. > > If not sleeping is a problem, we should figure out a way to make > regeneration not racy. Sleeps aren't OK. I'd be willing to take a look at those issues. As you might have guessed Eric from my recent commits, I'm working on bringing up clang support for your Travis-CI harness to run xserver / xts. > > Reviewed-by: Eric Anholt > > ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xts 2/3] xts5: Fix missing variable for format specifier
On 29 October 2016 at 16:45, walter harms <wha...@bfs.de> wrote: > > > Am 29.10.2016 05:37, schrieb Rhys Kidd: > > XtRemoveEventHandler.c:458:3: warning: format '%d' expects a matching > 'int' argument [-Wformat=] > >sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); > >^ > > XtRemoveEventHandler.c:463:3: warning: format '%d' expects a matching > 'int' argument [-Wformat=] > >sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); > >^ > > XtRemoveEventHandler.c:540:3: warning: format '%d' expects a matching > 'int' argument [-Wformat=] > >sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); > >^ > > XtRemoveEventHandler.c:545:3: warning: format '%d' expects a matching > 'int' argument [-Wformat=] > >sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); > >^ > > > > Signed-off-by: Rhys Kidd <rhysk...@gmail.com> > > --- > > xts5/Xt9/XtRemoveEventHandler.m | 16 > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/xts5/Xt9/XtRemoveEventHandler.m b/xts5/Xt9/ > XtRemoveEventHandler.m > > index 1851ef9..6e6cbbe 100644 > > --- a/xts5/Xt9/XtRemoveEventHandler.m > > +++ b/xts5/Xt9/XtRemoveEventHandler.m > > @@ -425,13 +425,13 @@ int invoked = 0; > > XtAppMainLoop(app_ctext); > > LKROF(pid2, AVSXTTIMEOUT-2); > > tet_infoline("TEST: Error message was not emitted"); > > - if (avs_get_event(3) != 0) { > > - sprintf(ebuf, "ERROR: Error message handler was invoked %d > times"); > > + if (invoked = avs_get_event(3) != 0) { > > + sprintf(ebuf, "ERROR: Error message handler was invoked %d > times", invoked); > > tet_infoline(ebuf); > > tet_result(TET_FAIL); > > } > > IMHO this is to complicated. what is wrong with: > > invoked = avs_get_event(3); > if (invoked != 0) { > sprintf(ebuf, "ERROR: Error message handler was invoked %d > times", invoked); > tet_infoline(ebuf); > tet_result(TET_FAIL); > } > > > Hello Walter, thanks for your review. As an early patch from me, I preferred to keep consistent with the pattern adopted in this part of the code base -- rather than changing the pattern via refactoring at the same time as making the bug fix. e.g. you can see another example here: xts5/XtC/XtSetSelectionTimeout.m I'd prefer to keep this patch as is in this respect. There's nothing stopping a follow-up patch making your suggested changes. > > > - if (avs_get_event(2) != 0) { > > - sprintf(ebuf, "ERROR: Warning message handler was invoked > %d times"); > > + if (invoked = avs_get_event(2) != 0) { > > + sprintf(ebuf, "ERROR: Warning message handler was invoked > %d times", invoked); > > tet_infoline(ebuf); > > tet_result(TET_FAIL); > > } > > > btw: this is the same msg als with avs_get_event(3). I have no clue what > the differenz is > but maybe it should be reflected in the errmsg. > > There's a subtle difference. - The errmsg associated with avs_get_event(2) includes the text "*Warning* message handler" - The errmsg associated with avs_get_event(3) includes the text "*Error* message handler..." If there is a problem with the existing approach, which is a pattern throughout this area of the code, then I'd prefer it is addressed in a subsequent patch. Accordingly, can I seek your Reviewed-by? Regards, Rhys > just my 2 cents, > > re, > wh > > > > @@ -491,13 +491,13 @@ int invoked = 0; > > tet_result(TET_FAIL); > > } > > tet_infoline("TEST: Error message was not emitted"); > > - if (avs_get_event(3) != 0) { > > - sprintf(ebuf, "ERROR: Error message handler was invoked %d > times"); > > + if (invoked = avs_get_event(3) != 0) { > > + sprintf(ebuf, "ERROR: Error message handler was invoked %d > times", invoked); > > tet_infoline(ebuf); > > tet_result(TET_FAIL); > > } > > - if (avs_get_event(2) != 0) { > > - sprintf(ebuf, "ERROR: Warning message handler was invoked > %d times"); > > + if (invoked = avs_get_event(2) != 0) { > > + sprintf(ebuf, "ERROR: Warning message handler was invoked > %d times", invoked); > > tet_infoline(ebuf); > > tet_result(TET_FAIL); > > } > ___ > xorg-devel@lists.x.org: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: https://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xts] xts5: Fix clang warning - non-void function FillArea should return a value
Scrollbar.c:282:21: error: non-void function 'FillArea' should return a value [-Wreturn-type] if (bottom < 0) return; ^ Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- xts5/src/libXtaw/Scrollbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xts5/src/libXtaw/Scrollbar.c b/xts5/src/libXtaw/Scrollbar.c index c5ed7f1..5c783d6 100644 --- a/xts5/src/libXtaw/Scrollbar.c +++ b/xts5/src/libXtaw/Scrollbar.c @@ -272,7 +272,7 @@ static float FractionLoc(w, x, y) } -static FillArea(w, top, bottom, thumb) +static void FillArea(w, top, bottom, thumb) ScrollbarWidget w; Position top, bottom; int thumb; -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xts 1/3] xts5: Fix missing variable for format specifier
XtGetKeysymTable.c:258:5: warning: format '%ld' expects a matching 'long int' argument [-Wformat=] Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- xts5/Xt12/XtGetKeysymTable.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xts5/Xt12/XtGetKeysymTable.m b/xts5/Xt12/XtGetKeysymTable.m index db22f1b..1d8ab91 100644 --- a/xts5/Xt12/XtGetKeysymTable.m +++ b/xts5/Xt12/XtGetKeysymTable.m @@ -209,7 +209,7 @@ Xlib returns to what Xt returns*/ for (i = min_keycode; i <= max_keycode; i++ ) { if (keysym_good[i] == NoSymbol) { if (keysym_return[i] != NoSymbol) { - sprintf(ebuf, "ERROR: min_keycode + %d should be NoSymbol, is %ld", (long)keysym_return[i]); + sprintf(ebuf, "ERROR: min_keycode + %d should be NoSymbol, is %ld", i, (long)keysym_return[i]); tet_infoline(ebuf); tet_result(TET_FAIL); } -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xts 2/3] xts5: Fix missing variable for format specifier
XtRemoveEventHandler.c:458:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); ^ XtRemoveEventHandler.c:463:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); ^ XtRemoveEventHandler.c:540:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); ^ XtRemoveEventHandler.c:545:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); ^ Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- xts5/Xt9/XtRemoveEventHandler.m | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xts5/Xt9/XtRemoveEventHandler.m b/xts5/Xt9/XtRemoveEventHandler.m index 1851ef9..6e6cbbe 100644 --- a/xts5/Xt9/XtRemoveEventHandler.m +++ b/xts5/Xt9/XtRemoveEventHandler.m @@ -425,13 +425,13 @@ int invoked = 0; XtAppMainLoop(app_ctext); LKROF(pid2, AVSXTTIMEOUT-2); tet_infoline("TEST: Error message was not emitted"); - if (avs_get_event(3) != 0) { - sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); + if (invoked = avs_get_event(3) != 0) { + sprintf(ebuf, "ERROR: Error message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } - if (avs_get_event(2) != 0) { - sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); + if (invoked = avs_get_event(2) != 0) { + sprintf(ebuf, "ERROR: Warning message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } @@ -491,13 +491,13 @@ int invoked = 0; tet_result(TET_FAIL); } tet_infoline("TEST: Error message was not emitted"); - if (avs_get_event(3) != 0) { - sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); + if (invoked = avs_get_event(3) != 0) { + sprintf(ebuf, "ERROR: Error message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } - if (avs_get_event(2) != 0) { - sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); + if (invoked = avs_get_event(2) != 0) { + sprintf(ebuf, "ERROR: Warning message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xts 3/3] xts5: Fix missing variable for format specifier
XtRemoveRawEventHandler.c:396:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); ^ XtRemoveRawEventHandler.c:401:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); ^ XtRemoveRawEventHandler.c:478:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); ^ XtRemoveRawEventHandler.c:483:3: warning: format '%d' expects a matching 'int' argument [-Wformat=] sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); ^ Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- xts5/Xt9/XtRemoveRawEventHandler.m | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xts5/Xt9/XtRemoveRawEventHandler.m b/xts5/Xt9/XtRemoveRawEventHandler.m index 0a3f916..87dc286 100644 --- a/xts5/Xt9/XtRemoveRawEventHandler.m +++ b/xts5/Xt9/XtRemoveRawEventHandler.m @@ -374,13 +374,13 @@ int invoked = 0; XtAppMainLoop(app_ctext); LKROF(pid2, AVSXTTIMEOUT-2); tet_infoline("TEST: Error message was not emitted"); - if (avs_get_event(3) != 0) { - sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); + if (invoked = avs_get_event(3) != 0) { + sprintf(ebuf, "ERROR: Error message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } - if (avs_get_event(2) != 0) { - sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); + if (invoked = avs_get_event(2) != 0) { + sprintf(ebuf, "ERROR: Warning message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } @@ -440,13 +440,13 @@ int invoked = 0; tet_result(TET_FAIL); } tet_infoline("TEST: Error message was not emitted"); - if (avs_get_event(3) != 0) { - sprintf(ebuf, "ERROR: Error message handler was invoked %d times"); + if (invoked = avs_get_event(3) != 0) { + sprintf(ebuf, "ERROR: Error message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } - if (avs_get_event(2) != 0) { - sprintf(ebuf, "ERROR: Warning message handler was invoked %d times"); + if (invoked = avs_get_event(2) != 0) { + sprintf(ebuf, "ERROR: Warning message handler was invoked %d times", invoked); tet_infoline(ebuf); tet_result(TET_FAIL); } -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xts] xts5: Fix format specifier type warning in XtSetSelectionTimeout
XtSetSelectionTimeout.c: In function: XtSetSelectionTimeout.c:90:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=] sprintf(ebuf, "ERROR: Expected 5000 received %d", value_good); ^ XtSetSelectionTimeout.c:98:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=] sprintf(ebuf, "ERROR: Expected 1 received %d", value_good); ^ Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- xts5/XtC/XtSetSelectionTimeout.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xts5/XtC/XtSetSelectionTimeout.m b/xts5/XtC/XtSetSelectionTimeout.m index dbaf75c..4e97513 100644 --- a/xts5/XtC/XtSetSelectionTimeout.m +++ b/xts5/XtC/XtSetSelectionTimeout.m @@ -81,7 +81,7 @@ pid_t pid2; XtRealizeWidget(topLevel); tet_infoline("TEST: Verify the default"); if ((value_good = XtGetSelectionTimeout()) != (unsigned int)5000){ - sprintf(ebuf, "ERROR: Expected 5000 received %d", value_good); + sprintf(ebuf, "ERROR: Expected 5000 received %lu", value_good); tet_infoline(ebuf); tet_result(TET_FAIL); } @@ -89,7 +89,7 @@ pid_t pid2; XtSetSelectionTimeout((unsigned int )1); tet_infoline("TEST: selectionTimeout is 1 milliseconds"); if ((value_good = XtGetSelectionTimeout()) != (unsigned int)1){ - sprintf(ebuf, "ERROR: Expected 1 received %d", value_good); + sprintf(ebuf, "ERROR: Expected 1 received %lu", value_good); tet_infoline(ebuf); tet_result(TET_FAIL); } -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xserver] test: Fix stray Makefile reference to removed os test
Fixes the following warning: test/Makefile.am:69: warning: variable 'os_LDADD' is defined but no program or test/Makefile.am:69: library has 'os' as canonical name (possible typo) Introduced upon the removal of test/os in: commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 Author: Keith Packard <kei...@keithp.com> Date: Tue Dec 8 14:39:46 2015 -0800 Remove SIGIO support for input [v5] This removes all of the SIGIO handling support used for input throughout the X server, preparing the way for using threads for input handling instead. Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls to stub functions input_lock/input_unlock so that we don't lose this information. xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO and OsReleaseSIGIO. v2: Don't change locking order (Peter Hutterer) v3: Comment weird && FALSE in xf86Helper.c Leave errno save/restore in xf86ReadInput Squash with stub adding patch (Peter Hutterer) v4: Leave UseSIGIO config parameter so that existing config files don't break (Peter Hutterer) v5: Split a couple of independent patch bits out of kinput.c (Peter Hutterer) Signed-off-by: Keith Packard <kei...@keithp.com> Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Signed-off-by: Rhys Kidd <rhysk...@gmail.com> --- test/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Makefile.am b/test/Makefile.am index c89915c..b8a0f4d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -66,7 +66,6 @@ xfree86_LDADD=$(TEST_LDADD) touch_LDADD=$(TEST_LDADD) signal_logging_LDADD=$(TEST_LDADD) hashtabletest_LDADD=$(TEST_LDADD) -os_LDADD=$(TEST_LDADD) libxservertest_la_LIBADD = $(XSERVER_LIBS) if XORG -- 2.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel