re: Removing a superfluous warning from xf86-input-ws/dist/src/ws.c
> On Mon 05 Feb 2024 at 10:18:09 +1100, matthew green wrote: > > perhaps convert into a DBG(4, ...)? > > On Mon 05 Feb 2024 at 02:20:25 +0300, Valery Ushakov wrote: > > May be make it reported only once, so that the message is still there > > in the log, but it's not spammed uselessly, adding no new information? > > I think I like the second suggestion slightly better, so I'll go with > that. I'll do a test build first, even though it seems trivial. I didn't > do a build in a while anyway... i like this. thanks. .mrg.
daily CVS update output
Updating src tree: P src/sbin/gpt/resizedisk.c P src/sys/dev/usb/ehci.c P src/sys/dev/usb/ehcireg.h P src/usr.bin/xlint/lint1/Makefile P src/usr.bin/xlint/lint1/check-msgs.lua P src/usr.bin/xlint/lint1/err.c P src/usr.bin/xlint/lint1/makeman Updating xsrc tree: Killing core files: Updating release-8 src tree (netbsd-8): Updating release-8 xsrc tree (netbsd-8): Updating release-9 src tree (netbsd-9): Updating release-9 xsrc tree (netbsd-9): Updating release-10 src tree (netbsd-10): P doc/3RDPARTY U doc/CHANGES-10.0 P external/gpl2/groff/tmac/mdoc.local P external/public-domain/tz/dist/Makefile P external/public-domain/tz/dist/NEWS U external/public-domain/tz/dist/TZDATA_VERSION P external/public-domain/tz/dist/africa P external/public-domain/tz/dist/asia P external/public-domain/tz/dist/australasia P external/public-domain/tz/dist/checknow.awk P external/public-domain/tz/dist/etcetera P external/public-domain/tz/dist/europe U external/public-domain/tz/dist/leap-seconds.list P external/public-domain/tz/dist/leapseconds P external/public-domain/tz/dist/leapseconds.awk P external/public-domain/tz/dist/northamerica P external/public-domain/tz/dist/southamerica P external/public-domain/tz/dist/theory.html U external/public-domain/tz/dist/version P external/public-domain/tz/dist/zishrink.awk P external/public-domain/tz/dist/zonenow.tab P sys/arch/evbppc/wii/dev/wiifb.c P sys/dev/pci/ppb.c P sys/dev/usb/ehci.c P sys/dev/usb/ehcireg.h P sys/sys/param.h P usr.bin/rpcinfo/rpcinfo.c Updating release-10 xsrc tree (netbsd-10): Updating file list: -rw-rw-r-- 1 srcmastr netbsd 44876342 Feb 7 03:14 ls-lRA.gz
Re: Removing a superfluous warning from xf86-input-ws/dist/src/ws.c
On Mon 05 Feb 2024 at 20:57:11 +0100, Rhialto wrote:
> I think I like the second suggestion slightly better, so I'll go with
> that. I'll do a test build first, even though it seems trivial. I didn't
> do a build in a while anyway...
I'll commit this then, if that looks ok. (I'm asking to double-check
since this isn't my usual area of committing - I test-compiled it but
unfortunately the build for -current doesn't drop in into 10.0RC3 as I
have it installed)
Index: ws.c
===
RCS file: /cvsroot/xsrc/external/mit/xf86-input-ws/dist/src/ws.c,v
retrieving revision 1.16
diff -u -r1.16 ws.c
--- ws.c4 Dec 2021 15:21:55 - 1.16
+++ ws.c6 Feb 2024 17:40:57 -
@@ -747,7 +747,9 @@
dw = 0;
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
- if (hscroll || vscroll) {
+ static int warned = 0;
+ if ((hscroll || vscroll) && !warned) {
+ warned = 1;
xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
pInfo->name, hscroll, vscroll);
valuator_mask_zero(priv->scroll_mask);
-Olaf.
--
___ Olaf 'Rhialto' Seibert
\X/ There is no AI. There is just someone else's work. --I. Rose
signature.asc
Description: PGP signature
