Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xscope for openSUSE:Factory checked in at 2022-07-11 19:10:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscope (Old) and /work/SRC/openSUSE:Factory/.xscope.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscope" Mon Jul 11 19:10:08 2022 rev:9 rq:988390 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xscope/xscope.changes 2021-12-08 00:00:28.851589834 +0100 +++ /work/SRC/openSUSE:Factory/.xscope.new.1523/xscope.changes 2022-07-11 19:11:23.875782898 +0200 @@ -1,0 +2,13 @@ +Mon Jul 11 13:24:24 UTC 2022 - Stefan Dirsch <[email protected]> + +- Update to version 1.4.3 + * On OpenBSD SO_PEERCRED uses struct sockpeercred + * Remove/comment out unused variables. + * Match format strings with arguments. + * ifdef out unused static functions + * Use correct argument type for ctype(3) functions. + * Increase buffer length to avoid truncation. + * Add casts to fix signedness change warnings. + * Mark MainLoop as _X_NORETURN. + +------------------------------------------------------------------- Old: ---- xscope-1.4.2.tar.xz New: ---- xscope-1.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscope.spec ++++++ --- /var/tmp/diff_new_pack.8m8uZB/_old 2022-07-11 19:11:24.183783344 +0200 +++ /var/tmp/diff_new_pack.8m8uZB/_new 2022-07-11 19:11:24.191783356 +0200 @@ -1,7 +1,7 @@ # # spec file for package xscope # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xscope -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: Utility to monitor X11/Client conversations License: MIT @@ -48,7 +48,8 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README.md +%doc AUTHORS ChangeLog NEWS README.md +%license COPYING %{_bindir}/xscope %{_mandir}/man1/xscope.1%{?ext_man} ++++++ xscope-1.4.2.tar.xz -> xscope-1.4.3.tar.xz ++++++ ++++ 22026 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/ChangeLog new/xscope-1.4.3/ChangeLog --- old/xscope-1.4.2/ChangeLog 2021-12-07 01:52:17.000000000 +0100 +++ new/xscope-1.4.3/ChangeLog 2022-07-11 01:06:43.000000000 +0200 @@ -1,3 +1,75 @@ +commit 228e50fe0578c747029a7af00be18c346100f76c +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 10 16:04:26 2022 -0700 + + xscope 1.4.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d94dd2b9dd161ac32bf37d5b110d6b6dcc1c541f +Author: Matthieu Herrb <[email protected]> +Date: Sun May 1 19:02:20 2022 +0200 + + On OpenBSD SO_PEERCRED uses struct sockpeercred + + Signed-off-by: Matthieu Herrb <[email protected]> + +commit cc298d1f559240976344588f9f765ee60ca3d6f3 +Author: Thomas Klausner <[email protected]> +Date: Tue Dec 7 20:47:21 2021 +0100 + + Mark MainLoop as _X_NORETURN. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 01280ca64a96939e18447f075e3c7199e3ddd0d0 +Author: Thomas Klausner <[email protected]> +Date: Tue Dec 7 08:59:18 2021 +0100 + + Add casts to fix signedness change warnings. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6cbd46bb766532362bec6b8eb1fdcaa1fb658ba1 +Author: Thomas Klausner <[email protected]> +Date: Tue Dec 7 08:59:17 2021 +0100 + + Increase buffer length to avoid truncation. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d09f1c6fafe75cac58409d026d7e6d43112f0d97 +Author: Thomas Klausner <[email protected]> +Date: Tue Dec 7 08:59:16 2021 +0100 + + Use correct argument type for ctype(3) functions. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d1214f20d5a946a461624b894678b155ed02d906 +Author: Thomas Klausner <[email protected]> +Date: Tue Dec 7 08:59:15 2021 +0100 + + ifdef out unused static functions + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 43c6dc5894e6f64d6efaae7fd572fda00559cfdd +Author: Thomas Klausner <[email protected]> +Date: Tue Dec 7 08:59:14 2021 +0100 + + Match format strings with arguments. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a957eb52df4a0c593f862790728c692ea11c42e8 +Author: Thomas Klausner <[email protected]> +Date: Tue Dec 7 08:59:13 2021 +0100 + + Remove/comment out unused variables. + + Signed-off-by: Alan Coopersmith <[email protected]> + commit bcc50bd2b541102e515aaa58ba1e20d30b7d69f6 Author: Alan Coopersmith <[email protected]> Date: Mon Dec 6 16:49:55 2021 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/compile new/xscope-1.4.3/compile --- old/xscope-1.4.2/compile 2021-12-07 01:52:08.000000000 +0100 +++ new/xscope-1.4.3/compile 2022-07-11 01:06:37.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/config.h.in new/xscope-1.4.3/config.h.in --- old/xscope-1.4.2/config.h.in 2021-12-07 01:52:07.000000000 +0100 +++ new/xscope-1.4.3/config.h.in 2022-07-11 01:06:36.000000000 +0200 @@ -18,8 +18,8 @@ /* Define to 1 if you have the `ws2_32' library (-lws2_32). */ #undef HAVE_LIBWS2_32 -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H +/* Define to 1 if you have the <minix/config.h> header file. */ +#undef HAVE_MINIX_CONFIG_H /* Define to 1 if the system has the type `socklen_t'. */ #undef HAVE_SOCKLEN_T @@ -27,15 +27,24 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + /* Define to 1 if you have the <sys/filio.h> header file. */ #undef HAVE_SYS_FILIO_H @@ -48,6 +57,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <wchar.h> header file. */ +#undef HAVE_WCHAR_H + /* Support IPv6 for TCP connections */ #undef IPv6 @@ -84,7 +96,9 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Support TCP socket connections */ @@ -97,21 +111,87 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif @@ -121,15 +201,5 @@ /* Version number of package */ #undef VERSION -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - /* Defined if needed to expose struct msghdr.msg_control */ #undef _XOPEN_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/configure.ac new/xscope-1.4.3/configure.ac --- old/xscope-1.4.2/configure.ac 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/configure.ac 2022-07-11 01:06:33.000000000 +0200 @@ -24,7 +24,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xscope], [1.4.2], +AC_INIT([xscope], [1.4.3], [https://gitlab.freedesktop.org/xorg/app/xscope/issues], [xscope]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/decodenas.c new/xscope-1.4.3/decodenas.c --- old/xscope-1.4.2/decodenas.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/decodenas.c 2022-07-11 01:06:33.000000000 +0200 @@ -315,7 +315,7 @@ void DecodeAudioError(FD fd, const unsigned char *buf, long n) { - short Error = IByte(&buf[1]); + // short Error = IByte(&buf[1]); short Request = 0; short RequestMinor = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/fd.c new/xscope-1.4.3/fd.c --- old/xscope-1.4.2/fd.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/fd.c 2022-07-11 01:06:33.000000000 +0200 @@ -452,10 +452,10 @@ debug(128, (stderr, "select %d, rfds = %#lx, wfds = %#lx, RD=%#lx, BRD=%#lx, WD=%#lx\n", - HighestFD + 1, __XFDS_BITS(&rfds, 0), __XFDS_BITS(&wfds, 0), - __XFDS_BITS(&ReadDescriptors, 0), - __XFDS_BITS(&BlockedReadDescriptors, 0), - __XFDS_BITS(&WriteDescriptors, 0))); + HighestFD + 1, (unsigned long)__XFDS_BITS(&rfds, 0), (unsigned long)__XFDS_BITS(&wfds, 0), + (unsigned long)__XFDS_BITS(&ReadDescriptors, 0), + (unsigned long)__XFDS_BITS(&BlockedReadDescriptors, 0), + (unsigned long)__XFDS_BITS(&WriteDescriptors, 0))); if (Interrupt || (!XFD_ANYSET(&rfds) && !XFD_ANYSET(&wfds))) { ReadCommands(); @@ -467,8 +467,8 @@ debug(128, (stderr, "select nfds = %d, rfds = %#lx, wfds = %#lx, xfds = %#lx\n", - nfds, __XFDS_BITS(&rfds, 0), __XFDS_BITS(&wfds, 0), - __XFDS_BITS(&xfds, 0))); + nfds, (unsigned long)__XFDS_BITS(&rfds, 0), (unsigned long)__XFDS_BITS(&wfds, 0), + (unsigned long)__XFDS_BITS(&xfds, 0))); if (nfds < 0) { if (errno == EINTR) @@ -520,5 +520,4 @@ } } } - return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/fd.h new/xscope-1.4.3/fd.h --- old/xscope-1.4.2/fd.h 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/fd.h 2022-07-11 01:06:33.000000000 +0200 @@ -98,7 +98,7 @@ extern FD MakeConnection(const char *server, short port, int report, XtransConnInfo * trans_conn); -extern int MainLoop(void); +extern int MainLoop(void) _X_NORETURN; #ifdef USE_XTRANS extern XtransConnInfo GetXTransConnInfo(FD fd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/missing new/xscope-1.4.3/missing --- old/xscope-1.4.2/missing 2021-12-07 01:52:08.000000000 +0100 +++ new/xscope-1.4.3/missing 2022-07-11 01:06:37.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/peerinfo.c new/xscope-1.4.3/peerinfo.c --- old/xscope-1.4.2/peerinfo.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/peerinfo.c 2022-07-11 01:06:33.000000000 +0200 @@ -43,7 +43,11 @@ GetPidFromFd(FD fd) { #ifdef SO_PEERCRED +#ifndef __OpenBSD__ struct ucred cred; +#else + struct sockpeercred cred; +#endif socklen_t cred_len = sizeof(cred); if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len) == 0 && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/print_randr.c new/xscope-1.4.3/print_randr.c --- old/xscope-1.4.2/print_randr.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/print_randr.c 2022-07-11 01:06:33.000000000 +0200 @@ -80,9 +80,9 @@ void RandrOldGetScreenInfoReply(FD fd, const unsigned char *buf) { - unsigned short nsize; - unsigned short nvg; - unsigned short ngvg; + // unsigned short nsize; + // unsigned short nvg; + // unsigned short ngvg; PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* RandrRequest reply */ PrintField(RBf, 1, 1, RANDRREPLY, RANDRREPLYHEADER); @@ -95,11 +95,11 @@ PrintField(buf, 12, 4, TIMESTAMP, "timestamp"); PrintField(buf, 16, 4, TIMESTAMP, "config-timestamp"); PrintField(buf, 20, 2, CARD16, "num-visual-groups"); - nvg = IShort(&buf[20]); + // nvg = IShort(&buf[20]); PrintField(buf, 22, 2, CARD16, "num-groups-of-visual-groups"); - ngvg = IShort(&buf[22]); + // ngvg = IShort(&buf[22]); PrintField(buf, 24, 2, CARD16, "num-sizes"); - nsize = IShort(&buf[24]); + // nsize = IShort(&buf[24]); PrintField(buf, 26, 2, CARD16, "size-id"); PrintField(buf, 28, 2, CARD16, "visual-group-id"); PrintField(buf, 30, 2, CARD16, "rotation"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/print_render.c new/xscope-1.4.3/print_render.c --- old/xscope-1.4.2/print_render.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/print_render.c 2022-07-11 01:06:33.000000000 +0200 @@ -75,11 +75,11 @@ void RenderQueryPictFormatsReply(FD fd, const unsigned char *buf) { - long n; + // long n; long f; - long s; - long d; - long v; + // long s; + // long d; + // long v; PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* RenderRequest reply */ PrintField(RBf, 1, 1, RENDERREPLY, @@ -88,11 +88,11 @@ return; printfield(buf, 2, 2, CARD16, "sequence number"); printfield(buf, 4, 4, DVALUE4(0), "reply length"); - n = ILong(&buf[4]); + // n = ILong(&buf[4]); f = ILong(&buf[8]); - s = ILong(&buf[12]); - d = ILong(&buf[16]); - v = ILong(&buf[20]); + // s = ILong(&buf[12]); + // d = ILong(&buf[16]); + // v = ILong(&buf[20]); PrintList(&buf[32], (long) f, PICTFORMINFO, "pict-formats"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/print_wcp.c new/xscope-1.4.3/print_wcp.c --- old/xscope-1.4.2/print_wcp.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/print_wcp.c 2022-07-11 01:06:33.000000000 +0200 @@ -70,7 +70,7 @@ while (!error && height--) { x = 0; if (Verbose > 2) - fprintf(stdout, "%s %9d %9d:", Leader, y, (char *) data - buf); + fprintf(stdout, "%s %9d %9ld:", Leader, y, (char *) data - buf); NextByte(byte); if (Verbose > 2) fprintf(stdout, " %2x", byte); @@ -100,7 +100,7 @@ y++; } if (error) - fprintf(stdout, "%s%20s: %d, %d %d\n", Leader, error, + fprintf(stdout, "%s%20s: %d, %d %ld\n", Leader, error, x, y - 1, (char *) data - buf); } @@ -177,7 +177,7 @@ while (!error && height--) { x = 0; if (Verbose > 2) - fprintf(stdout, "%s %9d %9d:", Leader, y, (char *) data - buf); + fprintf(stdout, "%s %9d %9ld:", Leader, y, (char *) data - buf); NextByte(byte); if (Verbose > 2) fprintf(stdout, " %2x", byte); @@ -217,7 +217,7 @@ break; } x += run; - fprintf(stdout, " %3ld:%0*x", run, bytes * 2, pix); + fprintf(stdout, " %3ld:%0*lx", run, bytes * 2, pix); } break; } @@ -226,7 +226,7 @@ y++; } if (error) - fprintf(stdout, "%s%20s: %d, %d %d\n", Leader, error, + fprintf(stdout, "%s%20s: %d, %d %ld\n", Leader, error, x, y - 1, (char *) data - buf); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/printnas.c new/xscope-1.4.3/printnas.c --- old/xscope-1.4.2/printnas.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/printnas.c 2022-07-11 01:06:33.000000000 +0200 @@ -101,11 +101,13 @@ PrintSuccessfulAudioSetUpReply(const unsigned char *buf) { short v; - short n; - short m; + // short n; + // short m; if (NasVerbose < 1) return; + // m = IByte(&buf[28]); + // n = IByte(&buf[29]); PrintField(buf, 2, 2, CARD16, "protocol-major-version"); PrintField(buf, 4, 2, CARD16, "protocol-minor-version"); printfield(buf, 6, 2, DVALUE2(8 + 2 * n + (v + p + m) / 4), @@ -119,9 +121,7 @@ v = IShort(&buf[24]); printfield(buf, 26, 2, CARD16, "maximum-request-length"); printfield(buf, 28, 1, CARD8, "max-tracks"); - m = IByte(&buf[28]); printfield(buf, 29, 1, DVALUE1(n), "number of audio formats"); - n = IByte(&buf[29]); PrintField(buf, 30, 1, CARD8, "number of element-types"); PrintField(buf, 31, 1, CARD8, "number of wave-forms"); PrintField(buf, 32, 1, CARD8, "number of actions"); @@ -138,6 +138,7 @@ /* Error Printing procedures */ +#ifdef UNUSED static void AudioRequestError(const unsigned char *buf) { @@ -227,6 +228,7 @@ PrintField(buf, 8, 2, CARD16, "minor opcode"); PrintField(buf, 10, 1, CARD8, "major opcode"); } +#endif /* ************************************************************ */ /* */ @@ -323,7 +325,7 @@ void AudioListDevicesReply(const unsigned char *buf) { - long n; + // long n; PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* GetWindowAttributes */ if (NasVerbose < 1) @@ -332,7 +334,7 @@ printfield(buf, 4, 4, CARD32, "reply length"); printfield(buf, 8, 4, CARD32, "num devices"); - n = ILong(&buf[8]); + // n = ILong(&buf[8]); } static long @@ -351,7 +353,7 @@ static void AuDeviceAttributes(const unsigned char *buf) { - int l; + // int l; printfield(buf, 0, 4, CARD32, "value mask"); printfield(buf, 4, 4, CARD32, "changeable mask"); @@ -362,7 +364,8 @@ printfield(buf, 15, 1, CARD8, "num tracks"); printfield(buf, 16, 4, CARD32, "access"); - l = 20 + AuString(&buf[20]); + // l = 20 + AuString(&buf[20]); + (void)AuString(&buf[20]); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xscope-1.4.2/scope.c new/xscope-1.4.3/scope.c --- old/xscope-1.4.2/scope.c 2021-12-07 01:52:03.000000000 +0100 +++ new/xscope-1.4.3/scope.c 2022-07-11 01:06:33.000000000 +0200 @@ -199,7 +199,7 @@ else if (*s == '0') { sscanf(s, "%o", v); } - else if (isdigit(*s)) { + else if (isdigit(*(unsigned char *)s)) { sscanf(s, "%d", v); } else if (*s == '\'') { @@ -251,7 +251,7 @@ argc = 0; while (*line) { - while (isspace(*line)) + while (isspace(*(unsigned char *)line)) line++; if (!*line) break; @@ -267,7 +267,7 @@ else { *argv++ = line; argc++; - while (*line && !isspace(*line)) + while (*line && !isspace(*(unsigned char *)line)) line++; if (*line) *line++ = '\0'; @@ -1273,7 +1273,7 @@ if (port == ScopePort && ((ServerHostName[0] == '\0') || strcmp(ServerHostName, ScopeHost) == 0)) { - char error_message[100]; + char error_message[300]; snprintf(error_message, sizeof(error_message), "Trying to attach to myself: %s,%d\n", ServerHostName, port); @@ -1384,18 +1384,18 @@ /* If we already read a line last time, process it first, else get the next line for processing */ if (FDinfo[rawfd].bufcount == 0) { - if (fgets(FDinfo[rawfd].buffer, BUFFER_SIZE, raw) == NULL) { + if (fgets((char *)FDinfo[rawfd].buffer, BUFFER_SIZE, raw) == NULL) { CloseConnection(rawfd); exit(0); } - FDinfo[rawfd].bufcount = strlen(FDinfo[rawfd].buffer); + FDinfo[rawfd].bufcount = strlen((char *)FDinfo[rawfd].buffer); debug(16, (stderr, "raw input = %s", FDinfo[rawfd].buffer)); } - in = FDinfo[rawfd].buffer; + in = (char *)FDinfo[rawfd].buffer; /* lines starting with space indicate change of sender */ - if (isspace(*in)) { + if (isspace(*(unsigned char *)in)) { /* If we already have data in buffer, process it */ if ((fd != -1) && (FDinfo[fd].bufcount > 0)) { debug(16, (stderr, "reporting %d bytes from: %s %s\n", @@ -1413,7 +1413,7 @@ } else { /* Need to parse header to figure out which direction */ - while (isspace(*in)) { + while (isspace(*(unsigned char *)in)) { in++; } if (strncmp(in, "Client Connect (fd ", 19) == 0) { @@ -1448,7 +1448,7 @@ int clientid; in = n + 8; - if (isdigit(*in)) + if (isdigit(*(unsigned char *)in)) clientid = strtol(in, NULL, 10); else clientid = 1; @@ -1480,7 +1480,7 @@ in = strstr(in, "(fd "); if (in == NULL) { warn("Did not find fd string in input entry"); - warn(FDinfo[rawfd].buffer); + warn((char *)FDinfo[rawfd].buffer); FDinfo[rawfd].bufcount = 0; continue; } @@ -1500,7 +1500,7 @@ n = strchr(in, ':'); if (n != NULL) in = n + 1; - while (isspace(*in)) + while (isspace(*(unsigned char *)in)) in++; } }
