aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/Imakefile2
-rw-r--r--nx-X11/config/cf/Imake.cf24
-rw-r--r--nx-X11/config/cf/Imakefile2
-rw-r--r--nx-X11/config/cf/README6
-rw-r--r--nx-X11/config/cf/Server.tmpl2
-rw-r--r--nx-X11/config/cf/Threads.tmpl2
-rw-r--r--nx-X11/config/cf/X11.rules10
-rw-r--r--nx-X11/config/cf/X11.tmpl14
-rw-r--r--nx-X11/config/cf/cross.def2
-rw-r--r--nx-X11/config/cf/host.def16
-rw-r--r--nx-X11/config/cf/linux.cf4
-rw-r--r--nx-X11/config/cf/xf86.rules2
-rw-r--r--nx-X11/config/cf/xorg.cf8
-rw-r--r--nx-X11/config/cf/xorg.tmpl2
-rw-r--r--nx-X11/config/cf/xorgsite.def16
-rw-r--r--nx-X11/programs/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/GL/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc10
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/Xi/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/dbe/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c24
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Atoms.c6
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Binder.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Client.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Composite.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Drawable.c18
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Extensions.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/GC.c17
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/GCOps.c20
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Handlers.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.c15
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c6
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Literals.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Options.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pixels.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pixmap.c14
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pointer.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c30
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c282
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Split.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Visual.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c6
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile6
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile4
-rw-r--r--nxcomp/include/MD5.h2
-rw-r--r--nxcomp/include/NX.h2
-rw-r--r--nxcomp/include/NXalert.h2
-rw-r--r--nxcomp/include/NXproto.h2
-rw-r--r--nxcomp/src/ActionCache.h2
-rw-r--r--nxcomp/src/Alpha.cpp2
-rw-r--r--nxcomp/src/Auth.cpp6
-rw-r--r--nxcomp/src/BlockCacheSet.cpp2
-rw-r--r--nxcomp/src/ChangeGC.cpp2
-rw-r--r--nxcomp/src/ChangeGC.h2
-rw-r--r--nxcomp/src/ChangeProperty.cpp4
-rw-r--r--nxcomp/src/ChangeProperty.h2
-rw-r--r--nxcomp/src/Channel.cpp116
-rw-r--r--nxcomp/src/Channel.h4
-rw-r--r--nxcomp/src/Children.cpp4
-rw-r--r--nxcomp/src/ClearArea.cpp12
-rw-r--r--nxcomp/src/ClearArea.h2
-rw-r--r--nxcomp/src/ClientChannel.cpp76
-rw-r--r--nxcomp/src/ClientChannel.h4
-rw-r--r--nxcomp/src/ClientProxy.cpp2
-rw-r--r--nxcomp/src/ClientReadBuffer.cpp2
-rw-r--r--nxcomp/src/ConfigureWindow.cpp6
-rw-r--r--nxcomp/src/ConfigureWindow.h2
-rw-r--r--nxcomp/src/Control.cpp2
-rw-r--r--nxcomp/src/Control.h8
-rw-r--r--nxcomp/src/CopyArea.cpp6
-rw-r--r--nxcomp/src/CopyArea.h2
-rw-r--r--nxcomp/src/CreateGC.h2
-rw-r--r--nxcomp/src/CreatePixmap.h8
-rw-r--r--nxcomp/src/DecodeBuffer.cpp2
-rw-r--r--nxcomp/src/EncodeBuffer.cpp4
-rw-r--r--nxcomp/src/FillPoly.h2
-rw-r--r--nxcomp/src/GenericChannel.cpp8
-rw-r--r--nxcomp/src/GenericReadBuffer.cpp2
-rw-r--r--nxcomp/src/GenericReply.h6
-rw-r--r--nxcomp/src/GenericRequest.cpp2
-rw-r--r--nxcomp/src/GetImage.cpp10
-rw-r--r--nxcomp/src/GetImage.h2
-rw-r--r--nxcomp/src/GetImageReply.cpp4
-rw-r--r--nxcomp/src/GetImageReply.h8
-rw-r--r--nxcomp/src/GetProperty.h2
-rw-r--r--nxcomp/src/GetPropertyReply.h8
-rw-r--r--nxcomp/src/ImageText16.cpp10
-rw-r--r--nxcomp/src/ImageText16.h2
-rw-r--r--nxcomp/src/ImageText8.cpp10
-rw-r--r--nxcomp/src/ImageText8.h2
-rw-r--r--nxcomp/src/InternAtom.cpp4
-rw-r--r--nxcomp/src/InternAtom.h2
-rw-r--r--nxcomp/src/Jpeg.cpp2
-rw-r--r--nxcomp/src/Keeper.cpp6
-rw-r--r--nxcomp/src/Keeper.h2
-rw-r--r--nxcomp/src/List.cpp8
-rw-r--r--nxcomp/src/ListFontsReply.cpp6
-rw-r--r--nxcomp/src/ListFontsReply.h8
-rw-r--r--nxcomp/src/Loop.cpp40
-rw-r--r--nxcomp/src/Message.cpp46
-rw-r--r--nxcomp/src/Message.h12
-rw-r--r--nxcomp/src/Misc.cpp10
-rw-r--r--nxcomp/src/Misc.h2
-rw-r--r--nxcomp/src/OpcodeCache.h2
-rw-r--r--nxcomp/src/Pgn.cpp18
-rw-r--r--nxcomp/src/Pipe.cpp2
-rw-r--r--nxcomp/src/PolyArc.h2
-rw-r--r--nxcomp/src/PolyFillArc.h2
-rw-r--r--nxcomp/src/PolyFillRectangle.h2
-rw-r--r--nxcomp/src/PolyLine.h2
-rw-r--r--nxcomp/src/PolyPoint.h2
-rw-r--r--nxcomp/src/PolySegment.h2
-rw-r--r--nxcomp/src/PolyText16.cpp12
-rw-r--r--nxcomp/src/PolyText16.h2
-rw-r--r--nxcomp/src/PolyText8.cpp26
-rw-r--r--nxcomp/src/PolyText8.h2
-rw-r--r--nxcomp/src/Proxy.cpp16
-rw-r--r--nxcomp/src/ProxyReadBuffer.cpp6
-rw-r--r--nxcomp/src/PutImage.cpp12
-rw-r--r--nxcomp/src/PutImage.h8
-rw-r--r--nxcomp/src/PutPackedImage.cpp2
-rw-r--r--nxcomp/src/PutPackedImage.h6
-rw-r--r--nxcomp/src/QueryFontReply.h6
-rw-r--r--nxcomp/src/ReadBuffer.cpp10
-rw-r--r--nxcomp/src/RenderExtension.h4
-rw-r--r--nxcomp/src/SendEvent.cpp8
-rw-r--r--nxcomp/src/SendEvent.h2
-rw-r--r--nxcomp/src/SequenceQueue.cpp2
-rw-r--r--nxcomp/src/SequenceQueue.h2
-rw-r--r--nxcomp/src/ServerCache.h2
-rw-r--r--nxcomp/src/ServerChannel.cpp24
-rw-r--r--nxcomp/src/ServerProxy.cpp4
-rw-r--r--nxcomp/src/ServerReadBuffer.cpp2
-rw-r--r--nxcomp/src/SetClipRectangles.cpp6
-rw-r--r--nxcomp/src/SetClipRectangles.h2
-rw-r--r--nxcomp/src/SetUnpackAlpha.h2
-rw-r--r--nxcomp/src/SetUnpackColormap.h2
-rw-r--r--nxcomp/src/SetUnpackGeometry.h2
-rw-r--r--nxcomp/src/ShapeExtension.cpp2
-rw-r--r--nxcomp/src/Socket.cpp2
-rw-r--r--nxcomp/src/Split.cpp28
-rw-r--r--nxcomp/src/Split.h4
-rw-r--r--nxcomp/src/StaticCompressor.cpp10
-rw-r--r--nxcomp/src/TranslateCoords.cpp4
-rw-r--r--nxcomp/src/TranslateCoords.h2
-rw-r--r--nxcomp/src/Transport.cpp98
-rw-r--r--nxcomp/src/Transport.h2
-rw-r--r--nxcomp/src/Types.h4
-rw-r--r--nxcomp/src/Unpack.cpp38
-rw-r--r--nxcomp/src/Unpack.h4
-rw-r--r--nxcomp/src/Vars.c2
-rw-r--r--nxcomp/src/XidCache.h2
-rwxr-xr-xtestscripts/slave-agent12
-rwxr-xr-xtestscripts/slave-client11
158 files changed, 783 insertions, 788 deletions
diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile
index b2874c3a8..9bd07b215 100644
--- a/nx-X11/Imakefile
+++ b/nx-X11/Imakefile
@@ -144,7 +144,7 @@ install::
#endif /* not Win32Architecture else */
-XCOMM special target to determine if the xmakefile exists.
+XCOMM special target to determine if the xmakefile exists.
XCOMM Works on both Unix and NMAKE.EXE
xmakefile-exists::
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 612bc4e38..ce33e4208 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -1,13 +1,13 @@
/*
* To add support for another platform:
- *
- * 1. Identify a machine-specific cpp symbol. If your preprocessor
+ *
+ * 1. Identify a machine-specific cpp symbol. If your preprocessor
* does not have any built in, you will need to add the symbol to the
* cpp_argv table in config/imake/imakemdep.h and rebuild imake with
* the BOOTSTRAPCFLAGS variable set (see the macII for an example).
*
* 2. Add all machine-specific cpp symbols (either defined by you or by
- * the preprocessor or compiler) to the predefs table in
+ * the preprocessor or compiler) to the predefs table in
* config/imake/imakemdep.h.
*
* 3. But a new #ifdef block below that defines MacroIncludeFile and
@@ -167,7 +167,7 @@
# define Mvme68kArchitecture
# undef mvme68k
# endif
-# if defined(sun3)
+# if defined(sun3)
# define Sun3Architecture
# undef sun3
# endif
@@ -571,7 +571,7 @@
#ifdef MOTOROLA
# define MacroIncludeFile <moto.cf>
# define MacroFile moto.cf
-# undef MOTOROLA
+# undef MOTOROLA
# ifdef SYSV
# define MotoR3Architecture
# endif
@@ -599,8 +599,8 @@
# ifdef i386
# undef i386
# ifdef ISC
-# define i386Architecture
-# define i386SVR3Architecture
+# define i386Architecture
+# define i386SVR3Architecture
# define MacroIncludeFile <isc.cf>
# define MacroFile isc.cf
# define i386IscArchitecture
@@ -642,8 +642,8 @@
# undef SVR4
# else /* ! SVR4 */
# ifdef ISC
-# define i386Architecture
-# define i386SVR3Architecture
+# define i386Architecture
+# define i386SVR3Architecture
# define MacroIncludeFile <isc.cf>
# define MacroFile isc.cf
# define i386IscArchitecture
@@ -893,9 +893,9 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# endif
# undef __sparc__
# endif
-# ifdef ia64
+# ifdef ia64
# define ia64Architecture
-# undef ia64
+# undef ia64
# endif
# ifdef __ia64__
# ifndef ia64Architecture
@@ -1016,7 +1016,7 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# define NecArchitecture
#endif
-#ifdef minix
+#ifdef minix
#define MacroIncludeFile <minix.cf>
#define MacroFile minix.cf
#undef minix
diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile
index 714a865c9..521e7e900 100644
--- a/nx-X11/config/cf/Imakefile
+++ b/nx-X11/config/cf/Imakefile
@@ -13,7 +13,7 @@ host.def
#endif
#if defined(XorgVersion)
-VERSIONDEFFILES =
+VERSIONDEFFILES =
#endif
DEFFILES = \
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 24ac7f52c..b6c1580df 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -276,9 +276,9 @@ An <os>Lib.rules file provides defaults for the following variables:
PositionIndependentCFlags PIC compiler flags for C
PositionIndependentCplusplusFlags PIC compiler flags for C++
- Note: PositionIndependentCplusplusFlags is only required if the
+ Note: PositionIndependentCplusplusFlags is only required if the
C and C++ compilers use different flags to build PIC code. The
- default configuration will try to use PositionIndependentCFlags
+ default configuration will try to use PositionIndependentCFlags
for both C and C++ compiles.
An <os>Lib.tmpl file provides defaults for the following variables:
@@ -361,7 +361,7 @@ SUBDIRS for an Imakefile in a directory containing
and call MakeSubdirs() and DependSubdirs().
MANSUFFIX suffix used by InstallManPage* rules.
May be set to $(LIBMANSUFFIX), $(FILEMANSUFFIX), or
- $(MISCMANSUFFIX) in directories for libraries or data
+ $(MISCMANSUFFIX) in directories for libraries or data
files.
diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl
index ffdca6811..3d27cc9b3 100644
--- a/nx-X11/config/cf/Server.tmpl
+++ b/nx-X11/config/cf/Server.tmpl
@@ -62,7 +62,7 @@ EXT_DEFINES = ExtensionDefines
OS_DEFINES = ServerOSDefines
GLX_DEFINES = GlxDefines
-
+
#ifndef GlxUseSGISI
#define GlxUseSGISI NO
#endif
diff --git a/nx-X11/config/cf/Threads.tmpl b/nx-X11/config/cf/Threads.tmpl
index d2d6f6d1c..93d7cc44a 100644
--- a/nx-X11/config/cf/Threads.tmpl
+++ b/nx-X11/config/cf/Threads.tmpl
@@ -2,7 +2,7 @@
* For a multi-threaded application or library,
* Define LocalThreadsDefines in your Imakefile (unless you like the
* project default), then include this file.
- * Everything else should be automatic.
+ * Everything else should be automatic.
*/
#ifndef LocalThreadsDefines
diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules
index af3473c3a..932d3b5ff 100644
--- a/nx-X11/config/cf/X11.rules
+++ b/nx-X11/config/cf/X11.rules
@@ -6,9 +6,9 @@
# define X11IsTopLevelProject NO
#endif
-/*
+/*
* If no clues are given assume X11 is in the tree, otherwise
- * UseInstalled overrides UseImports. Do not do both.
+ * UseInstalled overrides UseImports. Do not do both.
*/
#ifndef UseInstalledX11
# define UseInstalledX11 NO
@@ -32,7 +32,7 @@
#if defined(X11ProjectRoot)
# define XBinDir $(XPROJECTROOT)/lib/nx/bin
-#elif defined(ProjectRoot)
+#elif defined(ProjectRoot)
# define XBinDir $(PROJECTROOT)/lib/nx/bin
#else
# define XBinDir $(BINDIR)
@@ -75,7 +75,7 @@
#define LdPostLibs LdPostLib XLdPostLibs
#ifndef TopXInclude
-# if ImportX11
+# if ImportX11
# define TopXInclude -I$(TOP)/imports/x11/include
# elif !UseInstalledX11
# define TopXInclude -I$(TOP)/exports/include
@@ -126,6 +126,6 @@
#if XtransFailSoft
# define XtransFailDefine /**/
-#else
+#else
# define XtransFailDefine -DFAIL_HARD
#endif
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index a5349e0eb..e9b6695d0 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -43,7 +43,7 @@ XCOMM ----------------------------------------------------------------------
# define XOrgWebSupportAddress http://wiki.X.Org
#endif
-XORGRELSTRING = XorgManVersionString
+XORGRELSTRING = XorgManVersionString
XORGMANNAME = XOrgManNameString
#ifndef XOrgManDefs
@@ -98,11 +98,11 @@ XORGRELSTRING = XorgManVersionString
#ifndef HasXServer
#define HasXServer YES
#endif
-/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf
+/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf
* from the .cf file for your platform.
*/
#ifndef XorgServer
-#define XorgServer NO
+#define XorgServer NO
#endif
#ifndef BuildServer
#define BuildServer HasXServer
@@ -130,7 +130,7 @@ XORGRELSTRING = XorgManVersionString
#define InstallXcmsTxt YES
#endif
/*
- * This disables XLOCALEDIR.
+ * This disables XLOCALEDIR.
*/
#ifndef DisableXLocaleDirEnv
#define DisableXLocaleDirEnv NO
@@ -1072,7 +1072,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
TRANSCOMMSRC = $(LIBSRC)/xtrans
TRANS_INCLUDES = -I$(TRANSCOMMSRC)
CONNECTION_FLAGS = ConnectionFlags ExtraConnectionDefs
-XTRANS_FAILDEFINES = XtransFailDefine
+XTRANS_FAILDEFINES = XtransFailDefine
#ifdef X11ProjectRoot
XPROJECTROOT = X11ProjectRoot
#endif
@@ -1090,7 +1090,7 @@ VENDORSUPPORTDEFS = VendorSupportDefines
XKBDEFRULES = XkbDefaultRulesFile
XKBDEFRULESDEFS = XkbDefRulesDefines
-
+
XCONFIGFILE = XConfigFile
XCONFIGDIR = XConfigDir
XLOGFILE = XLogFile
@@ -1200,7 +1200,7 @@ MOTIFLIB = -L$(MOTIFLIBDIR) LinkerRuntimeLibraryPathFlag($(MOTIFLIBDIR)) -lXm
#endif
#if MotifIncDirStandard
-MOTIFINCLUDES =
+MOTIFINCLUDES =
#else
MOTIFINCLUDES = -I$(MOTIFINCDIR)
#endif
diff --git a/nx-X11/config/cf/cross.def b/nx-X11/config/cf/cross.def
index d1b737fcc..06dbf0909 100644
--- a/nx-X11/config/cf/cross.def
+++ b/nx-X11/config/cf/cross.def
@@ -16,7 +16,7 @@
-D_DEFAULT_SOURCE -D_GNU_SOURCE -DX_LOCALE
#undef CcCmd
#define StdIncDir /opt/Embedix/tools/arm-linux/include
-#define PreIncDir
+#define PreIncDir
#undef PostIncDir
#define PostIncDir /opt/Embedix/tools/lib/gcc-lib/arm-linux/2.95.2/include
#define CcCmd /opt/Embedix/tools/bin/arm-linux-gcc
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 3638e0528..7546d49f3 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -223,8 +223,8 @@
-Wredundant-decls -Wnested-externs -Wshadow
*/
-/*
- * Sun Compiler stuff..
+/*
+ * Sun Compiler stuff..
*
#define HasSunC YES
#define HasSunCplusplus YES
@@ -241,8 +241,8 @@
#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro
*/
-/*
- * Debuggable Sun Compiler Build.
+/*
+ * Debuggable Sun Compiler Build.
* Note: This builds _EVERYTHING_ as debuggable
*
#define DefaultCDebugFlags -g -xs
@@ -350,7 +350,7 @@
*/
#define BuildScreenSaverExt YES
-/*
+/*
* If you don't want to build Xinerama support, uncomment this.
*
#define BuildXinerama NO
@@ -424,13 +424,13 @@
/*
* For a POSIXized build on Interactive uncomment this
* Could be used with gcc 'till Version 2.6.3
- * Should be used with gcc 2.7.2.
+ * Should be used with gcc 2.7.2.
*
#define UsePosix YES
*/
/*
- * If you don't want XDMAUTH support (if you don't have Wraphelp.c),
+ * If you don't want XDMAUTH support (if you don't have Wraphelp.c),
* comment this out.
*
*/
@@ -540,4 +540,4 @@
* libx86emu set library path here
*
#define X86EMU_LIBPATH /usr/local/lib
- */
+ */
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 6851be558..283c0a000 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -282,7 +282,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif
#endif
-/*
+/*
* Let the OS restore console fonts instead of the generic VGA
* layer. This exists for Linux only at the moment so put it
* here.
@@ -832,7 +832,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# else
# define SuperHArchOptFlags -m3
# endif
-# endif
+# endif
# ifndef SuperHebArchitecture
# ifdef SuperHebArchitecture
# define SuperHEndianFlags -mb
diff --git a/nx-X11/config/cf/xf86.rules b/nx-X11/config/cf/xf86.rules
index 879bd3c90..c83869dc5 100644
--- a/nx-X11/config/cf/xf86.rules
+++ b/nx-X11/config/cf/xf86.rules
@@ -25,7 +25,7 @@ clean:: @@\
#ifndef Depend
# define Depend depend
#endif
-
+
#ifndef ConfigTargetLong
#define ConfigTargetLong(target,dep,script,args,extra) @@\
all:: Configure @@\
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 8d39c338a..c0b753a88 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -16,7 +16,7 @@
# if XORG_VERSION_SNAP == 0
# if XORG_VERSION_PATCH == 0
# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR | sed 's/ /./g'`
-# else
+# else
# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH | sed 's/ /./g'`
# endif
# else
@@ -499,7 +499,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#endif
/*
- * Build the X-Resource Extension
+ * Build the X-Resource Extension
*/
#ifndef BuildXResExt
# define BuildXResExt YES
@@ -843,7 +843,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
# ifndef Has3DNowSupport
# define Has3DNowSupport NO
# endif
-#else
+#else
# ifndef HasX86Support
# define HasX86Support NO
# endif
@@ -864,7 +864,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
|| defined (ia64Architecture) \
|| defined (PpcArchitecture) \
|| defined (SparcArchitecture) \
- || defined (s390xArchitecture)
+ || defined (s390xArchitecture)
# define StaticNeedsPicForShared YES
# else
# define StaticNeedsPicForShared NO
diff --git a/nx-X11/config/cf/xorg.tmpl b/nx-X11/config/cf/xorg.tmpl
index 2737ebdf9..b23be5af8 100644
--- a/nx-X11/config/cf/xorg.tmpl
+++ b/nx-X11/config/cf/xorg.tmpl
@@ -12,7 +12,7 @@ CONFIG_DEFINES = ConfigDefines
#ifdef BuilderEMailAddr
BUILDERADDR = BuilderEMailAddr
-#else
+#else
BUILDERADDR = "xorg@lists.freedesktop.org"
#endif
#ifdef VendorSupportAddress
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index 5c5cf4431..8785ae672 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -116,8 +116,8 @@
-Wredundant-decls -Wnested-externs -Wshadow
*/
-/*
- * Sun Compiler stuff..
+/*
+ * Sun Compiler stuff..
*
#define HasSunC YES
#define HasSunCplusplus YES
@@ -134,8 +134,8 @@
#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro
*/
-/*
- * Debuggable Sun Compiler Build.
+/*
+ * Debuggable Sun Compiler Build.
* Note: This builds _EVERYTHING_ as debuggable
*
#define DefaultCDebugFlags -g -xs
@@ -226,7 +226,7 @@
#define BuildScreenSaverExt NO
*/
-/*
+/*
* If you don't want to build Xinerama support, uncomment this.
*
#define BuildXinerama NO
@@ -263,13 +263,13 @@
/*
* For a POSIXized build on Interactive uncomment this
* Could be used with gcc 'till Version 2.6.3
- * Should be used with gcc 2.7.2.
+ * Should be used with gcc 2.7.2.
*
#define UsePosix YES
*/
/*
- * If you don't want XDMAUTH support (if you don't have Wraphelp.c),
+ * If you don't want XDMAUTH support (if you don't have Wraphelp.c),
* comment this out.
*
*/
@@ -375,4 +375,4 @@
* libx86emu set library path here
*
#define X86EMU_LIBPATH /usr/local/lib
- */
+ */
diff --git a/nx-X11/programs/Imakefile b/nx-X11/programs/Imakefile
index 743851143..f290e5373 100644
--- a/nx-X11/programs/Imakefile
+++ b/nx-X11/programs/Imakefile
@@ -25,7 +25,7 @@
XSSRCDIR = Xserver
#endif
-SUBDIRS = $(XSSRCDIR)
+SUBDIRS = $(XSSRCDIR)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile
index 19b5902a5..47dbf795c 100644
--- a/nx-X11/programs/Xserver/GL/Imakefile
+++ b/nx-X11/programs/Xserver/GL/Imakefile
@@ -27,7 +27,7 @@ DEFINES = $(GLX_DEFINES)
MakeMutex($(SUBDIRS) $(OBJS) $(DONES))
#endif
-#if HasGnuMake || HasBsdMake
+#if HasGnuMake || HasBsdMake
$(DONES): $(SUBDIRS)
#endif
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
index 567ad65b8..5d55a5855 100644
--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
@@ -1,7 +1,7 @@
MESASWRSETUPDIR = MesaSwrastSetupBuildDir
MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \
- $(MESASWRSETUPDIR)ss_triangle.c
+ $(MESASWRSETUPDIR)ss_triangle.c
#ifdef NeedToLinkMesaSrc
LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/mesa/swrast_setup)
@@ -13,18 +13,18 @@ LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/mesa/swrast_setup)
#endif
MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \
- $(MESASWRSETUPDIR)ss_triangle.o
+ $(MESASWRSETUPDIR)ss_triangle.o
#if defined(DoSharedLib) && DoSharedLib
MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \
- $(MESASWRSETUPDIR)unshared/ss_triangle.o
+ $(MESASWRSETUPDIR)unshared/ss_triangle.o
#else
MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS)
#endif
MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \
- $(MESASWRSETUPDIR)debugger/ss_triangle.o
+ $(MESASWRSETUPDIR)debugger/ss_triangle.o
MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \
- $(MESASWRSETUPDIR)profiled/ss_triangle.o
+ $(MESASWRSETUPDIR)profiled/ss_triangle.o
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index c3bb8391f..ad9a2d058 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -87,7 +87,7 @@ XF86BIGFOBJS = xf86bigfont.o
$(XF86BIGFOBJS)
#if defined(NXAgentServer) && NXAgentServer
-NX_DEFINES = -DNXAGENT_SERVER
+NX_DEFINES = -DNXAGENT_SERVER
#endif
diff --git a/nx-X11/programs/Xserver/Xi/Imakefile b/nx-X11/programs/Xserver/Xi/Imakefile
index 746e57eaa..c0eede6a1 100644
--- a/nx-X11/programs/Xserver/Xi/Imakefile
+++ b/nx-X11/programs/Xserver/Xi/Imakefile
@@ -37,7 +37,7 @@
stubs.c \
ungrdev.c \
ungrdevb.c \
- ungrdevk.c
+ ungrdevk.c
OBJS = allowev.o \
chgkbd.o \
@@ -75,7 +75,7 @@
setmmap.o \
ungrdev.o \
ungrdevb.o \
- ungrdevk.o
+ ungrdevk.o
INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) `pkg-config --cflags-only-I pixman-1`
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
diff --git a/nx-X11/programs/Xserver/dbe/Imakefile b/nx-X11/programs/Xserver/dbe/Imakefile
index 3c4f40174..6bef0aff1 100644
--- a/nx-X11/programs/Xserver/dbe/Imakefile
+++ b/nx-X11/programs/Xserver/dbe/Imakefile
@@ -1,8 +1,8 @@
#include <Server.tmpl>
- SRCS = dbe.c midbe.c
- OBJS = dbe.o midbe.o
+ SRCS = dbe.c midbe.c
+ OBJS = dbe.o midbe.o
INCLUDES = -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES) `pkg-config --cflags-only-I pixman-1`
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 174873e51..a3867f6a7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -480,7 +480,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 2;
}
return 0;
- }
+ }
if (!strcmp(argv[i], "-streaming"))
{
@@ -542,7 +542,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
if (++i < argc &&
sscanf(argv[i], "%ix%i", &width, &height) == 2 &&
width >= 32 && height >= 32)
- {
+ {
nxagentChangeOption(TileWidth, width);
nxagentChangeOption(TileHeight, height);
return 2;
@@ -582,13 +582,13 @@ int ddxProcessArgument(int argc, char *argv[], int i)
nxagentChangeOption(AllScreens, False);
}
else
- {
- if (nxagentUserGeometry.flag == 0)
+ {
+ if (nxagentUserGeometry.flag == 0)
{
- nxagentUserGeometry.flag = XParseGeometry(argv[i],
- &nxagentUserGeometry.X,
- &nxagentUserGeometry.Y,
- &nxagentUserGeometry.Width,
+ nxagentUserGeometry.flag = XParseGeometry(argv[i],
+ &nxagentUserGeometry.X,
+ &nxagentUserGeometry.Y,
+ &nxagentUserGeometry.Width,
&nxagentUserGeometry.Height);
}
}
@@ -2025,12 +2025,12 @@ FIXME: In rootless mode the backing-store support is not functional yet.
* need to check if this was set on the command line as this has
* the priority over the option file.
*/
-
+
if (nxagentRenderEnable == UNDEFINED)
{
nxagentRenderEnable = True;
}
-
+
if (nxagentRenderEnable == True)
{
nxagentAlphaEnabled = True;
@@ -2216,7 +2216,7 @@ void nxagentSetPackMethod(void)
nxagentChangeOption(Adaptive, False);
}
-
+
if (method == PACK_LOSSY || method == PACK_ADAPTIVE)
{
nxagentPackMethod = PACK_JPEG_16M_COLORS;
@@ -2433,7 +2433,7 @@ void nxagentSetDeferLevel(void)
/*
* Set the tile height.
*/
-
+
if (nxagentOption(TileHeight) != UNDEFINED)
{
#ifdef TEST
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index 6ce8b21e8..632f09440 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -225,7 +225,7 @@ static void finishWMDetection(Bool verbose)
}
}
-void nxagentWMDetect()
+void nxagentWMDetect()
{
/* FIXME: verbose is always false, there's no code to set it to true */
Bool verbose = False;
@@ -508,7 +508,7 @@ static void nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
name_list[i] = atomNameList[i];
atom_list[i] = None;
}
-
+
for (unsigned int i = 0; i < privLastAtom; i++)
{
name_list[count + i] = (char *)privAtomMap[i].string;
@@ -623,7 +623,7 @@ static AtomMap* nxagentFindAtomByName(char *string, unsigned int length)
{
for (unsigned int i = 0; i < privLastAtom; i++)
{
- if ((length == privAtomMap[i].length) &&
+ if ((length == privAtomMap[i].length) &&
(strcmp(string, privAtomMap[i].string) == 0))
{
return (privAtomMap + i);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
index 518c016c4..7119e2886 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c
@@ -115,7 +115,7 @@ int nxagentCheckBinder(int argc, char *argv[], int i)
* getenv(). It is to be decided how to handle the values of type
* string in the Options repository.
*/
-
+
nxagentChangeOption(BinderOptions, display);
return 2;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index 08b2d8feb..ff772f6ef 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -434,7 +434,7 @@ void nxagentWakeupByReset(ClientPtr client)
*/
#define WAIT_ALL_EVENTS
-
+
#ifndef WAIT_ALL_EVENTS
static Bool nxagentWaitWakeupBySplitPredicate(Display *disp, XEvent *event, XPointer ptr)
@@ -514,7 +514,7 @@ void nxagentWaitWakeupBySplit(ClientPtr client)
}
#endif
-
+
return;
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
index 9e14a82bb..aed0c367f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c
@@ -145,7 +145,7 @@ void nxagentRedirectDefaultWindows(void)
* agent window disappears. To make things even more weird, this
* happens only at reconnection.
*/
-
+
XCompositeRedirectSubwindows(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum],
CompositeRedirectAutomatic);
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 2facf1df3..f0ebbc5ca 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -286,7 +286,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
totalReconnectedPixmaps++;
fprintf(stderr, "%s: Reconnecting pixmap at [%p] [%dx%d] "
- "Depth [%d] Size [%d]. Total size [%d]. Total reconnected pixmaps [%d].\n",
+ "Depth [%d] Size [%d]. Total size [%d]. Total reconnected pixmaps [%d].\n",
__func__, (void *) pDrawable, width, height, depth, length,
totalLength, totalReconnectedPixmaps);
}
@@ -460,7 +460,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
nxagentDrawableType(pDrawable), (void *) pDrawable);
#endif
- goto nxagentSynchronizeRegionFree;
+ goto nxagentSynchronizeRegionFree;
}
/*
@@ -724,7 +724,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
*/
RegionSubtract(nxagentPixmapCorruptedRegion(nxagentDrawableBitmap(pDrawable)),
- nxagentPixmapCorruptedRegion(nxagentDrawableBitmap(pDrawable)), &tileRegion);
+ nxagentPixmapCorruptedRegion(nxagentDrawableBitmap(pDrawable)), &tileRegion);
/*
* The drawable's corrupted region can be cleared if the
@@ -920,7 +920,7 @@ nxagentSynchronizeRegionStop:
int y = RegionRects(&collectedUpdates)[i].y1;
int w = RegionRects(&collectedUpdates)[i].x2 - RegionRects(&collectedUpdates)[i].x1;
int h = RegionRects(&collectedUpdates)[i].y2 - RegionRects(&collectedUpdates)[i].y1;
-
+
if (nxagentOption(Shadow) &&
(nxagentOption(XRatio) != DONT_SCALE ||
nxagentOption(YRatio) != DONT_SCALE))
@@ -2788,7 +2788,7 @@ void nxagentUnmarkExposedRegion(WindowPtr pWin, RegionPtr pRegion, RegionPtr pOt
RegionInit(&clipRegion, NullBox, 1);
RegionCopy(&clipRegion, pRegion);
-
+
if (pOther != NullRegion && !RegionNil(pOther))
{
RegionUnion(&clipRegion, &clipRegion, pOther);
@@ -2858,7 +2858,7 @@ void nxagentSendBackgroundExpose(WindowPtr pWin, PixmapPtr pBackground, RegionPt
#ifdef TEST
fprintf(stderr, "nxagentSendBackgroundExpose: Pixmap background [%dx%d] is "
"smaller than window [%dx%d]. Going to expose the winSize.\n",
- pBackground -> drawable.width, pBackground -> drawable.height,
+ pBackground -> drawable.width, pBackground -> drawable.height,
pWin -> drawable.width, pWin -> drawable.height);
#endif
@@ -2913,11 +2913,11 @@ void nxagentSendBackgroundExpose(WindowPtr pWin, PixmapPtr pBackground, RegionPt
/*
* Reduce the overall region to expose.
*/
-
+
RegionTranslate(&expose, -pWin -> drawable.x, -pWin -> drawable.y);
-
+
RegionSubtract(pExpose, pExpose, &expose);
-
+
RegionTranslate(&expose, pWin -> drawable.x, pWin -> drawable.y);
miWindowExposures(pWin, &expose, &expose);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
index 9ca7711b2..91f36e496 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
@@ -312,7 +312,7 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen)
for (int i = 2; i < nSizes - 1; i++)
{
- if ((w[i] <= maxWidth * 3 / 4) &&
+ if ((w[i] <= maxWidth * 3 / 4) &&
(h[i] <= maxHeight * 3 / 4) &&
(w[i] >= w[0]) &&
(h[i] >= h[0]))
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c
index b956bb8df..46e9cfe6f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GC.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c
@@ -219,13 +219,13 @@ void nxagentValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
if (!pGC -> tileIsPixel && !nxagentPixmapIsVirtual(pGC -> tile.pixmap))
{
- pGC -> tile.pixmap = nxagentVirtualPixmap(pGC -> tile.pixmap);
+ pGC -> tile.pixmap = nxagentVirtualPixmap(pGC -> tile.pixmap);
}
PixmapPtr lastTile = pGC -> tile.pixmap;
PixmapPtr lastStipple = pGC->stipple;
-
+
if (lastStipple)
{
pGC->stipple = nxagentVirtualPixmap(pGC->stipple);
@@ -403,7 +403,7 @@ void nxagentChangeGC(GCPtr pGC, unsigned long mask)
values.font = nxagentFont(pGC->font);
changeFlag += nxagentTestGC(values.font, font);
}
- }
+ }
CHECKGCVAL(GCSubwindowMode, subwindow_mode, pGC->subWindowMode);
CHECKGCVAL(GCGraphicsExposures, graphics_exposures, pGC->graphicsExposures);
@@ -595,7 +595,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects)
case CT_UNSORTED:
{
if (!clipsMatch && !nxagentGCTrap)
- {
+ {
XSetClipRectangles(nxagentDisplay, nxagentGC(pGC),
pGC->clipOrg.x, pGC->clipOrg.y,
(XRectangle *)pValue, nRects, Unsorted);
@@ -896,7 +896,7 @@ static void nxagentReconnectGC(void *param0, XID param1, void * param2)
#endif
}
- #ifdef DEBUG
+ #ifdef DEBUG
fprintf(stderr, "nxagentReconnectGC: GC at [%p].\n", (void *) pGC);
#endif
@@ -1036,7 +1036,7 @@ void nxagentDisconnectGC(void * p0, XID x1, void * p2)
if (!*pBool || !pGC)
{
- if (!pGC)
+ if (!pGC)
{
#ifdef WARNING
fprintf(stderr, "nxagentDisconnectGC: WARNING! pGC is NULL.\n");
@@ -1050,7 +1050,7 @@ void nxagentDisconnectGC(void * p0, XID x1, void * p2)
PixmapPtr pMap = pGC -> stipple;
nxagentDisconnectPixmap(nxagentRealPixmap(pMap), 0, pBool);
}
-}
+}
Bool nxagentDisconnectAllGCs(void)
{
@@ -1385,7 +1385,7 @@ GCPtr nxagentCreateGraphicContext(int depth)
*/
nxagentGraphicContextsPtr nxagentGCs = realloc(nxagentGraphicContexts, (nxagentGraphicContextsSize + 1) * sizeof(nxagentGraphicContextsRec));
-
+
if (nxagentGCs == NULL)
{
#ifdef WARNING
@@ -1471,4 +1471,3 @@ void nxagentDisconnectGraphicContexts(void)
return;
}
-
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index bac9947f0..176e087a0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -87,7 +87,7 @@ static int nxagentSaveGCTrap;
{ \
nxagentGCTrap = nxagentSaveGCTrap; \
}
-
+
/*
* This is currently unused.
*/
@@ -131,7 +131,7 @@ void nxagentSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pSrc,
else
{
fbSetSpans(pDrawable, pGC, pSrc, pPoints, pWidths, nSpans, fSorted);
- }
+ }
}
void nxagentGetSpans(DrawablePtr pDrawable, int maxWidth, xPoint *pPoints,
@@ -577,7 +577,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
#ifdef TEST
fprintf(stderr, "nxagentCopyArea: Image src [%s:%p], dst [%s:%p] (%d,%d) -> (%d,%d) size (%d,%d)\n",
(pSrcDrawable -> type == DRAWABLE_PIXMAP) ? "PIXMAP" : "WINDOW", (void *) pSrcDrawable,
- (pDstDrawable -> type == DRAWABLE_PIXMAP) ? "PIXMAP" : "WINDOW",
+ (pDstDrawable -> type == DRAWABLE_PIXMAP) ? "PIXMAP" : "WINDOW",
(void *) pDstDrawable, srcx, srcy, dstx, dsty, width, height);
#endif
@@ -669,7 +669,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
if (pSrcDrawable -> type == DRAWABLE_PIXMAP &&
pDstDrawable -> type == DRAWABLE_PIXMAP)
{
- return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable),
+ return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable),
nxagentVirtualDrawable(pDstDrawable),
pGC, srcx, srcy, width, height, dstx, dsty);
}
@@ -823,7 +823,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
(void *) nxagentVirtualDrawable(pDstDrawable));
#endif
- return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable),
+ return fbCopyArea(nxagentVirtualDrawable(pSrcDrawable),
nxagentVirtualDrawable(pDstDrawable),
pGC, srcx, srcy, width, height, dstx, dsty);
}
@@ -873,7 +873,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
}
}
- return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
+ return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
srcx, srcy, width, height, dstx, dsty, 0);
}
@@ -895,7 +895,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
if (pSrcDrawable -> type == DRAWABLE_PIXMAP &&
pDstDrawable -> type == DRAWABLE_PIXMAP)
{
- return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable),
+ return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable),
nxagentVirtualDrawable(pDstDrawable),
pGC, srcx, srcy, width, height, dstx, dsty, plane);
}
@@ -1041,7 +1041,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
(void *) nxagentVirtualDrawable(pDstDrawable));
#endif
- return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable),
+ return fbCopyPlane(nxagentVirtualDrawable(pSrcDrawable),
nxagentVirtualDrawable(pDstDrawable),
pGC, srcx, srcy, width, height, dstx, dsty, plane);
}
@@ -1061,7 +1061,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
srcx, srcy, width, height, dstx, dsty, plane);
}
- return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
+ return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
srcx, srcy, width, height, dstx, dsty, plane);
}
@@ -1507,7 +1507,7 @@ void nxagentPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
if (nRectangles == 1)
{
fprintf(stderr, "nxagentPolyFillRect: Drawable at [%p] GC at [%p] FillStyle [%d] Rectangle [%d,%d][%d,%d].\n",
- (void *) pDrawable, (void *) pGC, pGC -> fillStyle,
+ (void *) pDrawable, (void *) pGC, pGC -> fillStyle,
pRectangles -> x, pRectangles -> y, pRectangles -> width, pRectangles -> height);
}
else
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 639e3429e..77d498606 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -425,7 +425,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
}
#endif /* #ifdef DYNAMIC_DISPLAY_BUFFER */
-
+
/*
* Dispatch to the clients the events that may have become
* available.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index c033bf70d..a8ccef8ac 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -629,7 +629,7 @@ FIXME: Should use these.
pRegion -> extents.y1, pRegion -> extents.x2, pRegion -> extents.y2,
(void *) pDrawable);
#endif
-
+
nxagentMarkCorruptedRegion(pDrawable, pRegion);
goto nxagentPutImageEnd;
@@ -647,7 +647,7 @@ FIXME: Should use these.
pRegion -> extents.y1, pRegion -> extents.x2, pRegion -> extents.y2,
(void *) pDrawable);
#endif
-
+
nxagentMarkCorruptedRegion(pDrawable, pRegion);
goto nxagentPutImageEnd;
@@ -915,9 +915,9 @@ void nxagentRealizeImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
#ifdef WARNING
fprintf(stderr, "nxagentRealizeImage: WARNING! Visual not found. Using default visual.\n");
#endif
-
+
pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
- }
+ }
/*
* Get bytes per line according to format.
@@ -1089,7 +1089,7 @@ FIXME: Should use an unpack resource here.
if (client == NULL)
{
client = serverClient;
-
+
#ifdef TEST
fprintf(stderr, "nxagentPutSubImage: WARNING! Using the server client with index [%d].\n",
client -> index);
@@ -1405,7 +1405,7 @@ FIXME: There should be a callback registered by the agent that
* Add the image only if we have a valid checksum. This is the
* case only if we originally tried to find the image in cache.
*/
-
+
if (NXImageCacheSize > 0 && packedChecksum != NULL)
{
#ifdef DEBUG
@@ -1608,7 +1608,7 @@ int nxagentScaleImage(int x, int y, unsigned xRatio, unsigned yRatio,
if (newImage -> data == NULL)
{
SAFE_free(newImage);
-
+
#ifdef PANIC
fprintf(stderr, "nxagentScaleImage: PANIC! Failed to create the target image data.\n");
#endif
@@ -1703,4 +1703,3 @@ char *nxagentAllocateImageData(int width, int height, int depth, int *length, in
return data;
}
-
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index fe51b595a..ec6521cce 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -269,7 +269,7 @@ void InitOutput(ScreenInfo *scrInfo, int argc, char *argv[])
*/
if (nxagentOption(ImageRateLimit) != 0)
- {
+ {
fprintf(stderr, "Info: Image rate limit set to %u kB/s.\n", nxagentOption(ImageRateLimit));
}
@@ -380,10 +380,10 @@ FIXME: These variables, if not removed at all because have probably
#else
nxagentFontPrivateIndex = AllocateFontPrivateIndex();
#endif /* HAS_XFONT2 */
- RT_NX_FONT = CreateNewResourceType(nxagentDestroyNewFontResourceType);
+ RT_NX_FONT = CreateNewResourceType(nxagentDestroyNewFontResourceType);
nxagentClientPrivateIndex = AllocateClientPrivateIndex();
nxagentPixmapPrivateIndex = AllocatePixmapPrivateIndex();
- RT_NX_PIXMAP = CreateNewResourceType(nxagentDestroyNewPixmapResourceType);
+ RT_NX_PIXMAP = CreateNewResourceType(nxagentDestroyNewPixmapResourceType);
RT_NX_CORR_BACKGROUND = CreateNewResourceType(nxagentDestroyCorruptedBackgroundResource);
RT_NX_CORR_WINDOW = CreateNewResourceType(nxagentDestroyCorruptedWindowResource);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 2142adc8e..636414c40 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1292,7 +1292,7 @@ void nxagentInitXkbWrapper(void)
}
void nxagentDisableXkbExtension(void)
-{
+{
#ifdef TEST
fprintf(stderr, "%s: Called.\n", __func__);
#endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Literals.h b/nx-X11/programs/Xserver/hw/nxagent/Literals.h
index cef2904d1..9547b5aab 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Literals.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Literals.h
@@ -29,7 +29,7 @@
* opcode to the name of the X request.
*/
-static char *nxagentRequestLiteral[] =
+static char *nxagentRequestLiteral[] =
{
"None",
"CreateWindow",
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index cd57182a1..77da4c765 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -550,7 +550,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
nxagentFreeTimeoutTimer();
/* FIXME: maybe move the code up to the KillAllClients() call to ddxBeforeReset? */
- if ((dispatchException & DE_RESET) &&
+ if ((dispatchException & DE_RESET) &&
(serverGeneration > nxagentMaxAllowedResets))
{
dispatchException &= ~DE_RESET;
@@ -568,7 +568,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
* error on the display and wait until the
* NX transport is gone.
*/
-
+
fprintf(stderr, "Session: Terminating session at '%s'.\n", GetTimeAsString());
saveAgentState("TERMINATING");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index d3c8c7150..ddcd6443c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -234,7 +234,7 @@ typedef struct _AgentOptions
*/
Bool Reset;
- /*
+ /*
* Geometry of the agent root window, relative to the agent default
* window.
*/
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
index 8aaa9ecd8..1b415718b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.c
@@ -75,7 +75,7 @@ int nxagentUniquePixels(XImage *image)
*/
int total = image -> width * image -> height;
-
+
int step = total / elements;
if (step < PIXEL_STEP)
@@ -91,7 +91,7 @@ int nxagentUniquePixels(XImage *image)
/*
* Shift at the left after each scanline.
*/
-
+
if (image -> bytes_per_line % step == 0)
{
step++;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 30e5d1e3f..6d9be3a90 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -287,7 +287,7 @@ PixmapPtr nxagentCreatePixmap(ScreenPtr pScreen, int width, int height,
* pointers to pVirtualPixmap. We should also remove the copy of id
* and use the one of the real pixmap.
*/
-
+
pVirtualPriv -> id = pPixmapPriv -> id;
pVirtualPriv -> mid = 0;
@@ -783,7 +783,7 @@ void nxagentReconnectPixmap(void *p0, XID x1, void *p2)
#endif
}
-
+
if (nxagentDrawableStatus((DrawablePtr) pPixmap) == NotSynchronized)
{
if (nxagentIsCorruptedBackground(pPixmap) == 1)
@@ -1238,9 +1238,9 @@ FIXME: If the pixmap has a different depth from the window, the
#ifdef WARNING
fprintf(stderr, "nxagentPixmapOnShadowDisplay: WARNING! Visual not found. Using default visual.\n");
#endif
-
+
pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
- }
+ }
XImage *image = XCreateImage(nxagentDisplay, pVisual,
depth, format, 0, (char *) data,
@@ -1394,9 +1394,9 @@ Bool nxagentFbOnShadowDisplay(void)
#ifdef WARNING
fprintf(stderr, "nxagentFbOnShadowDisplay: WARNING! Visual not found. Using default visual.\n");
#endif
-
+
pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
- }
+ }
XImage *image = XCreateImage(nxagentDisplay, pVisual,
depth, format, 0, (char *) data,
@@ -1480,5 +1480,3 @@ void nxagentPrintResources(void)
}
#endif
-
-
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
index 1191049ad..87b12fe52 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c
@@ -90,7 +90,7 @@ void nxagentChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl)
fprintf(stderr, "%s: WARNING! Propagating changes to pointer settings.\n", __func__);
#endif
- XChangePointerControl(nxagentDisplay, True, True,
+ XChangePointerControl(nxagentDisplay, True, True,
ctrl->num, ctrl->den, ctrl->threshold);
return;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 205940ed7..386a4d273 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -759,7 +759,7 @@ void nxagentDestroyPicture(PicturePtr pPicture)
XRenderFreePicture(nxagentDisplay,
nxagentPicturePriv(pPicture) -> picture);
-
+
#ifdef DEBUG
XSync(nxagentDisplay, 0);
#endif
@@ -789,8 +789,8 @@ int nxagentChangePictureClip(PicturePtr pPicture, int clipType, int nRects,
{
#ifdef DEBUG
fprintf(stderr, "nxagentChangePictureClip: Clip type is [CT_PIXMAP].\n");
- #endif
-
+ #endif
+
/*
* if(!nRects)
* {
@@ -820,7 +820,7 @@ FIXME: Is this useful or just a waste of bandwidth?
#endif
break;
- }
+ }
case CT_NONE:
{
#ifdef DEBUG
@@ -859,7 +859,7 @@ FIXME: Is this useful or just a waste of bandwidth?
#ifdef DEBUG
fprintf(stderr, "nxagentChangePictureClip: Clip type is [CT_REGION].\n");
#endif
-
+
reg = XCreateRegion();
for (index = 0; index <= nRects; index++, rects++)
@@ -889,7 +889,7 @@ FIXME: Is this useful or just a waste of bandwidth?
#ifdef DEBUG
XSync(nxagentDisplay, 0);
#endif
-
+
XDestroyRegion(reg);
break;
@@ -1025,7 +1025,7 @@ void nxagentChangePicture(PicturePtr pPicture, Mask mask)
{
valuemask |= CPPolyEdge;
nxagentSetPictureRemoteValue(pPicture, poly_edge, attributes.poly_edge);
- }
+ }
}
if (mask & CPPolyMode)
@@ -1260,8 +1260,8 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
#ifdef TEST
if ((pSrc && pSrc->pDrawable) && (pDst && pDst->pDrawable)) {
fprintf(stderr, "nxagentGlyphs: Called with source [%s][%p] destination [%s][%p] and size id [%d].\n",
- (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pSrc,
- (pDst -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pDst,
+ (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pSrc,
+ (pDst -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), (void *) pDst,
sizeID);
}
#endif
@@ -1313,7 +1313,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
{
RegionPtr pRegion = nxagentCreateRegion(pDst -> pDrawable, NULL, glyphBox.x1, glyphBox.y1,
glyphBox.x2 - glyphBox.x1, glyphBox.y2 - glyphBox.y1);
-
+
if (RegionNil(pRegion))
{
#ifdef TEST
@@ -1356,7 +1356,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
#ifdef DEBUG
if (pSrc && pSrc->pDrawable) {
fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p] "
- "with geometry [%d,%d,%d,%d].\n",
+ "with geometry [%d,%d,%d,%d].\n",
(pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"),
(void *) pSrc -> pDrawable, pSrc -> pDrawable -> x, pSrc -> pDrawable -> y,
pSrc -> pDrawable -> x + pSrc -> pDrawable -> width,
@@ -1404,7 +1404,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
#ifdef DEBUG
if (pDst && pDst->pDrawable) {
fprintf(stderr, "nxagentGlyphs: Synchronizing destination [%s] at [%p] "
- "with geometry [%d,%d,%d,%d].\n",
+ "with geometry [%d,%d,%d,%d].\n",
(pDst -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"),
(void *) pDst -> pDrawable, pDst -> pDrawable -> x, pDst -> pDrawable -> y,
pDst -> pDrawable -> x + pDst -> pDrawable -> width,
@@ -1480,7 +1480,7 @@ void nxagentGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
x += glyph -> info.xOff;
y += glyph -> info.yOff;
-
+
#ifdef TEST
fprintf(stderr, "nxagentGlyphs: Glyph at index [%d] has offset [%d,%d] and "
"position [%d,%d].\n", i, elements -> nchars, glyph -> info.xOff,
@@ -2697,8 +2697,8 @@ void nxagentRenderCreateRadialGradient(PicturePtr pPicture, xPointFixed *inner,
void nxagentRenderCreateConicalGradient(PicturePtr pPicture,
xPointFixed *center,
- xFixed angle, int nStops,
- xFixed *stops,
+ xFixed angle, int nStops,
+ xFixed *stops,
xRenderColor *colors)
{
if (nxagentRenderEnable == False)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 026a8ff98..05bee177b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -258,10 +258,10 @@ void nxagentSetScreenInfo(ScreenInfo *scrInfo)
scrInfo -> bitmapBitOrder = BITMAP_BIT_ORDER;
#ifdef TEST
- fprintf(stderr, "nxagentSetScreenInfo: Server image order is [%d] bitmap order is [%d].\n",
+ fprintf(stderr, "%s: Server image order is [%d] bitmap order is [%d].\n", __func__,
scrInfo -> imageByteOrder, scrInfo -> bitmapBitOrder);
- fprintf(stderr, "nxagentSetScreenInfo: Server scanline unit is [%d] scanline pad is [%d].\n",
+ fprintf(stderr, "%s: Server scanline unit is [%d] scanline pad is [%d].\n", __func__,
scrInfo -> bitmapScanlineUnit, scrInfo -> bitmapScanlinePad);
#endif
}
@@ -284,8 +284,8 @@ void nxagentSetPixmapFormats(ScreenInfo *scrInfo)
scrInfo -> formats[i].scanlinePad = nxagentPixmapFormats[i].scanline_pad;
#ifdef TEST
- fprintf(stderr, "nxagentSetPixmapFormats: Set format at index [%d] to depth [%d] "
- "bits per pixel [%d] scanline pad [%d].\n", i,
+ fprintf(stderr, "%s: Set format at index [%d] to depth [%d] "
+ "bits per pixel [%d] scanline pad [%d].\n", __func__, i,
scrInfo -> formats[i].depth, scrInfo -> formats[i].bitsPerPixel,
scrInfo -> formats[i].scanlinePad);
#endif
@@ -433,7 +433,7 @@ Window nxagentCreateIconWindow(void)
unsigned long valuemask = CWOverrideRedirect | CWBackPixmap | CWColormap;
#ifdef TEST
- fprintf(stderr, "nxagentCreateIconWindow: Going to create new icon window.\n");
+ fprintf(stderr, "%s: Going to create new icon window.\n", __func__);
#endif
Window w = XCreateWindow(nxagentDisplay, DefaultRootWindow(nxagentDisplay),
@@ -448,7 +448,7 @@ Window nxagentCreateIconWindow(void)
fprintf(stderr, "NXAGENT_WINDOW_ID: ICON_WINDOW,WID:[0x%x]\n", w);
}
#ifdef TEST
- fprintf(stderr, "nxagentCreateIconWindow: Created new icon window with id [0x%x].\n",
+ fprintf(stderr, "%s: Created new icon window with id [0x%x].\n", __func__,
w);
#endif
@@ -530,14 +530,14 @@ Bool nxagentMagicPixelZone(int x, int y)
void nxagentSetScreenSaverTime(void)
{
#ifdef TEST
- fprintf(stderr, "nxagentSetScreenSaverTime: ScreenSaverTime was [%lu], ScreenSaverInterval was [%lu].\n",
+ fprintf(stderr, "%s: ScreenSaverTime was [%lu], ScreenSaverInterval was [%lu].\n", __func__,
(long unsigned int)ScreenSaverTime, (long unsigned int)ScreenSaverInterval);
#endif
ScreenSaverInterval = ScreenSaverTime;
#ifdef TEST
- fprintf(stderr, "nxagentSetScreenSaverTime: ScreenSaverTime now is [%lu], ScreenSaverInterval now is [%lu].\n",
+ fprintf(stderr, "%s: ScreenSaverTime now is [%lu], ScreenSaverInterval now is [%lu].\n", __func__,
(long unsigned int)ScreenSaverTime, (long unsigned int)ScreenSaverInterval);
#endif
}
@@ -671,7 +671,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
xid = FakeClientID(serverClient -> index);
#ifdef TEST
- fprintf(stderr, "nxagentInitViewportFrame: XID = [%lx]\n", xid);
+ fprintf(stderr, "%s: XID = [%lx]\n", __func__, xid);
#endif
nxagentViewportFrameLeft = CreateWindow(xid, pRootWin, -NXAGENT_FRAME_WIDTH, 0, NXAGENT_FRAME_WIDTH,
@@ -685,7 +685,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
if (error != Success)
{
#ifdef WARNING
- fprintf(stderr, "nxagentInitViewportFrame: Error creating nxagentViewportFrameLeft.\n");
+ fprintf(stderr, "%s: Error creating nxagentViewportFrameLeft.\n", __func__);
#endif
error = Success;
@@ -694,7 +694,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
xid = FakeClientID(serverClient -> index);
#ifdef TEST
- fprintf(stderr, "nxagentInitViewportFrame: XID = [%lx]\n", xid);
+ fprintf(stderr, "%s: XID = [%lx]\n", __func__, xid);
#endif
nxagentViewportFrameRight = CreateWindow(xid, pRootWin, pRootWin -> drawable.width, 0,
@@ -710,7 +710,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
if (error != Success)
{
#ifdef WARNING
- fprintf(stderr, "nxagentInitViewportFrame: Error creating nxagentViewportFrameRight.\n");
+ fprintf(stderr, "%s: Error creating nxagentViewportFrameRight.\n", __func__);
#endif
error = Success;
@@ -719,7 +719,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
xid = FakeClientID(serverClient -> index);
#ifdef TEST
- fprintf(stderr, "nxagentInitViewportFrame: XID = [%lx]\n", xid);
+ fprintf(stderr, "%s: XID = [%lx]\n", __func__, xid);
#endif
nxagentViewportFrameAbove = CreateWindow(xid, pRootWin, 0, -NXAGENT_FRAME_WIDTH,
@@ -735,7 +735,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
if (error != Success)
{
#ifdef WARNING
- fprintf(stderr, "nxagentInitViewportFrame: Error creating nxagentViewportFrameAbove.\n");
+ fprintf(stderr, "%s: Error creating nxagentViewportFrameAbove.\n", __func__);
#endif
error = Success;
@@ -744,7 +744,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
xid = FakeClientID(serverClient -> index);
#ifdef TEST
- fprintf(stderr, "nxagentInitViewportFrame: XID = [%lx]\n", xid);
+ fprintf(stderr, "%s: XID = [%lx]\n", __func__, xid);
#endif
nxagentViewportFrameBelow = CreateWindow(xid, pRootWin, 0,
@@ -760,7 +760,7 @@ void nxagentInitViewportFrame(ScreenPtr pScreen, WindowPtr pRootWin)
if (error != Success)
{
#ifdef WARNING
- fprintf(stderr, "nxagentInitViewportFrame: Error creating nxagentViewportFrameBelow.\n");
+ fprintf(stderr, "%s: Error creating nxagentViewportFrameBelow.\n", __func__);
#endif
}
@@ -857,7 +857,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
Bool resetAgentPosition = False;
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Called for screen index [%d].\n",
+ fprintf(stderr, "%s: Called for screen index [%d].\n", __func__,
pScreen->myNum);
#endif
@@ -963,7 +963,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
if (!nxagentOption(Rootless) && !nxagentWMIsRunning)
{
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Forcing fullscreen mode with no window manager running.\n");
+ fprintf(stderr, "%s: Forcing fullscreen mode with no window manager running.\n", __func__);
#endif
nxagentChangeOption(Fullscreen, True);
@@ -983,7 +983,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
nxagentXServerGeometryChanged())
{
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Forcing window mode with server geometry changed.\n");
+ fprintf(stderr, "%s: Forcing window mode with server geometry changed.\n", __func__);
#endif
nxagentChangeOption(Fullscreen, False);
@@ -1288,7 +1288,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
if (depthIndex == UNDEFINED)
{
#ifdef WARNING
- fprintf(stderr, "nxagentOpenScreen: WARNING! Can't find a matching depth for visual depth [%d].\n",
+ fprintf(stderr, "%s: WARNING! Can't find a matching depth for visual depth [%d].\n", __func__,
nxagentVisuals[i].depth);
#endif
@@ -1345,8 +1345,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
}
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Frame buffer allocated. rootDepth "
- "[%d] bitsPerPixel [%d] sizeInBytes [%d]\n", rootDepth, bitsPerPixel, sizeInBytes);
+ fprintf(stderr, "%s: Frame buffer allocated. rootDepth "
+ "[%d] bitsPerPixel [%d] sizeInBytes [%d]\n", __func__, rootDepth, bitsPerPixel, sizeInBytes);
#endif
void * pFrameBufferBits = (char *) malloc(sizeInBytes);
@@ -1359,8 +1359,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
}
#if defined(DEBUG) || defined(DEBUG_COLORMAP)
- fprintf(stderr, "nxagentOpenScreen: Before fbScreenInit numVisuals [%d] numDepths [%d] "
- "rootDepth [%d] defaultVisual [%lu].\n", numVisuals, numDepths,
+ fprintf(stderr, "%s: Before fbScreenInit numVisuals [%d] numDepths [%d] "
+ "rootDepth [%d] defaultVisual [%lu].\n", __func__, numVisuals, numDepths,
rootDepth, (long unsigned int)defaultVisual);
#endif
@@ -1385,8 +1385,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
}
#if defined(DEBUG) || defined(DEBUG_COLORMAP)
- fprintf(stderr, "nxagentOpenScreen: After fbScreenInit numVisuals [%d] numDepths [%d] "
- "rootDepth [%d] defaultVisual [%lu].\n", numVisuals, numDepths,
+ fprintf(stderr, "%s: After fbScreenInit numVisuals [%d] numDepths [%d] "
+ "rootDepth [%d] defaultVisual [%lu].\n", __func__, numVisuals, numDepths,
rootDepth, (long unsigned int)defaultVisual);
#endif
@@ -1396,8 +1396,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
*/
#if defined(DEBUG) || defined(DEBUG_COLORMAP)
- fprintf(stderr, "nxagentOpenScreen: Before GLX numVisuals [%d] numDepths [%d] "
- "rootDepth [%d] defaultVisual [%lu].\n", numVisuals, numDepths,
+ fprintf(stderr, "%s: Before GLX numVisuals [%d] numDepths [%d] "
+ "rootDepth [%d] defaultVisual [%lu].\n", __func__, numVisuals, numDepths,
rootDepth, (long unsigned int)defaultVisual);
#endif
@@ -1405,8 +1405,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
&rootDepth, &defaultVisual);
#if defined(DEBUG) || defined(DEBUG_COLORMAP)
- fprintf(stderr, "nxagentOpenScreen: After GLX numVisuals [%d] numDepths [%d] "
- "rootDepth [%d] defaultVisual [%lu].\n", numVisuals, numDepths,
+ fprintf(stderr, "%s: After GLX numVisuals [%d] numDepths [%d] "
+ "rootDepth [%d] defaultVisual [%lu].\n", __func__, numVisuals, numDepths,
rootDepth, (long unsigned int)defaultVisual);
#endif
@@ -1435,7 +1435,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
#ifdef WATCH
- fprintf(stderr, "nxagentOpenScreen: Watchpoint 7.\n");
+ fprintf(stderr, "%s: Watchpoint 7.\n", __func__);
/*
Reply Total Cached Bits In Bits Out Bits/Reply Ratio
@@ -1620,7 +1620,7 @@ N/A
if (enableBackingStore)
{
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Going to initialize backing store.\n");
+ fprintf(stderr, "%s: Going to initialize backing store.\n", __func__);
#endif
pScreen -> BackingStoreFuncs.SaveAreas = nxagentSaveAreas;
@@ -1752,7 +1752,7 @@ N/A
*/
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Going to create new default window.\n");
+ fprintf(stderr, "%s: Going to create new default window.\n", __func__);
#endif
nxagentDefaultWindows[pScreen->myNum] =
@@ -1824,7 +1824,7 @@ N/A
#endif
{
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window with id [%ld].\n",
+ fprintf(stderr, "%s: Setting WM_CLASS and WM_NAME for window with id [%ld].\n", __func__,
(long int)nxagentDefaultWindows[pScreen->myNum]);
#endif
@@ -1971,7 +1971,7 @@ N/A
if (!nxagentWMIsRunning && !nxagentOption(Fullscreen))
{
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: No window manager, we call XGrabKeyboard.\n");
+ fprintf(stderr, "%s: No window manager, we call XGrabKeyboard.\n", __func__);
#endif
XGrabKeyboard(nxagentDisplay, RootWindow (nxagentDisplay, 0), True, GrabModeAsync,
@@ -1982,7 +1982,7 @@ N/A
if (!nxagentCreateDefaultColormap(pScreen))
{
#ifdef PANIC
- fprintf(stderr, "nxagentOpenScreen: Failed to create default colormap for screen.\n");
+ fprintf(stderr, "%s: Failed to create default colormap for screen.\n", __func__);
#endif
return False;
@@ -1999,7 +1999,7 @@ N/A
XlibAtom deleteWMatom = nxagentAtoms[2]; /* WM_DELETE_WINDOW */
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: Found WM, delete window atom [%ld].\n",
+ fprintf(stderr, "%s: Found WM, delete window atom [%ld].\n", __func__,
deleteWMatom);
#endif
@@ -2041,7 +2041,7 @@ N/A
if (nxagentOption(Fullscreen))
{
#ifdef TEST
- fprintf(stderr, "nxagentOpenScreen: WARNING! Forcing propagation of device control changes.\n");
+ fprintf(stderr, "%s: WARNING! Forcing propagation of device control changes.\n", __func__);
#endif
nxagentChangeOption(DeviceControl, True);
@@ -2102,7 +2102,7 @@ N/A
#ifdef WATCH
- fprintf(stderr, "nxagentOpenScreen: Watchpoint 8.\n");
+ fprintf(stderr, "%s: Watchpoint 8.\n", __func__);
/*
Reply Total Cached Bits In Bits Out Bits/Reply Ratio
@@ -2123,7 +2123,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
Bool nxagentCloseScreen(ScreenPtr pScreen)
{
#ifdef DEBUG
- fprintf(stderr, "running nxagentCloseScreen()\n");
+ fprintf(stderr, "running %s()\n", __func__);
#endif
/*
@@ -2575,7 +2575,7 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
}
#ifdef DEBUG
- fprintf(stderr, "nxagentShadowInit: Setting the master uid [%d].\n",
+ fprintf(stderr, "%s: Setting the master uid [%d].\n", __func__,
nxagentShadowUid);
#endif
@@ -2593,8 +2593,8 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
(void *) &nxagentShadowDisplay) != 1)
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowInit: PANIC! Failed to initialize shadow "
- "display [%s].\n", nxagentShadowDisplayName);
+ fprintf(stderr, "%s: PANIC! Failed to initialize shadow "
+ "display [%s].\n", __func__, nxagentShadowDisplayName);
#endif
return -1;
@@ -2614,7 +2614,7 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
&nxagentShadowHeight, &nxagentMasterDepth) == 0)
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowInit: PANIC! Failed to add display [%s].\n",
+ fprintf(stderr, "%s: PANIC! Failed to add display [%s].\n", __func__,
nxagentDisplayName);
#endif
@@ -2636,8 +2636,8 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
class != TrueColor)
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowInit: PANIC! The visual class of the remote "
- "X server is not TrueColor.\n");
+ fprintf(stderr, "%s: PANIC! The visual class of the remote "
+ "X server is not TrueColor.\n", __func__);
#endif
return -1;
@@ -2660,9 +2660,9 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
default: { className = ""; break; }
}
- fprintf(stderr, "nxagentShadowInit: PANIC! Cannot shadow the display. "
+ fprintf(stderr, "%s: PANIC! Cannot shadow the display. "
"%s visual class is not supported. Only TrueColor visuals "
- "are supported.\n", className);
+ "are supported.\n", __func__, className);
#endif /* #endif PANIC */
@@ -2683,8 +2683,8 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
else if (nxagentShadowDepth == 8)
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowInit: PANIC! Unable to shadow a %d bit "
- "display with a 8 bit screen depth.\n", nxagentMasterDepth);
+ fprintf(stderr, "%s: PANIC! Unable to shadow a %d bit "
+ "display with a 8 bit screen depth.\n", __func__, nxagentMasterDepth);
#endif
return -1;
@@ -2703,8 +2703,8 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
else if (nxagentShadowDepth == 8)
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowInit: PANIC! Unable to shadow a 16 bit "
- "display with a 8 bit screen depth.\n");
+ fprintf(stderr, "%s: PANIC! Unable to shadow a 16 bit "
+ "display with a 8 bit screen depth.\n", __func__);
#endif
return -1;
@@ -2719,8 +2719,8 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
if (nxagentShadowDepth != 8)
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowInit: PANIC! Unable to shadow a 8 bit "
- "display with a %d bit screen depth.\n", nxagentShadowDepth);
+ fprintf(stderr, "%s: PANIC! Unable to shadow a 8 bit "
+ "display with a %d bit screen depth.\n", __func__, nxagentShadowDepth);
#endif
return -1;
@@ -2733,7 +2733,7 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
default:
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowInit: PANIC! The depth is not 32, 24, 16 or 8 bit.\n");
+ fprintf(stderr, "%s: PANIC! The depth is not 32, 24, 16 or 8 bit.\n", __func__);
#endif
return -1;
@@ -2758,8 +2758,8 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin)
nxagentShadowXConnectionNumber = XConnectionNumber(nxagentShadowDisplay);
#ifdef TEST
- fprintf(stderr, "nxagentShadowInit: Adding the X connection [%d] "
- "to the device set.\n", nxagentShadowXConnectionNumber);
+ fprintf(stderr, "%s: Adding the X connection [%d] "
+ "to the device set.\n", __func__, nxagentShadowXConnectionNumber);
#endif
SetNotifyFd(nxagentShadowXConnectionNumber, nxagentNotifyConnection, X_NOTIFY_READ, NULL);
@@ -2817,7 +2817,7 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width,
NXShadowUpdateBuffer((void *)&nxagentShadowBuffer);
#ifdef TEST
- fprintf(stderr, "nxagentShadowCreateMainWindow: Update frame buffer [%p].\n", nxagentShadowBuffer);
+ fprintf(stderr, "%s: Update frame buffer [%p].\n", __func__, nxagentShadowBuffer);
#endif
nxagentShadowSetWindowOptions();
@@ -2840,16 +2840,16 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width,
nxagentShadowPixmapPtr -> drawable.id = accessPixmapID;
#ifdef TEST
- fprintf(stderr, "nxagentShadowCreateMainWindow: nxagentShadowPixmapPtr [%p] PixmapM -> drawable.id [%u].\n",
+ fprintf(stderr, "%s: nxagentShadowPixmapPtr [%p] PixmapM -> drawable.id [%u].\n", __func__,
(void *)nxagentShadowPixmapPtr, nxagentShadowPixmapPtr -> drawable.id);
- fprintf(stderr, "nxagentShadowCreateMainWindow: Create pixmap with width [%d] height [%d] depth [%d].\n",
+ fprintf(stderr, "%s: Create pixmap with width [%d] height [%d] depth [%d].\n", __func__,
nxagentShadowWidth, nxagentShadowHeight, (int)nxagentShadowDepth);
#endif
}
else
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowCreateMainWindow: PANIC! Failed to create pixmap with width [%d] height [%d] depth [%d].\n",
+ fprintf(stderr, "%s: PANIC! Failed to create pixmap with width [%d] height [%d] depth [%d].\n", __func__,
nxagentShadowWidth, nxagentShadowHeight, (int)nxagentShadowDepth);
#endif
}
@@ -2876,14 +2876,14 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width,
if (nxagentShadowGCPtr)
{
#ifdef TEST
- fprintf(stderr, "nxagentShadowCreateMainWindow: Created GC with pGC[%p]\n", (void *) nxagentShadowGCPtr);
+ fprintf(stderr, "%s: Created GC with pGC[%p]\n", __func__, (void *) nxagentShadowGCPtr);
#endif
ValidateGC((DrawablePtr)nxagentShadowPixmapPtr, nxagentShadowGCPtr);
}
else
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowCreateMainWindow: PANIC! Failed to create GC.");
+ fprintf(stderr, "%s: PANIC! Failed to create GC.", __func__);
#endif
}
@@ -2916,11 +2916,11 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width,
if (nxagentShadowWindowPtr && !error)
{
#ifdef TEST
- fprintf(stderr, "nxagentShadowCreateMainWindow: Create window with nxagentShadowWindowPtr [%p]"
- "nxagentShadowWindowPtr -> drawable.id [%u].\n", (void *) nxagentShadowWindowPtr,
+ fprintf(stderr, "%s: Create window with nxagentShadowWindowPtr [%p]"
+ "nxagentShadowWindowPtr -> drawable.id [%u].\n", __func__, (void *) nxagentShadowWindowPtr,
nxagentShadowWindowPtr -> drawable.id);
- fprintf(stderr, "nxagentShadowCreateMainWindow: parent nxagentShadowWindowPtr [%p] parent -> drawable.id [%u].\n",
+ fprintf(stderr, "%s: parent nxagentShadowWindowPtr [%p] parent -> drawable.id [%u].\n", __func__,
(void *)nxagentShadowWindowPtr->parent, nxagentShadowWindowPtr -> parent -> drawable.id);
#endif
@@ -2930,7 +2930,7 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width,
else
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowCreateMainWindow: PANIC! Failed to create window.\n");
+ fprintf(stderr, "%s: PANIC! Failed to create window.\n", __func__);
#endif
}
@@ -2945,7 +2945,7 @@ int nxagentShadowCreateMainWindow(ScreenPtr pScreen, WindowPtr pWin, int width,
XConfigureWindow(nxagentDisplay, nxagentWindow(pWin), mask, &changes);
#ifdef TEST
- fprintf(stderr, "nxagentShadowCreateMainWindow: Completed mapping of Access window.\n");
+ fprintf(stderr, "%s: Completed mapping of Access window.\n", __func__);
#endif
return 0;
@@ -2994,7 +2994,7 @@ int nxagentShadowPoll(PixmapPtr shadowPixmapPtr, GCPtr shadowGCPtr,
BoxRec *pBox = (BoxRec *)ptBox;
#ifdef TEST
- fprintf(stderr, "nxagentShadowPoll: nRects[%ld], pBox[%p] depth[%d].\n", numRects, (void *) pBox, shadowDepth);
+ fprintf(stderr, "%s: nRects[%ld], pBox[%p] depth[%d].\n", __func__, numRects, (void *) pBox, shadowDepth);
#endif
for (int n = 0; n < numRects; n++)
@@ -3023,7 +3023,7 @@ int nxagentShadowPoll(PixmapPtr shadowPixmapPtr, GCPtr shadowGCPtr,
int line = PixmapBytePad(width, nxagentMasterDepth);
#ifdef DEBUG
- fprintf(stderr, "nxagentShadowPoll: Rectangle Number[%d] - x[%d]y[%d]W[%u]H[%u].\n", n+1, x, y, width, height);
+ fprintf(stderr, "%s: Rectangle Number[%d] - x[%d]y[%d]W[%u]H[%u].\n", __func__, n+1, x, y, width, height);
#endif
unsigned int length = nxagentImageLength(width, height, ZPixmap, 0, nxagentMasterDepth);
@@ -3035,7 +3035,7 @@ int nxagentShadowPoll(PixmapPtr shadowPixmapPtr, GCPtr shadowGCPtr,
if (tBuffer == NULL)
{
#ifdef PANIC
- fprintf(stderr, "nxagentShadowPoll: malloc failed.\n");
+ fprintf(stderr, "%s: malloc failed.\n", __func__);
#endif
return -1;
@@ -3083,7 +3083,7 @@ int nxagentShadowPoll(PixmapPtr shadowPixmapPtr, GCPtr shadowGCPtr,
else if (result == -1)
{
#ifdef TEST
- fprintf(stderr, "nxagentShadowPoll: polling failed!\n");
+ fprintf(stderr, "%s: polling failed!\n", __func__);
#endif
usleep(50 * 1000);
@@ -3117,14 +3117,14 @@ void nxagentShadowAdaptDepth(unsigned int width, unsigned int height,
if (pVisual == NULL)
{
#ifdef WARNING
- fprintf(stderr, "nxagentCorrectDepthShadow: WARNING! Visual not found. Using default visual.\n");
+ fprintf(stderr, "%s: WARNING! Visual not found. Using default visual.\n", __func__);
#endif
pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
}
#ifdef TEST
- fprintf(stderr, "nxagentCorrectDepthShadow: Shadow redMask [%lu] greenMask[%lu] blueMask[%lu].\n",
+ fprintf(stderr, "%s: Shadow redMask [%lu] greenMask[%lu] blueMask[%lu].\n", __func__,
pVisual -> red_mask, pVisual -> green_mask, pVisual -> blue_mask);
#endif
@@ -3133,7 +3133,7 @@ void nxagentShadowAdaptDepth(unsigned int width, unsigned int height,
unsigned long blueMask = nxagentShadowDisplay -> screens[0].root_visual[0].blue_mask;
#ifdef TEST
- fprintf(stderr, "nxagentCorrectDepthShadow: Master redMask [%lu] greenMask[%lu] blueMask[%lu].\n",
+ fprintf(stderr, "%s: Master redMask [%lu] greenMask[%lu] blueMask[%lu].\n", __func__,
redMask, greenMask, blueMask);
#endif
@@ -3147,7 +3147,7 @@ void nxagentShadowAdaptDepth(unsigned int width, unsigned int height,
unsigned int pad = lineMaster - nxagentBppMaster * width;
#ifdef TEST
- fprintf(stderr, "nxagentCorrectDepthShadow: line [%d] width[%d] pad[%d].\n", lineMaster, width, pad);
+ fprintf(stderr, "%s: line [%d] width[%d] pad[%d].\n", __func__, lineMaster, width, pad);
#endif
while (height > 0)
@@ -3230,7 +3230,7 @@ void nxagentShadowAdaptDepth(unsigned int width, unsigned int height,
unsigned int pad = lineShadow - nxagentBppShadow * width;
#ifdef TEST
- fprintf(stderr, "nxagentCorrectDepthShadow: line [%d] width[%d] pad[%d].\n", lineShadow, width, pad);
+ fprintf(stderr, "%s: line [%d] width[%d] pad[%d].\n", __func__, lineShadow, width, pad);
#endif
while (height > 0)
@@ -3351,7 +3351,7 @@ FIXME: The port information is not used at the moment and produces a
ulReturnItems > 0 && pszReturnData != NULL)
{
#ifdef TEST
- fprintf(stderr, "nxagentPropagateArtsdProperties: Got [%ld] elements of format [%d] with [%ld] bytes left.\n",
+ fprintf(stderr, "%s: Got [%ld] elements of format [%d] with [%ld] bytes left.\n", __func__,
ulReturnItems, iReturnFormat, ulReturnBytesLeft);
#endif
@@ -3359,7 +3359,7 @@ FIXME: The port information is not used at the moment and produces a
if (ulReturnBytesLeft > 0)
{
- fprintf(stderr, "nxagentPropagateArtsdProperties: WARNING! Could not get the whole ARTSD property data.\n");
+ fprintf(stderr, "%s: WARNING! Could not get the whole ARTSD property data.\n", __func__);
}
#endif
@@ -3482,7 +3482,7 @@ Bool nxagentReconnectScreen(void *p0)
PixmapPtr pPixmap = (PixmapPtr)nxagentDefaultScreen->devPrivate;
#if defined(NXAGENT_RECONNECT_DEBUG) || defined(NXAGENT_RECONNECT_SCREEN_DEBUG)
- fprintf(stderr, "nxagentReconnectScreen\n");
+ fprintf(stderr, "%s\n", __func__);
#endif
if (!nxagentOpenScreen(nxagentDefaultScreen, nxagentArgc, nxagentArgv))
@@ -3496,7 +3496,7 @@ Bool nxagentReconnectScreen(void *p0)
pPixmap -> drawable.height,
pPixmap -> drawable.depth);
#ifdef NXAGENT_RECONNECT_SCREEN_DEBUG
- fprintf(stderr, "nxagentReconnectScreen: recreated %p - ID %lx\n",
+ fprintf(stderr, "%s: recreated %p - ID %lx\n", __func__,
pPixmap,
nxagentPixmap( pPixmap ));
#endif
@@ -3548,7 +3548,7 @@ Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah,
if (ax2 < bx1 || bx2 < ax1 || ay2 < by1 || by2 < ay1) {
#ifdef DEBUG
- fprintf(stderr, "intersect: the given rectangles do not intersect at all\n");
+ fprintf(stderr, "%s: the given rectangles do not intersect at all\n", __func__);
#endif
return FALSE;
@@ -3568,7 +3568,7 @@ Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah,
if (iw <= 0 || ih <= 0) {
#ifdef DEBUG
- fprintf(stderr, "intersect: intersection rectangle not feasible\n");
+ fprintf(stderr, "%s: intersection rectangle not feasible\n", __func__);
#endif
return FALSE;
@@ -3579,7 +3579,7 @@ Bool intersect(int ax1, int ay1, unsigned int aw, unsigned int ah,
*h = ih;
#ifdef DEBUG
- fprintf(stderr, "intersect: intersection is: ([%d],[%d]) [ %d x %d ]\n", *x, *y, *w, *h);
+ fprintf(stderr, "%s: intersection is: ([%d],[%d]) [ %d x %d ]\n", __func__, *x, *y, *w, *h);
#endif
return TRUE;
@@ -3595,9 +3595,9 @@ Bool intersect_bb(int ax1, int ay1, unsigned int aw, unsigned int ah,
{
#ifdef DEBUG
- fprintf(stderr, "intersect_bb: session window: ([%d],[%d]) [ %d x %d ]\n", ax1, ay1, aw, ah);
- fprintf(stderr, "intersect_bb: crtc: ([%d],[%d]) [ %d x %d ]\n", bx1, by1, bw, bh);
- fprintf(stderr, "intersect_bb: bounding box: ([%d],[%d]) [ %d x %d ]\n", bbx1, bby1, bbx2-bbx1, bby2-bby1);
+ fprintf(stderr, "%s: session window: ([%d],[%d]) [ %d x %d ]\n", __func__, ax1, ay1, aw, ah);
+ fprintf(stderr, "%s: crtc: ([%d],[%d]) [ %d x %d ]\n", __func__, bx1, by1, bw, bh);
+ fprintf(stderr, "%s: bounding box: ([%d],[%d]) [ %d x %d ]\n", __func__, bbx1, bby1, bbx2-bbx1, bby2-bby1);
#endif
Bool result = intersect(ax1, ay1, aw, ah, bx1, by1, bw, bh, x, y, w, h);
@@ -3615,7 +3615,7 @@ Bool intersect_bb(int ax1, int ay1, unsigned int aw, unsigned int ah,
*x = 0;
#ifdef DEBUG
- fprintf(stderr, "intersect_bb: session box is outside-left of the bounding box - width gets adapted to [%d]\n", *w);
+ fprintf(stderr, "%s: session box is outside-left of the bounding box - width gets adapted to [%d]\n", __func__, *w);
#endif
}
@@ -3625,7 +3625,7 @@ Bool intersect_bb(int ax1, int ay1, unsigned int aw, unsigned int ah,
*w += ax1 + aw - bbx2;
#ifdef DEBUG
- fprintf(stderr, "intersect_bb: session box is outside-right of the bounding box - width gets adapted to [%d]\n", *w);
+ fprintf(stderr, "%s: session box is outside-right of the bounding box - width gets adapted to [%d]\n", __func__, *w);
#endif
}
@@ -3640,7 +3640,7 @@ Bool intersect_bb(int ax1, int ay1, unsigned int aw, unsigned int ah,
*y = 0;
#ifdef DEBUG
- fprintf(stderr, "intersect_bb: session box is outside-above of the bounding box - height gets adapted to [%d]\n", *h);
+ fprintf(stderr, "%s: session box is outside-above of the bounding box - height gets adapted to [%d]\n", __func__, *h);
#endif
}
@@ -3650,7 +3650,7 @@ Bool intersect_bb(int ax1, int ay1, unsigned int aw, unsigned int ah,
*h += ay1 + ah - bby2;
#ifdef DEBUG
- fprintf(stderr, "intersect_bb: session box is outside-below of the bounding box - height gets adapted to [%d]\n", *h);
+ fprintf(stderr, "%s: session box is outside-below of the bounding box - height gets adapted to [%d]\n", __func__, *h);
#endif
}
}
@@ -3738,11 +3738,11 @@ void nxagentAdjustCustomMode(ScreenPtr pScreen)
int nxagentChangeScreenConfig(int screen, int width, int height, Bool doresize)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentChangeScreenConfig: called for screen [%d], width [%d] height [%d] doresize [%d]\n", screen, width, height, doresize);
+ fprintf(stderr, "%s: called for screen [%d], width [%d] height [%d] doresize [%d]\n", __func__, screen, width, height, doresize);
#endif
#ifdef TEST
- fprintf(stderr, "nxagentChangeScreenConfig: screenInfo.screens[%d]->root [%p]\n", screen, (void *) screenInfo.screens[screen]);
+ fprintf(stderr, "%s: screenInfo.screens[%d]->root [%p]\n", __func__, screen, (void *) screenInfo.screens[screen]);
#endif
if (screenInfo.screens[screen]->root == NULL)
{
@@ -3753,15 +3753,15 @@ int nxagentChangeScreenConfig(int screen, int width, int height, Bool doresize)
#ifdef DEBUG
if (nxagentGrabServerInfo.grabstate == SERVER_GRABBED)
- fprintf(stderr, "nxagentChangeScreenConfig: grabstate [SERVER_GRABBED], client [%p]\n", (void *) nxagentGrabServerInfo.client);
+ fprintf(stderr, "%s: grabstate [SERVER_GRABBED], client [%p]\n", __func__, (void *) nxagentGrabServerInfo.client);
else if (nxagentGrabServerInfo.grabstate == SERVER_UNGRABBED)
- fprintf(stderr, "nxagentChangeScreenConfig: grabstate [SERVER_UNGRABBED], client [%p]\n", (void *) nxagentGrabServerInfo.client);
+ fprintf(stderr, "%s: grabstate [SERVER_UNGRABBED], client [%p]\n", __func__, (void *) nxagentGrabServerInfo.client);
else if (nxagentGrabServerInfo.grabstate == CLIENT_PERVIOUS)
- fprintf(stderr, "nxagentChangeScreenConfig: grabstate [CLIENT_PERVIOUS], client [%p]\n", (void *) nxagentGrabServerInfo.client);
+ fprintf(stderr, "%s: grabstate [CLIENT_PERVIOUS], client [%p]\n", __func__, (void *) nxagentGrabServerInfo.client);
else if (nxagentGrabServerInfo.grabstate == CLIENT_IMPERVIOUS)
- fprintf(stderr, "nxagentChangeScreenConfig: grabstate [CLIENT_IMPERVIOUS], client [%p]\n", (void *) nxagentGrabServerInfo.client);
+ fprintf(stderr, "%s: grabstate [CLIENT_IMPERVIOUS], client [%p]\n", __func__, (void *) nxagentGrabServerInfo.client);
else
- fprintf(stderr, "nxagentChangeScreenConfig: grabstate [UNKNOWN], client [%p]\n", (void *) nxagentGrabServerInfo.client);
+ fprintf(stderr, "%s: grabstate [UNKNOWN], client [%p]\n", __func__, (void *) nxagentGrabServerInfo.client);
#endif
if (nxagentGrabServerInfo.grabstate == SERVER_GRABBED)
@@ -3774,7 +3774,7 @@ int nxagentChangeScreenConfig(int screen, int width, int height, Bool doresize)
*/
#ifdef TEST
- fprintf(stderr, "nxagentChangeScreenConfig: Cancel with grabbed server (grab held by [%p]).\n", (void *) nxagentGrabServerInfo.client);
+ fprintf(stderr, "%s: Cancel with grabbed server (grab held by [%p]).\n", __func__, (void *) nxagentGrabServerInfo.client);
#endif
return 0;
@@ -3783,7 +3783,7 @@ int nxagentChangeScreenConfig(int screen, int width, int height, Bool doresize)
ScreenPtr pScreen = screenInfo.screens[screen] -> root -> drawable.pScreen;
#ifdef TEST
- fprintf(stderr, "nxagentChangeScreenConfig: Changing config to %d x %d\n", width, height);
+ fprintf(stderr, "%s: Changing config to %d x %d\n", __func__, width, height);
#endif
int r = nxagentResizeScreen(pScreen, width, height, 0, 0, doresize);
@@ -3805,8 +3805,8 @@ int nxagentChangeScreenConfig(int screen, int width, int height, Bool doresize)
}
#ifdef DEBUG
- fprintf(stderr, "nxagentChangeScreenConfig: current geometry: %d,%d %dx%d\n", nxagentOption(X), nxagentOption(Y), nxagentOption(Width), nxagentOption(Height));
- fprintf(stderr, "nxagentChangeScreenConfig: returning [%d]\n", r);
+ fprintf(stderr, "%s: current geometry: %d,%d %dx%d\n", __func__, nxagentOption(X), nxagentOption(Y), nxagentOption(Width), nxagentOption(Height));
+ fprintf(stderr, "%s: returning [%d]\n", __func__, r);
#endif
return r;
@@ -3825,14 +3825,14 @@ void nxagentDropOutput(RROutputPtr o)
if (c->outputs[i] == o)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentDropOutput: output [%s] is in use by crtc [%p], removing it from there\n", o->name, c);
+ fprintf(stderr, "%s: output [%s] is in use by crtc [%p], removing it from there\n", __func__, o->name, c);
#endif
RRCrtcSet(c, NULL, 0, 0, RR_Rotate_0, 0, NULL);
}
}
}
#ifdef DEBUG
- fprintf(stderr, "nxagentDropOutput: destroying output [%s]\n", o->name);
+ fprintf(stderr, "%s: destroying output [%s]\n", __func__, o->name);
#endif
RROutputDestroy(o);
}
@@ -3853,16 +3853,16 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
if (number)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: XineramaQueryScreens() returned [%d] screens:\n", number);
+ fprintf(stderr, "%s: XineramaQueryScreens() returned [%d] screens:\n", __func__, number);
for (int i = 0; i < number; i++) {
- fprintf(stderr, "nxagentAdjustRandRXinerama: screen_number [%d] x_org [%d] y_org [%d] width [%d] height [%d]\n", screeninfo[i].screen_number, screeninfo[i].x_org, screeninfo[i].y_org, screeninfo[i].width, screeninfo[i].height);
+ fprintf(stderr, "%s: screen_number [%d] x_org [%d] y_org [%d] width [%d] height [%d]\n", __func__, screeninfo[i].screen_number, screeninfo[i].x_org, screeninfo[i].y_org, screeninfo[i].width, screeninfo[i].height);
}
#endif
}
else
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: XineramaQueryScreens() failed - continuing without Xinerama\n");
+ fprintf(stderr, "%s: XineramaQueryScreens() failed - continuing without Xinerama\n", __func__);
#endif
}
@@ -3877,7 +3877,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
if (number == 0)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: faking xinerama\n");
+ fprintf(stderr, "%s: faking xinerama\n", __func__);
#endif
number = 1;
@@ -3897,7 +3897,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
}
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: numCrtcs [%d], numOutputs [%d]\n", pScrPriv->numCrtcs, pScrPriv->numOutputs);
+ fprintf(stderr, "%s: numCrtcs [%d], numOutputs [%d]\n", __func__, pScrPriv->numCrtcs, pScrPriv->numOutputs);
{
/*
* Convert old RANDR 1.0 data (if any) to current structure. This
@@ -3907,7 +3907,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
*/
Bool rrgetinfo = RRGetInfo(pScreen, FALSE);
- fprintf(stderr, "nxagentAdjustRandRXinerama: RRGetInfo returned [%d]\n", rrgetinfo);
+ fprintf(stderr, "%s: RRGetInfo returned [%d]\n", __func__, rrgetinfo);
}
#else
/* we are not interested in the return code */
@@ -3928,12 +3928,12 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
bby1 = min(bby1, screeninfo[i].y_org);
}
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: bounding box: left [%d] right [%d] top [%d] bottom [%d]\n", bbx1, bbx2, bby1, bby2);
+ fprintf(stderr, "%s: bounding box: left [%d] right [%d] top [%d] bottom [%d]\n", __func__, bbx1, bbx2, bby1, bby2);
#endif
#endif
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: numCrtcs [%d], numOutputs [%d]\n", pScrPriv->numCrtcs, pScrPriv->numOutputs);
+ fprintf(stderr, "%s: numCrtcs [%d], numOutputs [%d]\n", __func__, pScrPriv->numCrtcs, pScrPriv->numOutputs);
#endif
/* adjust the number of CRTCs to match the number of reported
@@ -3943,7 +3943,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
if (number < pScrPriv->numCrtcs)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: destroying crtc\n");
+ fprintf(stderr, "%s: destroying crtc\n", __func__);
#endif
/* first reset the crtc to free possible outputs, then destroy the crtc */
RRCrtcSet(pScrPriv->crtcs[pScrPriv->numCrtcs - 1], NULL, 0, 0, RR_Rotate_0, 0, NULL);
@@ -3952,14 +3952,14 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
else
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: adding crtc\n");
+ fprintf(stderr, "%s: adding crtc\n", __func__);
#endif
RRCrtcCreate(pScreen, NULL);
}
}
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: numCrtcs [%d], numOutputs [%d]\n", pScrPriv->numCrtcs, pScrPriv->numOutputs);
+ fprintf(stderr, "%s: numCrtcs [%d], numOutputs [%d]\n", __func__, pScrPriv->numCrtcs, pScrPriv->numOutputs);
#endif
/* set gamma. Currently the only reason for doing this is
@@ -3999,7 +3999,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
RROutputSetConnection(output, RR_Disconnected);
*/
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: created new output [%s]\n", name);
+ fprintf(stderr, "%s: created new output [%s]\n", __func__, name);
#endif
}
else
@@ -4007,7 +4007,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
output = pScrPriv->outputs[i];
}
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: adjusting output [%s]\n", output->name);
+ fprintf(stderr, "%s: adjusting output [%s]\n", __func__, output->name);
#endif
RROutputSetCrtcs(output, &(pScrPriv->crtcs[i]), 1);
/* FIXME: Isn't there a function for setting this? */
@@ -4046,11 +4046,11 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
#ifdef DEBUG
if (prevmode)
{
- fprintf(stderr, "nxagentAdjustRandRXinerama: output [%d] name [%s]: prevmode [%s] ([%p]) refcnt [%d]\n", i, pScrPriv->outputs[i]->name, prevmode->name, (void *)prevmode, prevmode->refcnt);
+ fprintf(stderr, "%s: output [%d] name [%s]: prevmode [%s] ([%p]) refcnt [%d]\n", __func__, i, pScrPriv->outputs[i]->name, prevmode->name, (void *)prevmode, prevmode->refcnt);
}
else
{
- fprintf(stderr, "nxagentAdjustRandRXinerama: output [%d] name [%s]: no prevmode\n", i, pScrPriv->outputs[i]->name);
+ fprintf(stderr, "%s: output [%d] name [%s]: no prevmode\n", __func__, i, pScrPriv->outputs[i]->name);
}
#endif
@@ -4059,7 +4059,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
if (disable_output)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: output [%d] name [%s]: no (valid) intersection - disconnecting\n", i, pScrPriv->outputs[i]->name);
+ fprintf(stderr, "%s: output [%d] name [%s]: no (valid) intersection - disconnecting\n", __func__, i, pScrPriv->outputs[i]->name);
#endif
RROutputSetConnection(pScrPriv->outputs[i], RR_Disconnected);
@@ -4075,12 +4075,12 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
if (prevmode)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: removing mode from output [%d] name [%s]\n", i, pScrPriv->outputs[i]->name);
+ fprintf(stderr, "%s: removing mode from output [%d] name [%s]\n", __func__, i, pScrPriv->outputs[i]->name);
#endif
RROutputSetModes(pScrPriv->outputs[i], NULL, 0, 0);
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: removing mode from ctrc [%d]\n", i);
+ fprintf(stderr, "%s: removing mode from ctrc [%d]\n", __func__, i);
#endif
RRCrtcSet(pScrPriv->crtcs[i], NULL, 0, 0, RR_Rotate_0, 1, &(pScrPriv->outputs[i]));
}
@@ -4088,7 +4088,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
else
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: output [%d] name [%s]: intersection is x [%d] y [%d] width [%d] height [%d]\n", i, pScrPriv->outputs[i]->name, new_x, new_y, new_w, new_h);
+ fprintf(stderr, "%s: output [%d] name [%s]: intersection is x [%d] y [%d] width [%d] height [%d]\n", __func__, i, pScrPriv->outputs[i]->name, new_x, new_y, new_w, new_h);
#endif
RROutputSetConnection(pScrPriv->outputs[i], RR_Connected);
@@ -4116,18 +4116,18 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
#ifdef DEBUG
if (mymode)
{
- fprintf(stderr, "nxagentAdjustRandRXinerama: output [%d] name [%s]: mode [%s] ([%p]) created/received, refcnt [%d]\n", i, pScrPriv->outputs[i]->name, name, (void *) mymode, mymode->refcnt);
+ fprintf(stderr, "%s: output [%d] name [%s]: mode [%s] ([%p]) created/received, refcnt [%d]\n", __func__, i, pScrPriv->outputs[i]->name, name, (void *) mymode, mymode->refcnt);
}
else
{
/* FIXME: what is the correct behaviour in this case? */
- fprintf(stderr, "nxagentAdjustRandRXinerama: output [%d] name [%s]: mode [%s] creation failed!\n", i, pScrPriv->outputs[i]->name, name);
+ fprintf(stderr, "%s: output [%d] name [%s]: mode [%s] creation failed!\n", __func__, i, pScrPriv->outputs[i]->name, name);
}
#endif
if (prevmode && mymode == prevmode)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: mymode [%s] ([%p]) == prevmode [%s] ([%p])\n", mymode->name, (void *) mymode, prevmode->name, (void *)prevmode);
+ fprintf(stderr, "%s: mymode [%s] ([%p]) == prevmode [%s] ([%p])\n", __func__, mymode->name, (void *) mymode, prevmode->name, (void *)prevmode);
#endif
/* if they are the same RRModeGet() has increased the
@@ -4138,13 +4138,13 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
else
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for output %d [%s]\n", mymode->name, (void *) mymode, mymode->refcnt, i, pScrPriv->outputs[i]->name);
+ fprintf(stderr, "%s: setting mode [%s] ([%p]) refcnt [%d] for output %d [%s]\n", __func__, mymode->name, (void *) mymode, mymode->refcnt, i, pScrPriv->outputs[i]->name);
#endif
RROutputSetModes(pScrPriv->outputs[i], &mymode, 1, 0);
}
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for crtc %d\n", mymode->name, (void *) mymode, mymode->refcnt, i);
+ fprintf(stderr, "%s: setting mode [%s] ([%p]) refcnt [%d] for crtc %d\n", __func__, mymode->name, (void *) mymode, mymode->refcnt, i);
#endif
RRCrtcSet(pScrPriv->crtcs[i], mymode, new_x, new_y, RR_Rotate_0, 1, &(pScrPriv->outputs[i]));
} /* if disable_output */
@@ -4155,7 +4155,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
if (prevmode && prevmode->refcnt == 1)
{
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: destroying prevmode [%s]\n", prevmode->name);
+ fprintf(stderr, "%s: destroying prevmode [%s]\n", __func__, prevmode->name);
#endif
FreeResource(prevmode->mode.id, 0);
}
@@ -4172,16 +4172,16 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
{
RRModePtr mode = pScrPriv->crtcs[i]->mode;
if (mode) {
- fprintf(stderr, "nxagentAdjustRandRXinerama: crtc [%d] ([%p]) has mode [%s] ([%p]), refcnt [%d] and [%d] outputs:\n", i, (void *) pScrPriv->crtcs[i], pScrPriv->crtcs[i]->mode->name, (void *)pScrPriv->crtcs[i]->mode, pScrPriv->crtcs[i]->mode->refcnt, pScrPriv->crtcs[i]->numOutputs);
+ fprintf(stderr, "%s: crtc [%d] ([%p]) has mode [%s] ([%p]), refcnt [%d] and [%d] outputs:\n", __func__, i, (void *) pScrPriv->crtcs[i], pScrPriv->crtcs[i]->mode->name, (void *)pScrPriv->crtcs[i]->mode, pScrPriv->crtcs[i]->mode->refcnt, pScrPriv->crtcs[i]->numOutputs);
}
else
{
- fprintf(stderr, "nxagentAdjustRandRXinerama: crtc [%d] ([%p]) has no mode and [%d] outputs:\n", i, (void *) pScrPriv->crtcs[i], pScrPriv->crtcs[i]->numOutputs);
+ fprintf(stderr, "%s: crtc [%d] ([%p]) has no mode and [%d] outputs:\n", __func__, i, (void *) pScrPriv->crtcs[i], pScrPriv->crtcs[i]->numOutputs);
}
if (pScrPriv->crtcs[i]->numOutputs > 0)
for (int j = 0; j < pScrPriv->crtcs[i]->numOutputs; j++)
- fprintf(stderr, "nxagentAdjustRandRXinerama: output [%d] name [%s]->crtc=[%p]\n", j, pScrPriv->crtcs[i]->outputs[j]->name, (void *)pScrPriv->crtcs[i]->outputs[j]->crtc);
+ fprintf(stderr, "%s: output [%d] name [%s]->crtc=[%p]\n", __func__, j, pScrPriv->crtcs[i]->outputs[j]->name, (void *)pScrPriv->crtcs[i]->outputs[j]->crtc);
}
#endif
@@ -4201,7 +4201,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
/* FIXME: adjust maximum screen size according to remote randr/xinerama setup */
#ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: Min %dx%d, Max %dx%d \n", pScrPriv->minWidth, pScrPriv->minHeight, pScrPriv->maxWidth, pScrPriv->maxHeight);
+ fprintf(stderr, "%s: Min %dx%d, Max %dx%d \n", __func__, pScrPriv->minWidth, pScrPriv->minHeight, pScrPriv->maxWidth, pScrPriv->maxHeight);
#endif
return TRUE;
@@ -4309,7 +4309,7 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg,
pBackingStore -> x, pBackingStore -> y);
#ifdef TEST
- fprintf(stderr,"nxagentSaveAreas: Added pixmap [%p] with id [%d] on window [%p] to BSPixmapList.\n",
+ fprintf(stderr,"%s: Added pixmap [%p] with id [%d] on window [%p] to BSPixmapList.\n", __func__,
(void *) pPixmap, nxagentPixmap(pPixmap), (void *) pWin);
#endif
@@ -4587,7 +4587,7 @@ void nxagentShowPixmap(PixmapPtr pPixmap, int x, int y, int width, int height)
if (shadow == NULL)
{
#ifdef WARNING
- fprintf(stderr, "nxagentShowPixmap: WARNING! Shadow display not opened.\n");
+ fprintf(stderr, "%s: WARNING! Shadow display not opened.\n", __func__);
#endif
return;
@@ -4628,7 +4628,7 @@ void nxagentShowPixmap(PixmapPtr pPixmap, int x, int y, int width, int height)
if (data == NULL)
{
#ifdef WARNING
- fprintf(stderr, "nxagentShowPixmap: malloc failed.\n");
+ fprintf(stderr, "%s: malloc failed.\n", __func__);
#endif
return;
@@ -4646,7 +4646,7 @@ FIXME
if (image == NULL)
{
#ifdef WARNING
- fprintf(stderr, "nxagentShowPixmap: XGetImage failed.\n");
+ fprintf(stderr, "%s: XGetImage failed.\n", __func__);
#endif
SAFE_free(data);
@@ -4713,7 +4713,7 @@ void nxagentFbRestoreArea(PixmapPtr pPixmap, WindowPtr pWin, int xSrc, int ySrc,
if (data == NULL)
{
#ifdef WARNING
- fprintf(stderr, "nxagentFbRestoreArea: malloc failed.\n");
+ fprintf(stderr, "%s: malloc failed.\n", __func__);
#endif
return;
@@ -4728,7 +4728,7 @@ void nxagentFbRestoreArea(PixmapPtr pPixmap, WindowPtr pWin, int xSrc, int ySrc,
if (image == NULL)
{
#ifdef WARNING
- fprintf(stderr, "nxagentFbRestoreArea: XGetImage failed.\n");
+ fprintf(stderr, "%s: XGetImage failed.\n", __func__);
#endif
SAFE_free(data);
@@ -4747,7 +4747,7 @@ FIXME
if (pVisual == NULL)
{
#ifdef WARNING
- fprintf(stderr, "nxagentFbRestoreArea: WARNING! Visual not found. Using default visual.\n");
+ fprintf(stderr, "%s: WARNING! Visual not found. Using default visual.\n", __func__);
#endif
pVisual = nxagentVisuals[nxagentDefaultVisualIndex].visual;
@@ -4762,7 +4762,7 @@ FIXME
memcpy(image -> data, data, length);
*/
- fprintf(stderr, "nxagentFbRestoreArea: Cleaning %d bytes of image.\n", length);
+ fprintf(stderr, "%s: Cleaning %d bytes of image.\n", __func__, length);
XGCValues value = {
.foreground = 0xffffff,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 99cc3a280..198ead5eb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Split.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c
@@ -406,7 +406,7 @@ void nxagentRegionSplit(DrawablePtr pDrawable, RegionPtr pRegion)
nxagentCheckSplit(pDrawable, pResource);
#endif
-
+
if (pResource == NULL)
{
#ifdef PANIC
@@ -579,7 +579,7 @@ void nxagentValidateSplit(DrawablePtr pDrawable, RegionPtr pRegion)
nxagentCheckSplit(pDrawable, pResource);
#endif
-
+
#ifdef TEST
fprintf(stderr, "nxagentValidateSplit: Checking the region for resource [%d] "
"and drawable at [%p].\n", pResource -> split, (void *) pDrawable);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
index 6be82148f..9e338ad96 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c
@@ -94,7 +94,7 @@ Visual *nxagentVisualFromID(ScreenPtr pScreen, VisualID visual)
return nxagentVisual(&pScreen->visuals[i]);
}
}
-
+
return NULL;
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
index 0cc60410d..477fd3f95 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Clean.c
@@ -157,7 +157,7 @@ int CleanZImage(XImage *image)
}
}
- /*
+ /*
* Clean the padding bytes at the real
* end of the buffer.
*/
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
index dcb91348b..cc13dffbb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
@@ -1321,7 +1321,7 @@ unsigned int NXAllocSplit(Display *dpy, unsigned int resource)
}
#ifdef TEST_SPLIT
- fprintf(stderr, "******NXAllocSplit: WARNING! Resource limit exausted.\n");
+ fprintf(stderr, "******NXAllocSplit: WARNING! Resource limit exhausted.\n");
#endif
return NXNoResource;
@@ -1606,7 +1606,7 @@ unsigned int NXAllocUnpack(Display *dpy, unsigned int resource)
}
#ifdef TEST_UNPACK
- fprintf(stderr, "******NXAllocUnpack: WARNING! Resource limit exausted.\n");
+ fprintf(stderr, "******NXAllocUnpack: WARNING! Resource limit exhausted.\n");
#endif
return NXNoResource;
@@ -4776,7 +4776,7 @@ void _NXDumpData(const unsigned char *buffer, unsigned int size)
{
fprintf(stderr, "[%d]\t", i);
- for (unsinged int ii = 0; i < size && ii < 8; i++, ii++)
+ for (unsigned int ii = 0; i < size && ii < 8; i++, ii++)
{
fprintf(stderr, "%d\t", (unsigned int) (buffer[i]));
}
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 71245a407..40e746c8d 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -116,9 +116,9 @@ OBJS = $(CBRT_OBJ) \
$(NULL)
#if defined(XorgVersion)
-/*
- * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o
- * used by Xnest, Xvfb
+/*
+ * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o
+ * used by Xnest, Xvfb
*/
#if NXLibraries
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 1b1c2d4fe..031a1eaa2 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -70,7 +70,7 @@ XDMAUTHDEFS = -DHASXDMAUTH
XDMAUTHOBJS = xdmauth.o
XDMAUTHSRCS = xdmauth.c
#else
-XDMAUTHDEFS =
+XDMAUTHDEFS =
XDMAUTHOBJS =
XDMAUTHSCRS =
#endif
@@ -133,7 +133,7 @@ TMEMCMP_SRCS = timingsafe_memcmp.c
TMEMCMP_OBJS = timingsafe_memcmp.o
#endif
-BOOTSTRAPCFLAGS =
+BOOTSTRAPCFLAGS =
SRCS = WaitFor.c \
access.c \
client.c \
diff --git a/nxcomp/include/MD5.h b/nxcomp/include/MD5.h
index 698c995d8..3baa4dcdf 100644
--- a/nxcomp/include/MD5.h
+++ b/nxcomp/include/MD5.h
@@ -71,7 +71,7 @@ typedef struct md5_state_s {
} md5_state_t;
#ifdef __cplusplus
-extern "C"
+extern "C"
{
#endif
diff --git a/nxcomp/include/NX.h b/nxcomp/include/NX.h
index 088e265e0..515333afa 100644
--- a/nxcomp/include/NX.h
+++ b/nxcomp/include/NX.h
@@ -240,7 +240,7 @@ extern int NXTransDestroy(int fd);
* just after the XOpenDisplay() or any other function used to init-
* ialize the NX transport.
*/
-
+
extern int NXTransSignal(int signal, int action);
/*
diff --git a/nxcomp/include/NXalert.h b/nxcomp/include/NXalert.h
index dca2f44ca..a7d0a96e5 100644
--- a/nxcomp/include/NXalert.h
+++ b/nxcomp/include/NXalert.h
@@ -267,7 +267,7 @@ server configuration.\n\
/*
* Used to handle the backward compatibility.
- * Update the numbers if you add a new alert.
+ * Update the numbers if you add a new alert.
*/
#define LAST_PROTO_STEP_6_ALERT 63
diff --git a/nxcomp/include/NXproto.h b/nxcomp/include/NXproto.h
index 7b988bdbf..3742716ac 100644
--- a/nxcomp/include/NXproto.h
+++ b/nxcomp/include/NXproto.h
@@ -37,7 +37,7 @@ extern "C" {
/*
* Force the size to match the wire protocol.
*/
-
+
#define Drawable CARD32
#define GContext CARD32
diff --git a/nxcomp/src/ActionCache.h b/nxcomp/src/ActionCache.h
index 2aedd4a07..4eb4aebda 100644
--- a/nxcomp/src/ActionCache.h
+++ b/nxcomp/src/ActionCache.h
@@ -32,7 +32,7 @@ class ActionCache
{
friend class EncodeBuffer;
friend class DecodeBuffer;
-
+
public:
ActionCache();
diff --git a/nxcomp/src/Alpha.cpp b/nxcomp/src/Alpha.cpp
index 6157e21e5..a1e2e05e1 100644
--- a/nxcomp/src/Alpha.cpp
+++ b/nxcomp/src/Alpha.cpp
@@ -126,7 +126,7 @@ int UnpackAlpha(T_alpha *alpha, unsigned char *dst_data,
}
shift = (big_endian == 1 ? 0 : 3);
-
+
for (i = 0; i < count; i++)
{
*(dst_data + shift) = *(alpha -> data + i);
diff --git a/nxcomp/src/Auth.cpp b/nxcomp/src/Auth.cpp
index aaca905de..b56e6f322 100644
--- a/nxcomp/src/Auth.cpp
+++ b/nxcomp/src/Auth.cpp
@@ -48,7 +48,7 @@
//
// Store the provided cookie as our 'fake' cookie, then
// read the 'real' cookie from the current X authority
-// file.
+// file.
//
Auth::Auth(char *display, char *cookie)
@@ -271,7 +271,7 @@ int Auth::getCookie()
// ferent cookie than the one for the Unix connections, both SSH and
// NX will match the wrong cookie and session will fail.
//
-
+
char line[DEFAULT_STRING_LIMIT];
FILE *data = NULL;
int result = -1;
@@ -377,7 +377,7 @@ int Auth::getCookie()
<< "'.\n" << logofs_flush;
#endif
- //
+ //
// Skip the hostname in the authority entry
// just in case it includes some white spaces.
//
diff --git a/nxcomp/src/BlockCacheSet.cpp b/nxcomp/src/BlockCacheSet.cpp
index 98546b773..b46cd6726 100644
--- a/nxcomp/src/BlockCacheSet.cpp
+++ b/nxcomp/src/BlockCacheSet.cpp
@@ -32,7 +32,7 @@
BlockCacheSet::BlockCacheSet(unsigned int numCaches):
- caches_(new BlockCache *[numCaches]), size_(numCaches),
+ caches_(new BlockCache *[numCaches]), size_(numCaches),
length_(0)
{
for (unsigned int i = 0; i < numCaches; i++)
diff --git a/nxcomp/src/ChangeGC.cpp b/nxcomp/src/ChangeGC.cpp
index e92178f27..0226a6123 100644
--- a/nxcomp/src/ChangeGC.cpp
+++ b/nxcomp/src/ChangeGC.cpp
@@ -130,7 +130,7 @@ void ChangeGCStore::dumpIdentity(const Message *message) const
ChangeGCMessage *changeGC = (ChangeGCMessage *) message;
- *logofs << name() << ": Identity gcontext " << changeGC -> gcontext
+ *logofs << name() << ": Identity gcontext " << changeGC -> gcontext
<< ", mask " << changeGC -> value_mask << ", size "
<< changeGC -> size_ << ".\n" << logofs_flush;
#endif
diff --git a/nxcomp/src/ChangeGC.h b/nxcomp/src/ChangeGC.h
index 9cac90e66..a043c27ed 100644
--- a/nxcomp/src/ChangeGC.h
+++ b/nxcomp/src/ChangeGC.h
@@ -73,7 +73,7 @@ class ChangeGCMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/ChangeProperty.cpp b/nxcomp/src/ChangeProperty.cpp
index 74814c2ea..10fd23ae6 100644
--- a/nxcomp/src/ChangeProperty.cpp
+++ b/nxcomp/src/ChangeProperty.cpp
@@ -82,7 +82,7 @@ int ChangePropertyStore::parseIdentity(Message *message, const unsigned char *bu
if (uiFormat == 16)
{
- uiLengthInBytes <<= 1;
+ uiLengthInBytes <<= 1;
}
else if (uiFormat == 32)
{
@@ -130,7 +130,7 @@ void ChangePropertyStore::dumpIdentity(const Message *message) const
ChangePropertyMessage *changeProperty = (ChangePropertyMessage *) message;
- *logofs << name() << ": Identity mode " << (unsigned int) changeProperty -> mode << ", format "
+ *logofs << name() << ": Identity mode " << (unsigned int) changeProperty -> mode << ", format "
<< (unsigned int) changeProperty -> format << ", window " << changeProperty -> window
<< ", property " << changeProperty -> property << ", type " << changeProperty -> type
<< ", length " << changeProperty -> length << ", size " << changeProperty -> size_
diff --git a/nxcomp/src/ChangeProperty.h b/nxcomp/src/ChangeProperty.h
index c06ce10fc..b0f47419d 100644
--- a/nxcomp/src/ChangeProperty.h
+++ b/nxcomp/src/ChangeProperty.h
@@ -73,7 +73,7 @@ class ChangePropertyMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/Channel.cpp b/nxcomp/src/Channel.cpp
index e575a9e6b..7e2291273 100644
--- a/nxcomp/src/Channel.cpp
+++ b/nxcomp/src/Channel.cpp
@@ -126,7 +126,7 @@ Channel::Channel(Transport *transport, StaticCompressor *compressor)
//
opcodeStore_ = NULL;
-
+
clientStore_ = NULL;
serverStore_ = NULL;
@@ -134,8 +134,8 @@ Channel::Channel(Transport *transport, StaticCompressor *compressor)
serverCache_ = NULL;
#ifdef REFERENCES
- *logofs << "Channel: Created new Channel at "
- << this << " out of " << ++references_
+ *logofs << "Channel: Created new Channel at "
+ << this << " out of " << ++references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -148,8 +148,8 @@ Channel::~Channel()
}
#ifdef REFERENCES
- *logofs << "Channel: Deleted Channel at "
- << this << " out of " << --references_
+ *logofs << "Channel: Deleted Channel at "
+ << this << " out of " << --references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -174,7 +174,7 @@ int Channel::handleEncode(EncodeBuffer &encodeBuffer, ChannelCache *channelCache
// Check if message can be differentially
// encoded using a similar message in the
// message store.
- //
+ //
#ifdef COUNT
@@ -440,11 +440,11 @@ int Channel::handleDecode(DecodeBuffer &decodeBuffer, ChannelCache *channelCache
if (store -> enableSplit)
{
#ifdef DEBUG
- *logofs << "handleDecode: " << store -> name()
- << ": Checking if the message was split.\n"
+ *logofs << "handleDecode: " << store -> name()
+ << ": Checking if the message was split.\n"
<< logofs_flush;
#endif
-
+
decodeBuffer.decodeBoolValue(split);
if (split == 1)
@@ -557,8 +557,8 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
}
#ifdef DEBUG
- *logofs << "handleEncodeCached: " << store -> name()
- << ": Going to handle a new message of this class.\n"
+ *logofs << "handleEncodeCached: " << store -> name()
+ << ": Going to handle a new message of this class.\n"
<< logofs_flush;
#endif
@@ -573,7 +573,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
while (mustCleanStore(store) == 1 && canCleanStore(store) == 1)
{
#ifdef DEBUG
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": Trying to reduce size of message store.\n"
<< logofs_flush;
#endif
@@ -583,7 +583,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
if (position == nothing)
{
#ifdef TEST
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": WARNING! No message found to be "
<< "actually removed.\n" << logofs_flush;
#endif
@@ -592,7 +592,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
}
#ifdef DEBUG
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": Message at position " << position
<< " will be removed.\n" << logofs_flush;
#endif
@@ -610,23 +610,23 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
#ifdef DEBUG
*logofs << "handleEncodeCached: " << store -> name() << ": Going to "
- << "clean up message at position " << position << ".\n"
+ << "clean up message at position " << position << ".\n"
<< logofs_flush;
#endif
store -> remove(position, use_checksum, discard_data);
#ifdef DEBUG
- *logofs << "handleEncodeCached: " << store -> name() << ": There are "
- << store -> getSize() << " messages in the store out of "
+ *logofs << "handleEncodeCached: " << store -> name() << ": There are "
+ << store -> getSize() << " messages in the store out of "
<< store -> cacheSlots << " slots.\n" << logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name()
- << ": Size of store is " << store -> getLocalStorageSize()
- << " bytes locally and " << store -> getRemoteStorageSize()
+ *logofs << "handleEncodeCached: " << store -> name()
+ << ": Size of store is " << store -> getLocalStorageSize()
+ << " bytes locally and " << store -> getRemoteStorageSize()
<< " bytes remotely.\n" << logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": Size of total cache is " << store -> getLocalTotalStorageSize()
<< " bytes locally and " << store -> getRemoteTotalStorageSize()
<< " bytes remotely.\n" << logofs_flush;
@@ -637,20 +637,20 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
if (mustCleanStore(store) == 1 && canCleanStore(store) == 0)
{
- *logofs << "handleEncodeCached: " << store -> name()
- << ": Store would need a clean but operation will be delayed.\n"
+ *logofs << "handleEncodeCached: " << store -> name()
+ << ": Store would need a clean but operation will be delayed.\n"
<< logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name() << ": There are "
- << store -> getSize() << " messages in the store out of "
+ *logofs << "handleEncodeCached: " << store -> name() << ": There are "
+ << store -> getSize() << " messages in the store out of "
<< store -> cacheSlots << " slots.\n" << logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name()
- << ": Size of store is " << store -> getLocalStorageSize()
- << " bytes locally and " << store -> getRemoteStorageSize()
+ *logofs << "handleEncodeCached: " << store -> name()
+ << ": Size of store is " << store -> getLocalStorageSize()
+ << " bytes locally and " << store -> getRemoteStorageSize()
<< " bytes remotely.\n" << logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": Size of total cache is " << store -> getLocalTotalStorageSize()
<< " bytes locally and " << store -> getRemoteTotalStorageSize()
<< " bytes remotely.\n" << logofs_flush;
@@ -667,8 +667,8 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
if (store -> validateMessage(buffer, size) == 0)
{
#ifdef TEST
- *logofs << "handleEncodeCached: " << store -> name()
- << ": Message with size " << size << " ignored.\n"
+ *logofs << "handleEncodeCached: " << store -> name()
+ << ": Message with size " << size << " ignored.\n"
<< logofs_flush;
#endif
@@ -726,7 +726,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
//
#ifdef DEBUG
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": Searching object of size " << size
<< " in the cache.\n" << logofs_flush;
#endif
@@ -740,7 +740,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
if (position == nothing)
{
#ifdef WARNING
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": WARNING! Can't store object in the cache.\n"
<< logofs_flush;
#endif
@@ -763,7 +763,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
//
#ifdef WARNING
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": WARNING! Message of size " << store -> plainSize(position)
<< " at position " << position << " is locked.\n"
<< logofs_flush;
@@ -789,23 +789,23 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
<< store -> plainSize(position) << " has been stored at position "
<< position << ".\n" << logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name() << ": There are "
- << store -> getSize() << " messages in the store out of "
+ *logofs << "handleEncodeCached: " << store -> name() << ": There are "
+ << store -> getSize() << " messages in the store out of "
<< store -> cacheSlots << " slots.\n" << logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name()
- << ": Size of store is " << store -> getLocalStorageSize()
- << " bytes locally and " << store -> getRemoteStorageSize()
+ *logofs << "handleEncodeCached: " << store -> name()
+ << ": Size of store is " << store -> getLocalStorageSize()
+ << " bytes locally and " << store -> getRemoteStorageSize()
<< " bytes remotely.\n" << logofs_flush;
- *logofs << "handleEncodeCached: " << store -> name()
+ *logofs << "handleEncodeCached: " << store -> name()
<< ": Size of total cache is " << store -> getLocalTotalStorageSize()
<< " bytes locally and " << store -> getRemoteTotalStorageSize()
<< " bytes remotely.\n" << logofs_flush;
#endif
//
- // Inform the decoding side that message
+ // Inform the decoding side that message
// must be inserted in cache and encode
// the position where the insertion took
// place.
@@ -825,7 +825,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
{
#ifdef DEBUG
*logofs << "handleEncodeCached: " << store -> name()
- << ": Cache hit. Found object at position "
+ << ": Cache hit. Found object at position "
<< position << ".\n" << logofs_flush;
#endif
@@ -845,7 +845,7 @@ int Channel::handleEncodeCached(EncodeBuffer &encodeBuffer, ChannelCache *channe
#ifdef DEBUG
*logofs << "handleEncodeCached: " << store -> name() << ": Hits for "
- << "object at position " << position << " are now "
+ << "object at position " << position << " are now "
<< store -> getTouches(position) << ".\n"
<< logofs_flush;
#endif
@@ -909,16 +909,16 @@ void Channel::handleUpdateAdded(MessageStore *store, unsigned int dataSize,
store -> updateData(store -> lastAdded, dataSize, compressedDataSize);
#ifdef DEBUG
- *logofs << "handleUpdateAdded: " << store -> name() << ": There are "
- << store -> getSize() << " messages in the store out of "
+ *logofs << "handleUpdateAdded: " << store -> name() << ": There are "
+ << store -> getSize() << " messages in the store out of "
<< store -> cacheSlots << " slots.\n" << logofs_flush;
- *logofs << "handleUpdateAdded: " << store -> name()
- << ": Size of store is " << store -> getLocalStorageSize()
- << " bytes locally and " << store -> getRemoteStorageSize()
+ *logofs << "handleUpdateAdded: " << store -> name()
+ << ": Size of store is " << store -> getLocalStorageSize()
+ << " bytes locally and " << store -> getRemoteStorageSize()
<< " bytes remotely.\n" << logofs_flush;
- *logofs << "handleUpdateAdded: " << store -> name()
+ *logofs << "handleUpdateAdded: " << store -> name()
<< ": Size of total cache is " << store -> getLocalTotalStorageSize()
<< " bytes locally and " << store -> getRemoteTotalStorageSize()
<< " bytes remotely.\n" << logofs_flush;
@@ -930,13 +930,13 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
unsigned int &size)
{
//
- // Create a new message object and
+ // Create a new message object and
// fill it with received data.
//
#ifdef DEBUG
- *logofs << "handleDecodeCached: " << store -> name()
- << ": Going to handle a new message of this class.\n"
+ *logofs << "handleDecodeCached: " << store -> name()
+ << ": Going to handle a new message of this class.\n"
<< logofs_flush;
#endif
@@ -953,7 +953,7 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
store -> lastActionCache);
//
- // Clean operations must always come
+ // Clean operations must always come
// before any operation on message.
//
@@ -1032,8 +1032,8 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
buffer = writeBuffer_.addMessage(size);
#ifdef DEBUG
- *logofs << "handleDecodeCached: " << store -> name()
- << ": Prepared an outgoing buffer of "
+ *logofs << "handleDecodeCached: " << store -> name()
+ << ": Prepared an outgoing buffer of "
<< size << " bytes.\n" << logofs_flush;
#endif
@@ -1066,7 +1066,7 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
store -> lastAdded = position;
#ifdef DEBUG
- *logofs << "handleDecodeCached: " << store -> name()
+ *logofs << "handleDecodeCached: " << store -> name()
<< ": Message will be later stored at position "
<< store -> lastAdded << ".\n" << logofs_flush;
#endif
@@ -1078,7 +1078,7 @@ int Channel::handleDecodeCached(DecodeBuffer &decodeBuffer, ChannelCache *channe
else
{
#ifdef DEBUG
- *logofs << "handleDecodeCached: " << store -> name()
+ *logofs << "handleDecodeCached: " << store -> name()
<< ": Message will be later discarded.\n"
<< logofs_flush;
#endif
@@ -1144,7 +1144,7 @@ void Channel::handleSaveAdded(MessageStore *store, int split, unsigned char *buf
}
else
{
- store -> parse(message, buffer, size, compressedData,
+ store -> parse(message, buffer, size, compressedData,
compressedDataSize, discard_checksum,
use_data, bigEndian_);
}
diff --git a/nxcomp/src/Channel.h b/nxcomp/src/Channel.h
index 3b37fa60d..079007e96 100644
--- a/nxcomp/src/Channel.h
+++ b/nxcomp/src/Channel.h
@@ -253,7 +253,7 @@ class Channel
}
//
- // Check if there are pending split
+ // Check if there are pending split
// to send to the remote side.
//
@@ -589,7 +589,7 @@ class Channel
//
OpcodeStore *opcodeStore_;
-
+
//
// Also stores are shared between channels.
//
diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
index 4c74e662b..ab7e854b9 100644
--- a/nxcomp/src/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -838,13 +838,13 @@ int NXTransKeeper(int caches, int images, const char *root)
// must be copied in keeper's constructor
// before control is deleted.
//
-
+
MemoryCleanup("NXTransKeeper");
//
// Decrease the priority of this process.
//
- // The following applies to Cygwin: "Cygwin processes can be
+ // The following applies to Cygwin: "Cygwin processes can be
// set to IDLE_PRIORITY_CLASS, NORMAL_PRIORITY_CLASS, HIGH_-
// PRIORITY_CLASS, or REALTIME_PRIORITY_CLASS with the nice
// call. If you pass a positive number to nice(), then the
diff --git a/nxcomp/src/ClearArea.cpp b/nxcomp/src/ClearArea.cpp
index 0cb152d95..46242c155 100644
--- a/nxcomp/src/ClearArea.cpp
+++ b/nxcomp/src/ClearArea.cpp
@@ -57,9 +57,9 @@ int ClearAreaStore::parseIdentity(Message *message, const unsigned char *buffer,
// Here is the fingerprint.
//
- clearArea -> exposures = *(buffer + 1);
+ clearArea -> exposures = *(buffer + 1);
- clearArea -> window = GetULONG(buffer + 4, bigEndian);
+ clearArea -> window = GetULONG(buffer + 4, bigEndian);
clearArea -> x = GetUINT(buffer + 8, bigEndian);
clearArea -> y = GetUINT(buffer + 10, bigEndian);
@@ -104,10 +104,10 @@ void ClearAreaStore::dumpIdentity(const Message *message) const
ClearAreaMessage *clearArea = (ClearAreaMessage *) message;
- *logofs << name() << ": Identity exposures " << (unsigned int) clearArea -> exposures
- << ", window " << clearArea -> window << ", x " << clearArea -> x
- << ", y " << clearArea -> y << ", width " << clearArea -> width
- << ", height " << clearArea -> height << ", size " << clearArea -> size_
+ *logofs << name() << ": Identity exposures " << (unsigned int) clearArea -> exposures
+ << ", window " << clearArea -> window << ", x " << clearArea -> x
+ << ", y " << clearArea -> y << ", width " << clearArea -> width
+ << ", height " << clearArea -> height << ", size " << clearArea -> size_
<< ".\n";
#endif
diff --git a/nxcomp/src/ClearArea.h b/nxcomp/src/ClearArea.h
index 8067edffd..02f70c2fe 100644
--- a/nxcomp/src/ClearArea.h
+++ b/nxcomp/src/ClearArea.h
@@ -73,7 +73,7 @@ class ClearAreaMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp
index f67ee0a34..c18919126 100644
--- a/nxcomp/src/ClientChannel.cpp
+++ b/nxcomp/src/ClientChannel.cpp
@@ -220,8 +220,8 @@ ClientChannel::ClientChannel(Transport *transport, StaticCompressor *compressor)
#endif
#ifdef REFERENCES
- *logofs << "ClientChannel: Created new object at "
- << this << " for FD#" << fd_ << " out of "
+ *logofs << "ClientChannel: Created new object at "
+ << this << " for FD#" << fd_ << " out of "
<< ++references_ << " allocated channels.\n"
<< logofs_flush;
#endif
@@ -230,7 +230,7 @@ ClientChannel::ClientChannel(Transport *transport, StaticCompressor *compressor)
ClientChannel::~ClientChannel()
{
#ifdef REFERENCES
- *logofs << "ClientChannel: Deleted object at "
+ *logofs << "ClientChannel: Deleted object at "
<< this << " for FD#" << fd_ << " out of "
<< --references_ << " allocated channels.\n"
<< logofs_flush;
@@ -326,7 +326,7 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
#endif
//
- // Extract any complete message which
+ // Extract any complete message which
// is available in the buffer.
//
@@ -338,7 +338,7 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
while ((inputMessage = readBuffer_.getMessage(inputLength)) != NULL)
{
hit = 0;
-
+
if (firstRequest_)
{
//
@@ -412,7 +412,7 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
clientSequence_ &= 0xffff;
#ifdef DEBUG
- *logofs << "handleRead: Last client sequence number for FD#"
+ *logofs << "handleRead: Last client sequence number for FD#"
<< fd_ << " is " << clientSequence_ << ".\n"
<< logofs_flush;
#endif
@@ -558,9 +558,9 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_), 32,
clientCache_ -> sendEventMaskCache, 9);
- encodeBuffer.encodeCachedValue(*(inputMessage + 12), 8,
+ encodeBuffer.encodeCachedValue(*(inputMessage + 12), 8,
clientCache_ -> sendEventCodeCache);
- encodeBuffer.encodeCachedValue(*(inputMessage + 13), 8,
+ encodeBuffer.encodeCachedValue(*(inputMessage + 13), 8,
clientCache_ -> sendEventByteDataCache);
unsigned int newSeq = GetUINT(inputMessage + 14, bigEndian_);
@@ -778,8 +778,8 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
unsigned int s_g_id = GetULONG(inputMessage + 4, bigEndian_);
unsigned int d_g_id = GetULONG(inputMessage + 8, bigEndian_);
- *logofs << "handleRead: X_CopyGC source gcontext id is " << s_g_id
- << " destination gcontext id is " << d_g_id << ".\n"
+ *logofs << "handleRead: X_CopyGC source gcontext id is " << s_g_id
+ << " destination gcontext id is " << d_g_id << ".\n"
<< logofs_flush;
#endif
@@ -902,26 +902,26 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
if (pixmaps.find(t_id) != pixmaps.end())
{
- *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id
- << " target id is pixmap " << t_id << ".\n"
+ *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id
+ << " target id is pixmap " << t_id << ".\n"
<< logofs_flush;
}
else if (windows.find(t_id) != windows.end())
{
- *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id
- << " target id is window " << t_id << ".\n"
+ *logofs << "handleRead: X_ChangeGC gcontext id is " << g_id
+ << " target id is window " << t_id << ".\n"
<< logofs_flush;
}
else
{
- *logofs << "handleRead: X_ChangeGC gcontext is " << g_id
- << " target id is unrecognized.\n"
+ *logofs << "handleRead: X_ChangeGC gcontext is " << g_id
+ << " target id is unrecognized.\n"
<< logofs_flush;
}
}
else
{
- *logofs << "handleRead: X_ChangeGC gcontext id " << g_id
+ *logofs << "handleRead: X_ChangeGC gcontext id " << g_id
<< " is unrecognized.\n" << logofs_flush;
}
@@ -985,20 +985,20 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
unsigned short p_sx = GetUINT(inputMessage + 12, bigEndian_);
unsigned short p_sy = GetUINT(inputMessage + 14, bigEndian_);
- *logofs << "handleRead: X_CreatePixmap id is " << p_id
- << " width is " << p_sx << " height is " << p_sy
+ *logofs << "handleRead: X_CreatePixmap id is " << p_id
+ << " width is " << p_sx << " height is " << p_sy
<< ".\n" << logofs_flush;
if (p_sx * p_sy <= 64 * 64)
{
*logofs << "handleRead: X_CreatePixmap id " << p_id << " of size "
- << p_sx << "x" << p_sy << "=" << p_sx * p_sy
+ << p_sx << "x" << p_sy << "=" << p_sx * p_sy
<< " will be painted at client side.\n" << logofs_flush;
}
else
{
*logofs << "handleRead: X_CreatePixmap id " << p_id << " of size "
- << p_sx << "x" << p_sy << "=" << p_sx * p_sy
+ << p_sx << "x" << p_sy << "=" << p_sx * p_sy
<< " will be painted at server side.\n" << logofs_flush;
}
@@ -1203,26 +1203,26 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
if (pixmaps.find(t_id) != pixmaps.end())
{
- *logofs << "handleRead: X_FreeGC gcontext id is " << g_id
- << " target id is pixmap " << t_id << ".\n"
+ *logofs << "handleRead: X_FreeGC gcontext id is " << g_id
+ << " target id is pixmap " << t_id << ".\n"
<< logofs_flush;
}
else if (windows.find(t_id) != windows.end())
{
- *logofs << "handleRead: X_FreeGC gcontext id is " << g_id
- << " target id is window " << t_id << ".\n"
+ *logofs << "handleRead: X_FreeGC gcontext id is " << g_id
+ << " target id is window " << t_id << ".\n"
<< logofs_flush;
}
else
{
- *logofs << "handleRead: X_FreeGC gcontext id is " << g_id
- << " target id is unrecognized.\n"
+ *logofs << "handleRead: X_FreeGC gcontext id is " << g_id
+ << " target id is unrecognized.\n"
<< logofs_flush;
}
}
else
{
- *logofs << "handleRead: X_FreeGC gcontext id " << g_id
+ *logofs << "handleRead: X_FreeGC gcontext id " << g_id
<< " is unrecognized.\n" << logofs_flush;
}
@@ -3035,7 +3035,7 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
const char *cacheString = (hit ? "cached " : "");
- *logofs << "handleRead: Handled " << cacheString << "request OPCODE#"
+ *logofs << "handleRead: Handled " << cacheString << "request OPCODE#"
<< (unsigned int) inputOpcode << " (" << DumpOpcode(inputOpcode)
<< ")" << " for FD#" << fd_ << " sequence " << clientSequence_
<< ". " << inputLength << " bytes in, " << bits << " bits ("
@@ -3147,7 +3147,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
#endif
//
- // Create the buffer from which to
+ // Create the buffer from which to
// decode messages.
//
@@ -3254,7 +3254,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
unsigned int outputLength = 0;
//
- // General-purpose temp variables
+ // General-purpose temp variables
// for decoding ints and chars.
//
@@ -3296,7 +3296,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
serverSequence_ = sequenceNum;
#ifdef DEBUG
- *logofs << "handleWrite: Last server sequence number for FD#"
+ *logofs << "handleWrite: Last server sequence number for FD#"
<< fd_ << " is " << serverSequence_ << " with "
<< "difference " << sequenceDiff << ".\n"
<< logofs_flush;
@@ -4072,7 +4072,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
outputMessage[1] = (unsigned char) cValue;
// Visual.
unsigned int visual;
- decodeBuffer.decodeCachedValue(visual, 29,
+ decodeBuffer.decodeCachedValue(visual, 29,
serverCache_ -> visualCache);
PutULONG(visual, outputMessage + 8, bigEndian_);
@@ -4275,7 +4275,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
serverSequence_ = sequenceNum;
#ifdef DEBUG
- *logofs << "handleWrite: Last server sequence number for FD#"
+ *logofs << "handleWrite: Last server sequence number for FD#"
<< fd_ << " is " << serverSequence_ << " with "
<< "difference " << sequenceDiff << ".\n"
<< logofs_flush;
@@ -5328,7 +5328,7 @@ int ClientChannel::handleSplit(EncodeBuffer &encodeBuffer)
int ClientChannel::handleSplitSend(EncodeBuffer &encodeBuffer, int resource,
int &splits, int &bytes)
{
- #if defined(TEST) || defined(SPLIT)
+ #if defined(TEST) || defined(SPLIT)
SplitStore *splitStore = clientStore_ -> getSplitStore(resource);
@@ -6044,7 +6044,7 @@ int ClientChannel::handleRestart(T_sequence_mode mode, int resource)
// store is either empty or that we did not add any split
// for this resource. This is because when connected to
// an old proxy version we only have a single store for
- // all the resources.
+ // all the resources.
//
// It can happen that all the split messages that were
// originally appended to the list were completely sent
@@ -6155,7 +6155,7 @@ int ClientChannel::handleRestart(T_sequence_mode mode, int resource)
if (split -> getState() != split_notified)
{
- #if defined(TEST) || defined(SPLIT)
+ #if defined(TEST) || defined(SPLIT)
if (split -> getResource() != resource)
{
@@ -7197,7 +7197,7 @@ int ClientChannel::handleFastReadRequest(EncodeBuffer &encodeBuffer, const unsig
#if defined(TEST) || defined(OPCODES)
- *logofs << "handleFastReadRequest: Handled raw request OPCODE#"
+ *logofs << "handleFastReadRequest: Handled raw request OPCODE#"
<< (unsigned int) opcode << " (" << DumpOpcode(opcode) << ")"
<< " for FD#" << fd_ << " sequence " << clientSequence_
<< ". " << size << " bytes in, " << bits << " bits ("
diff --git a/nxcomp/src/ClientChannel.h b/nxcomp/src/ClientChannel.h
index ae92648d5..3172ee7a6 100644
--- a/nxcomp/src/ClientChannel.h
+++ b/nxcomp/src/ClientChannel.h
@@ -327,7 +327,7 @@ class ClientChannel : public Channel
// the pending split operations and
// restart a resource.
//
-
+
int handleFinishSplitRequest(EncodeBuffer &encodeBuffer, const unsigned char opcode,
const unsigned char *buffer, const unsigned int size);
@@ -420,7 +420,7 @@ class ClientChannel : public Channel
private:
//
- // Keep track of object
+ // Keep track of object
// creation and deletion.
//
diff --git a/nxcomp/src/ClientProxy.cpp b/nxcomp/src/ClientProxy.cpp
index 3574d3bf3..59c536830 100644
--- a/nxcomp/src/ClientProxy.cpp
+++ b/nxcomp/src/ClientProxy.cpp
@@ -362,7 +362,7 @@ int ClientProxy::handleLoad(T_load_type type)
{
return -1;
}
-
+
priority_ = 1;
}
else if (result < 0)
diff --git a/nxcomp/src/ClientReadBuffer.cpp b/nxcomp/src/ClientReadBuffer.cpp
index c8f4f69a4..b5e30dda5 100644
--- a/nxcomp/src/ClientReadBuffer.cpp
+++ b/nxcomp/src/ClientReadBuffer.cpp
@@ -53,7 +53,7 @@ unsigned int ClientReadBuffer::suggestedLength(unsigned int pendingLength)
}
return readLength;
-}
+}
int ClientReadBuffer::locateMessage(const unsigned char *start,
const unsigned char *end,
diff --git a/nxcomp/src/ConfigureWindow.cpp b/nxcomp/src/ConfigureWindow.cpp
index 32d3153b9..4e9bcc535 100644
--- a/nxcomp/src/ConfigureWindow.cpp
+++ b/nxcomp/src/ConfigureWindow.cpp
@@ -57,12 +57,12 @@ int ConfigureWindowStore::parseIdentity(Message *message, const unsigned char *b
// Here is the fingerprint.
//
- configureWindow -> window = GetULONG(buffer + 4, bigEndian);
+ configureWindow -> window = GetULONG(buffer + 4, bigEndian);
configureWindow -> value_mask = GetUINT(buffer + 8, bigEndian);
//
- // To increase effectiveness of the caching algorithm
+ // To increase effectiveness of the caching algorithm
// we remove the unused bytes carried in the data part.
//
@@ -127,7 +127,7 @@ void ConfigureWindowStore::dumpIdentity(const Message *message) const
ConfigureWindowMessage *configureWindow = (ConfigureWindowMessage *) message;
- *logofs << "ConfigureWindow: window " << configureWindow -> window
+ *logofs << "ConfigureWindow: window " << configureWindow -> window
<< ", value_mask " << configureWindow -> value_mask
<< ", size " << configureWindow -> size_ << ".\n";
diff --git a/nxcomp/src/ConfigureWindow.h b/nxcomp/src/ConfigureWindow.h
index e02c2aae1..236a25f6a 100644
--- a/nxcomp/src/ConfigureWindow.h
+++ b/nxcomp/src/ConfigureWindow.h
@@ -73,7 +73,7 @@ class ConfigureWindowMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/Control.cpp b/nxcomp/src/Control.cpp
index d894e652a..4ae32ef3f 100644
--- a/nxcomp/src/Control.cpp
+++ b/nxcomp/src/Control.cpp
@@ -454,7 +454,7 @@ Control::Control()
//
// Transport buffers' allocation parameters.
- //
+ //
TransportXBufferSize = TRANSPORT_X_BUFFER_SIZE;
TransportProxyBufferSize = TRANSPORT_PROXY_BUFFER_SIZE;
diff --git a/nxcomp/src/Control.h b/nxcomp/src/Control.h
index 21edae77c..8fc7fc746 100644
--- a/nxcomp/src/Control.h
+++ b/nxcomp/src/Control.h
@@ -112,7 +112,7 @@ T_flush_policy;
#define link_undefined -1;
//
-// This class collects functioning parameters,
+// This class collects functioning parameters,
// to be configurable at run-time. They are for
// the most part regarding timeouts, transport
// and message stores handling.
@@ -307,7 +307,7 @@ class Control
// Version number of local and remote proxy.
//
- /*
+ /*
* LocalVersionMaintenancePatch, RemoteVersionMaintenancePatch
* CompatVersionMaintenancePatch
*
@@ -448,7 +448,7 @@ class Control
//
// Calculate current bitrate on proxy link
// using these observation periods. Value
- // is in milliseconds.
+ // is in milliseconds.
//
int ShortBitrateTimeFrame;
@@ -463,7 +463,7 @@ class Control
int ClientBitrateLimit;
int ServerBitrateLimit;
-
+
//
// This is the limit imposed by user on
// total cache size.
diff --git a/nxcomp/src/CopyArea.cpp b/nxcomp/src/CopyArea.cpp
index c2a19c2df..4f7e65973 100644
--- a/nxcomp/src/CopyArea.cpp
+++ b/nxcomp/src/CopyArea.cpp
@@ -53,8 +53,8 @@ int CopyAreaStore::parseIdentity(Message *message, const unsigned char *buffer,
// Here is the fingerprint.
//
- copyArea -> src_drawable = GetULONG(buffer + 4, bigEndian);
- copyArea -> dst_drawable = GetULONG(buffer + 8, bigEndian);
+ copyArea -> src_drawable = GetULONG(buffer + 4, bigEndian);
+ copyArea -> dst_drawable = GetULONG(buffer + 8, bigEndian);
copyArea -> gcontext = GetULONG(buffer + 12, bigEndian);
copyArea -> src_x = GetUINT(buffer + 16, bigEndian);
@@ -106,7 +106,7 @@ void CopyAreaStore::dumpIdentity(const Message *message) const
CopyAreaMessage *copyArea = (CopyAreaMessage *) message;
- *logofs << name() << ": Identity src_drawable " << copyArea -> src_drawable
+ *logofs << name() << ": Identity src_drawable " << copyArea -> src_drawable
<< ", dst_drawable " << copyArea -> dst_drawable << ", gcontext " << copyArea -> gcontext
<< ", src_x " << copyArea -> src_x << ", src_y " << copyArea -> src_y
<< ", dst_x " << copyArea -> dst_x << ", dst_y " << copyArea -> dst_y
diff --git a/nxcomp/src/CopyArea.h b/nxcomp/src/CopyArea.h
index 6b2617875..c5d871b4b 100644
--- a/nxcomp/src/CopyArea.h
+++ b/nxcomp/src/CopyArea.h
@@ -73,7 +73,7 @@ class CopyAreaMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/CreateGC.h b/nxcomp/src/CreateGC.h
index 03e27d685..6eb888433 100644
--- a/nxcomp/src/CreateGC.h
+++ b/nxcomp/src/CreateGC.h
@@ -73,7 +73,7 @@ class CreateGCMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/CreatePixmap.h b/nxcomp/src/CreatePixmap.h
index 0a3212dd9..602cd8710 100644
--- a/nxcomp/src/CreatePixmap.h
+++ b/nxcomp/src/CreatePixmap.h
@@ -73,7 +73,7 @@ class CreatePixmapMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
@@ -140,10 +140,10 @@ class CreatePixmapStore : public MessageStore
unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
ChannelCache *channelCache) const;
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -153,7 +153,7 @@ class CreatePixmapStore : public MessageStore
virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
ChannelCache *channelCache) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/DecodeBuffer.cpp b/nxcomp/src/DecodeBuffer.cpp
index 09ed67347..d3e2aa474 100644
--- a/nxcomp/src/DecodeBuffer.cpp
+++ b/nxcomp/src/DecodeBuffer.cpp
@@ -471,7 +471,7 @@ const unsigned char *DecodeBuffer::decodeMemory(unsigned int numBytes)
<< " bytes in buffer.\n" << logofs_flush;
#endif
- const unsigned char *result;
+ const unsigned char *result;
//
// Force ourselves to a byte boundary.
diff --git a/nxcomp/src/EncodeBuffer.cpp b/nxcomp/src/EncodeBuffer.cpp
index e6af38b71..1a6648bfd 100644
--- a/nxcomp/src/EncodeBuffer.cpp
+++ b/nxcomp/src/EncodeBuffer.cpp
@@ -436,7 +436,7 @@ void EncodeBuffer::encodeMemory(const unsigned char *buffer, unsigned int numByt
HandleAbort();
}
- *nextDest_ = 0;
+ *nextDest_ = 0;
}
unsigned int EncodeBuffer::getLength() const
@@ -551,7 +551,7 @@ void EncodeBuffer::alignBuffer()
{
growBuffer();
}
-
+
*nextDest_ = 0;
}
}
diff --git a/nxcomp/src/FillPoly.h b/nxcomp/src/FillPoly.h
index 4ceb96c09..fe616e97d 100644
--- a/nxcomp/src/FillPoly.h
+++ b/nxcomp/src/FillPoly.h
@@ -74,7 +74,7 @@ class FillPolyMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/GenericChannel.cpp b/nxcomp/src/GenericChannel.cpp
index 877412cee..8fca9c914 100644
--- a/nxcomp/src/GenericChannel.cpp
+++ b/nxcomp/src/GenericChannel.cpp
@@ -80,8 +80,8 @@ GenericChannel::GenericChannel(Transport *transport, StaticCompressor *compresso
: Channel(transport, compressor), readBuffer_(transport_, this)
{
#ifdef REFERENCES
- *logofs << "GenericChannel: Created new object at "
- << this << " for FD#" << fd_ << " out of "
+ *logofs << "GenericChannel: Created new object at "
+ << this << " for FD#" << fd_ << " out of "
<< ++references_ << " allocated channels.\n"
<< logofs_flush;
#endif
@@ -90,7 +90,7 @@ GenericChannel::GenericChannel(Transport *transport, StaticCompressor *compresso
GenericChannel::~GenericChannel()
{
#ifdef REFERENCES
- *logofs << "GenericChannel: Deleted object at "
+ *logofs << "GenericChannel: Deleted object at "
<< this << " for FD#" << fd_ << " out of "
<< --references_ << " allocated channels.\n"
<< logofs_flush;
@@ -303,7 +303,7 @@ int GenericChannel::handleWrite(const unsigned char *message, unsigned int lengt
#endif
//
- // Create the buffer from which to
+ // Create the buffer from which to
// decode messages.
//
diff --git a/nxcomp/src/GenericReadBuffer.cpp b/nxcomp/src/GenericReadBuffer.cpp
index dd8bfd83c..afeeb9532 100644
--- a/nxcomp/src/GenericReadBuffer.cpp
+++ b/nxcomp/src/GenericReadBuffer.cpp
@@ -43,7 +43,7 @@ unsigned int GenericReadBuffer::suggestedLength(unsigned int pendingLength)
//
return 0;
-}
+}
int GenericReadBuffer::locateMessage(const unsigned char *start,
const unsigned char *end,
diff --git a/nxcomp/src/GenericReply.h b/nxcomp/src/GenericReply.h
index 2b352357f..780aa6de4 100644
--- a/nxcomp/src/GenericReply.h
+++ b/nxcomp/src/GenericReply.h
@@ -138,10 +138,10 @@ class GenericReplyStore : public MessageStore
unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
ChannelCache *channelCache) const;
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -151,7 +151,7 @@ class GenericReplyStore : public MessageStore
virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
ChannelCache *channelCache) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/GenericRequest.cpp b/nxcomp/src/GenericRequest.cpp
index c569d6a24..0cc0a4b34 100644
--- a/nxcomp/src/GenericRequest.cpp
+++ b/nxcomp/src/GenericRequest.cpp
@@ -182,7 +182,7 @@ int GenericRequestStore::parseIdentity(Message *message, const unsigned char *bu
{
if ((i * 2 + 4) < size)
{
- genericRequest -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian);
+ genericRequest -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian);
#ifdef DEBUG
*logofs << name() << ": Parsed data[" << i << "] "
diff --git a/nxcomp/src/GetImage.cpp b/nxcomp/src/GetImage.cpp
index 20b6a07d1..8d9194b6a 100644
--- a/nxcomp/src/GetImage.cpp
+++ b/nxcomp/src/GetImage.cpp
@@ -62,7 +62,7 @@ int GetImageStore::parseIdentity(Message *message, const unsigned char *buffer,
#ifdef TEST
if (getImage -> format != 1 && getImage -> format != 2)
{
- *logofs << name() << ": WARNING! Dirty value " << getImage -> format
+ *logofs << name() << ": WARNING! Dirty value " << getImage -> format
<< " for field format.\n" << logofs_flush;
}
#endif
@@ -116,10 +116,10 @@ void GetImageStore::dumpIdentity(const Message *message) const
GetImageMessage *getImage = (GetImageMessage *) message;
- *logofs << name() << ": Identity format " << (unsigned) getImage -> format
- << ", drawable " << getImage -> drawable << ", x " << getImage -> x
- << ", y " << getImage -> y << ", width " << getImage -> width
- << ", height " << getImage -> height << ", plane_mask "
+ *logofs << name() << ": Identity format " << (unsigned) getImage -> format
+ << ", drawable " << getImage -> drawable << ", x " << getImage -> x
+ << ", y " << getImage -> y << ", width " << getImage -> width
+ << ", height " << getImage -> height << ", plane_mask "
<< getImage -> plane_mask << ", size " << getImage -> size_
<< ".\n" << logofs_flush;
diff --git a/nxcomp/src/GetImage.h b/nxcomp/src/GetImage.h
index 1c3558d14..7d2d07441 100644
--- a/nxcomp/src/GetImage.h
+++ b/nxcomp/src/GetImage.h
@@ -73,7 +73,7 @@ class GetImageMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/GetImageReply.cpp b/nxcomp/src/GetImageReply.cpp
index 5100804ab..a0f4efaff 100644
--- a/nxcomp/src/GetImageReply.cpp
+++ b/nxcomp/src/GetImageReply.cpp
@@ -174,7 +174,7 @@ void GetImageReplyStore::updateIdentity(EncodeBuffer &encodeBuffer, const Messag
<< " as visual field.\n" << logofs_flush;
#endif
- encodeBuffer.encodeCachedValue(getImageReply -> visual, 29,
+ encodeBuffer.encodeCachedValue(getImageReply -> visual, 29,
serverCache -> visualCache);
}
@@ -189,6 +189,6 @@ void GetImageReplyStore::updateIdentity(DecodeBuffer &decodeBuffer, const Messag
ServerCache *serverCache = (ServerCache *) channelCache;
- decodeBuffer.decodeCachedValue(getImageReply -> visual, 29,
+ decodeBuffer.decodeCachedValue(getImageReply -> visual, 29,
serverCache -> visualCache);
}
diff --git a/nxcomp/src/GetImageReply.h b/nxcomp/src/GetImageReply.h
index d4f7c4267..e1b75e592 100644
--- a/nxcomp/src/GetImageReply.h
+++ b/nxcomp/src/GetImageReply.h
@@ -74,7 +74,7 @@ class GetImageReplyMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
@@ -128,10 +128,10 @@ class GetImageReplyStore : public MessageStore
delete (GetImageReplyMessage *) message;
}
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -141,7 +141,7 @@ class GetImageReplyStore : public MessageStore
virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
ChannelCache *channelCache) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/GetProperty.h b/nxcomp/src/GetProperty.h
index 46727280b..8c4bff455 100644
--- a/nxcomp/src/GetProperty.h
+++ b/nxcomp/src/GetProperty.h
@@ -73,7 +73,7 @@ class GetPropertyMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/GetPropertyReply.h b/nxcomp/src/GetPropertyReply.h
index 01634b408..1599d5d3b 100644
--- a/nxcomp/src/GetPropertyReply.h
+++ b/nxcomp/src/GetPropertyReply.h
@@ -74,7 +74,7 @@ class GetPropertyReplyMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
@@ -138,10 +138,10 @@ class GetPropertyReplyStore : public MessageStore
unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
ChannelCache *channelCache) const;
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -151,7 +151,7 @@ class GetPropertyReplyStore : public MessageStore
virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
ChannelCache *channelCache) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/ImageText16.cpp b/nxcomp/src/ImageText16.cpp
index af057635f..f0bdfaaad 100644
--- a/nxcomp/src/ImageText16.cpp
+++ b/nxcomp/src/ImageText16.cpp
@@ -57,9 +57,9 @@ int ImageText16Store::parseIdentity(Message *message, const unsigned char *buffe
// Here is the fingerprint.
//
- imageText16 -> len = *(buffer + 1);
+ imageText16 -> len = *(buffer + 1);
- imageText16 -> drawable = GetULONG(buffer + 4, bigEndian);
+ imageText16 -> drawable = GetULONG(buffer + 4, bigEndian);
imageText16 -> gcontext = GetULONG(buffer + 8, bigEndian);
imageText16 -> x = GetUINT(buffer + 12, bigEndian);
@@ -68,7 +68,7 @@ int ImageText16Store::parseIdentity(Message *message, const unsigned char *buffe
if ((int) size > dataOffset)
{
int pad = (size - dataOffset) - (imageText16 -> len * 2);
-
+
if (pad > 0)
{
CleanData((unsigned char *) buffer + size - pad, pad);
@@ -113,8 +113,8 @@ void ImageText16Store::dumpIdentity(const Message *message) const
ImageText16Message *imageText16 = (ImageText16Message *) message;
*logofs << name() << ": Identity len " << (unsigned int) imageText16 -> len
- << " drawable " << imageText16 -> drawable << ", gcontext "
- << imageText16 -> gcontext << ", x " << imageText16 -> x << ", y "
+ << " drawable " << imageText16 -> drawable << ", gcontext "
+ << imageText16 -> gcontext << ", x " << imageText16 -> x << ", y "
<< imageText16 -> y << ", size " << imageText16 -> size_ << ".\n";
#endif
diff --git a/nxcomp/src/ImageText16.h b/nxcomp/src/ImageText16.h
index 98462ab35..1387b8948 100644
--- a/nxcomp/src/ImageText16.h
+++ b/nxcomp/src/ImageText16.h
@@ -73,7 +73,7 @@ class ImageText16Message : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/ImageText8.cpp b/nxcomp/src/ImageText8.cpp
index 61fcef825..25baa2db0 100644
--- a/nxcomp/src/ImageText8.cpp
+++ b/nxcomp/src/ImageText8.cpp
@@ -57,9 +57,9 @@ int ImageText8Store::parseIdentity(Message *message, const unsigned char *buffer
// Here is the fingerprint.
//
- imageText8 -> len = *(buffer + 1);
+ imageText8 -> len = *(buffer + 1);
- imageText8 -> drawable = GetULONG(buffer + 4, bigEndian);
+ imageText8 -> drawable = GetULONG(buffer + 4, bigEndian);
imageText8 -> gcontext = GetULONG(buffer + 8, bigEndian);
imageText8 -> x = GetUINT(buffer + 12, bigEndian);
@@ -68,7 +68,7 @@ int ImageText8Store::parseIdentity(Message *message, const unsigned char *buffer
if ((int) size > dataOffset)
{
int pad = (size - dataOffset) - imageText8 -> len;
-
+
if (pad > 0)
{
CleanData((unsigned char *) buffer + size - pad, pad);
@@ -113,8 +113,8 @@ void ImageText8Store::dumpIdentity(const Message *message) const
ImageText8Message *imageText8 = (ImageText8Message *) message;
*logofs << name() << ": Identity len " << (unsigned int) imageText8 -> len
- << " drawable " << imageText8 -> drawable << ", gcontext "
- << imageText8 -> gcontext << ", x " << imageText8 -> x << ", y "
+ << " drawable " << imageText8 -> drawable << ", gcontext "
+ << imageText8 -> gcontext << ", x " << imageText8 -> x << ", y "
<< imageText8 -> y << ", size " << imageText8 -> size_ << ".\n";
#endif
diff --git a/nxcomp/src/ImageText8.h b/nxcomp/src/ImageText8.h
index aa9ccb5d9..422e53623 100644
--- a/nxcomp/src/ImageText8.h
+++ b/nxcomp/src/ImageText8.h
@@ -73,7 +73,7 @@ class ImageText8Message : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/InternAtom.cpp b/nxcomp/src/InternAtom.cpp
index 9d0ab1b6d..e83d2b9f8 100644
--- a/nxcomp/src/InternAtom.cpp
+++ b/nxcomp/src/InternAtom.cpp
@@ -72,7 +72,7 @@ int InternAtomStore::parseIdentity(Message *message, const unsigned char *buffer
{
unsigned char *end = ((unsigned char *) buffer) + size;
- for (unsigned char *pad = ((unsigned char *) buffer) + 8 +
+ for (unsigned char *pad = ((unsigned char *) buffer) + 8 +
internAtom -> name_length; pad < end; pad++)
{
*pad = 0;
@@ -108,7 +108,7 @@ void InternAtomStore::dumpIdentity(const Message *message) const
InternAtomMessage *internAtom = (InternAtomMessage *) message;
- *logofs << name() << ": Identity only_if_exists "
+ *logofs << name() << ": Identity only_if_exists "
<< (unsigned int) internAtom -> only_if_exists
<< ", name_length " << internAtom -> name_length
<< ", name '";
diff --git a/nxcomp/src/InternAtom.h b/nxcomp/src/InternAtom.h
index 6e69eca24..857a1c93a 100644
--- a/nxcomp/src/InternAtom.h
+++ b/nxcomp/src/InternAtom.h
@@ -73,7 +73,7 @@ class InternAtomMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/Jpeg.cpp b/nxcomp/src/Jpeg.cpp
index 2e8044049..3a7871d63 100644
--- a/nxcomp/src/Jpeg.cpp
+++ b/nxcomp/src/Jpeg.cpp
@@ -766,7 +766,7 @@ int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
data = dstBuf;
rowPointer[0] = (JSAMPROW) tmpBuf;
-
+
unsigned long pixel;
int i;
diff --git a/nxcomp/src/Keeper.cpp b/nxcomp/src/Keeper.cpp
index d945e6ab5..2cbb09ed0 100644
--- a/nxcomp/src/Keeper.cpp
+++ b/nxcomp/src/Keeper.cpp
@@ -119,8 +119,8 @@ File::~File()
#ifdef REFERENCES
- *logofs << "Keeper: Deleted File at "
- << this << " out of " << references_
+ *logofs << "Keeper: Deleted File at "
+ << this << " out of " << references_
<< " allocated references.\n"
<< logofs_flush;
@@ -410,7 +410,7 @@ int Keeper::collect(const char *path)
strcmp(dirEntry -> d_name, "..") == 0)
{
continue;
- }
+ }
n++;
diff --git a/nxcomp/src/Keeper.h b/nxcomp/src/Keeper.h
index b440beceb..bd29fb344 100644
--- a/nxcomp/src/Keeper.h
+++ b/nxcomp/src/Keeper.h
@@ -123,7 +123,7 @@ class Keeper
//
// Get a list of files in directory.
//
-
+
int collect(const char *path);
//
diff --git a/nxcomp/src/List.cpp b/nxcomp/src/List.cpp
index b2db7151c..760423b23 100644
--- a/nxcomp/src/List.cpp
+++ b/nxcomp/src/List.cpp
@@ -57,8 +57,8 @@ List::List()
references_++;
- *logofs << "List: Created new List at "
- << this << " out of " << references_
+ *logofs << "List: Created new List at "
+ << this << " out of " << references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -69,8 +69,8 @@ List::~List()
references_--;
- *logofs << "List: Deleted List at "
- << this << " out of " << references_
+ *logofs << "List: Deleted List at "
+ << this << " out of " << references_
<< " allocated references.\n" << logofs_flush;
#endif
}
diff --git a/nxcomp/src/ListFontsReply.cpp b/nxcomp/src/ListFontsReply.cpp
index 16be522a1..c3305e5ac 100644
--- a/nxcomp/src/ListFontsReply.cpp
+++ b/nxcomp/src/ListFontsReply.cpp
@@ -107,7 +107,7 @@ int ListFontsReplyStore::parseIdentity(Message *message, const unsigned char *bu
{
unsigned int current;
unsigned int length;
- unsigned int nstringInNames;
+ unsigned int nstringInNames;
unsigned char *end = NULL;
unsigned char *pad = NULL;
@@ -128,7 +128,7 @@ int ListFontsReplyStore::parseIdentity(Message *message, const unsigned char *bu
length = LISTFONTSREPLY_DATA_OFFSET;
- for (nstringInNames = 0;
+ for (nstringInNames = 0;
nstringInNames < listFontsReply -> number_of_names &&
listFontsReply -> number_of_names > 0;
nstringInNames++)
@@ -146,7 +146,7 @@ int ListFontsReplyStore::parseIdentity(Message *message, const unsigned char *bu
<< current << "\n" << logofs_flush;
#endif
}
-
+
#ifdef DUMP
*logofs << "\nFinal length " << length << "\n" << logofs_flush;
#endif
diff --git a/nxcomp/src/ListFontsReply.h b/nxcomp/src/ListFontsReply.h
index c731878e0..cf7fc40a6 100644
--- a/nxcomp/src/ListFontsReply.h
+++ b/nxcomp/src/ListFontsReply.h
@@ -74,7 +74,7 @@ class ListFontsReplyMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
@@ -131,13 +131,13 @@ class ListFontsReplyStore : public MessageStore
delete (ListFontsReplyMessage *) message;
}
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 4bbf42b91..d68e5bfb8 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -703,7 +703,7 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
// Print the 'terminating' messages in the
// session log.
//
-
+
static inline void handleTerminatingInLoop();
static inline void handleTerminatedInLoop();
@@ -1025,25 +1025,25 @@ T_timestamp nowTs;
//
// This is set to the main proxy process id.
-//
+//
int lastProxy = 0;
//
// Set to last dialog process launched by proxy.
-//
+//
int lastDialog = 0;
//
// Set to watchdog process launched by proxy.
-//
+//
int lastWatchdog = 0;
//
// Set if a cache house-keeper process is running.
-//
+//
int lastKeeper = 0;
@@ -1076,7 +1076,7 @@ static int lastDestroy = 0;
//
// This is set to the code and local flag of the
// last requested alert.
-//
+//
static struct
{
@@ -2762,7 +2762,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
handleCheckResultInLoop(*resultFDs, *errorFDs, *setFDs, *readSet, *writeSet, *selectTs, startTs);
//
- // Get time spent in select. The accouting is done
+ // Get time spent in select. The accounting is done
// in milliseconds. This is a real problem on fast
// machines where each loop is unlikely to take
// more than 500 us, so consider that the results
@@ -4602,7 +4602,7 @@ void HandleCleanup(int code)
//
CleanupChildren();
-
+
//
// Close all listeners.
//
@@ -7607,12 +7607,12 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop)
*(remoteData + remotePosition) = '\0';
nxfatal << "Loop: PANIC! Stop character missing "
- << "from FD#" << fd << " after " << remotePosition
+ << "from FD#" << fd << " after " << remotePosition
<< " characters read in string '" << remoteData
<< "'.\n" << std::flush;
cerr << "Error" << ": Stop character missing "
- << "from FD#" << fd << " after " << remotePosition
+ << "from FD#" << fd << " after " << remotePosition
<< " characters read in string '" << remoteData
<< "'.\n";
@@ -8233,7 +8233,7 @@ int ParseEnvironmentOptions(const char *env, int force)
// if the use of the shared memory extension should
// not be enabled on the real X server.
//
-
+
if (control -> ProxyMode == proxy_server)
{
PrintOptionIgnored("local", name, value);
@@ -8958,7 +8958,7 @@ int ParseFileOptions(const char *file)
//
char *next = options;
-
+
while (*next != '\0')
{
if (isprint(*next) == 0)
@@ -11472,7 +11472,7 @@ int SetStorage()
sprintf(cacheSizeName, "%dk", size / 1024);
}
else
- {
+ {
sprintf(cacheSizeName, "%d", size);
}
@@ -11976,7 +11976,7 @@ int SetLink()
{
strcpy(linkSpeedName, "lan");
}
-
+
nxinfo << "Loop: Link speed is " << linkSpeedName
<< ".\n" << std::flush;
@@ -13584,7 +13584,7 @@ int ValidateArg(const char *type, const char *name, const char *value)
}
return number;
-}
+}
int LowercaseArg(const char *type, const char *name, char *value)
{
@@ -13740,7 +13740,7 @@ static void handleCheckSessionInLoop()
// channel is gone. This is the normal shutdown
// procedure in the case of an internal connect-
// ion to the agent.
- //
+ //
int cleanup = 0;
@@ -14588,7 +14588,7 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet,
// Check if the user requested the end of
// the session.
//
-
+
if (CheckAbort() != 0)
{
HandleCleanup();
@@ -14752,7 +14752,7 @@ static void handleAlertInLoop()
//
// Use the display to which we are forwarding
// the remote X connections.
- //
+ //
char *display = displayHost;
@@ -15068,7 +15068,7 @@ static inline void handleAgentInLoop(int &resultFDs, int &errorFDs, int &setFDs,
// Check if I/O is possible on the local
// agent or the proxy descriptor.
//
-
+
if (resultFDs >= 0)
{
//
@@ -15129,7 +15129,7 @@ static inline void handleAgentLateInLoop(int &resultFDs, int &errorFDs, int &set
// descriptors may have become readable or writ-
// able in the meanwhile.
//
-
+
if (resultFDs >= 0)
{
//
diff --git a/nxcomp/src/Message.cpp b/nxcomp/src/Message.cpp
index b75d90c24..11a662e5a 100644
--- a/nxcomp/src/Message.cpp
+++ b/nxcomp/src/Message.cpp
@@ -114,7 +114,7 @@ MessageStore::MessageStore(StaticCompressor *compressor)
md5_state_ = new md5_state_t();
#ifdef DEBUG
- *logofs << "MessageStore: Created MD5 state for object at "
+ *logofs << "MessageStore: Created MD5 state for object at "
<< this << ".\n" << logofs_flush;
#endif
@@ -132,9 +132,9 @@ MessageStore::MessageStore(StaticCompressor *compressor)
remoteStorageSize_ = 0;
#ifdef TEST
- *logofs << "MessageStore: Size of total cache is "
- << totalLocalStorageSize_ << " bytes at local side and "
- << totalRemoteStorageSize_ << " bytes at remote side.\n"
+ *logofs << "MessageStore: Size of total cache is "
+ << totalLocalStorageSize_ << " bytes at local side and "
+ << totalRemoteStorageSize_ << " bytes at remote side.\n"
<< logofs_flush;
#endif
@@ -147,7 +147,7 @@ MessageStore::MessageStore(StaticCompressor *compressor)
references_++;
- *logofs << "MessageStore: Created new store at "
+ *logofs << "MessageStore: Created new store at "
<< this << "out of " << references_
<< " allocated stores.\n" << logofs_flush;
@@ -182,9 +182,9 @@ MessageStore::~MessageStore()
totalRemoteStorageSize_ -= remoteStorageSize_;
#ifdef TEST
- *logofs << "MessageStore: Size of total cache is "
- << totalLocalStorageSize_ << " bytes at local side and "
- << totalRemoteStorageSize_ << " bytes at remote side.\n"
+ *logofs << "MessageStore: Size of total cache is "
+ << totalLocalStorageSize_ << " bytes at local side and "
+ << totalRemoteStorageSize_ << " bytes at remote side.\n"
<< logofs_flush;
#endif
@@ -192,7 +192,7 @@ MessageStore::~MessageStore()
references_--;
- *logofs << "MessageStore: Deleted store at "
+ *logofs << "MessageStore: Deleted store at "
<< this << " out of " << references_
<< " allocated stores.\n" << logofs_flush;
@@ -509,7 +509,7 @@ void MessageStore::dumpData(const Message *message) const
{
#ifdef DUMP
- *logofs << name() << ": Dumping enumerated data:\n" << logofs_flush;
+ *logofs << name() << ": Dumping enumerated data:\n" << logofs_flush;
DumpData(message -> data_.begin(), message -> data_.size());
@@ -517,7 +517,7 @@ void MessageStore::dumpData(const Message *message) const
#ifdef DUMP
- *logofs << name() << ": Dumping checksum data:\n" << logofs_flush;
+ *logofs << name() << ": Dumping checksum data:\n" << logofs_flush;
DumpData(message -> md5_digest_, MD5_LENGTH);
@@ -648,10 +648,10 @@ int MessageStore::clean(T_checksum_action checksumAction)
}
//
-// This is the insertion method used at local side
+// This is the insertion method used at local side
// side. Cache at remote side side will be kept in
-// sync by telling the to other party where to
-// store the message.
+// sync by telling the to other party where to
+// store the message.
//
int MessageStore::findOrAdd(Message *message, T_checksum_action checksumAction,
@@ -985,7 +985,7 @@ int MessageStore::findOrAdd(Message *message, T_checksum_action checksumAction,
message -> locks_ = 0;
#ifdef DEBUG
- *logofs << name() << ": Set last hit of object at "
+ *logofs << name() << ": Set last hit of object at "
<< strMsTimestamp() << " with a bonus of "
<< message -> hits_ << ".\n" << logofs_flush;
#endif
@@ -1054,7 +1054,7 @@ int MessageStore::add(Message *message, const int position,
#ifdef DEBUG
*logofs << name() << ": Stored message object of size "
- << plainSize(position) << " (" << message -> size_
+ << plainSize(position) << " (" << message -> size_
<< "/" << message -> c_size_ << ") at position "
<< position << ".\n" << logofs_flush;
#endif
@@ -1086,7 +1086,7 @@ int MessageStore::add(Message *message, const int position,
message -> locks_ = 0;
#ifdef DEBUG
- *logofs << name() << ": Set last hit of object at "
+ *logofs << name() << ": Set last hit of object at "
<< strMsTimestamp() << " with a bonus of "
<< message -> hits_ << ".\n" << logofs_flush;
#endif
@@ -1551,7 +1551,7 @@ int MessageStore::untouch(Message *message) const
}
#ifdef TEST
- *logofs << name() << ": Decreased hits of object to "
+ *logofs << name() << ": Decreased hits of object to "
<< message -> hits_ << ".\n"
<< logofs_flush;
#endif
@@ -1575,7 +1575,7 @@ int MessageStore::lock(const int position) const
}
#ifdef DEBUG
- *logofs << name() << ": Increasing locks of object to "
+ *logofs << name() << ": Increasing locks of object to "
<< (int) message -> locks_ + 1 << ".\n"
<< logofs_flush;
#endif
@@ -1599,7 +1599,7 @@ int MessageStore::unlock(const int position) const
}
#ifdef DEBUG
- *logofs << name() << ": Decreasing locks of object to "
+ *logofs << name() << ": Decreasing locks of object to "
<< (int) message -> locks_ - 1 << ".\n"
<< logofs_flush;
#endif
@@ -1658,7 +1658,7 @@ int MessageStore::saveStore(ostream *cachefs, md5_state_t *md5StateStream,
{
offset = message -> size_;
}
-
+
#ifdef TEST
*logofs << name() << ": Going to save message at position "
<< position << ".\n" << logofs_flush;
@@ -2060,7 +2060,7 @@ int MessageStore::loadStore(istream *cachefs, md5_state_t *md5StateStream,
<< (unsigned int) opcode() << ".\n"
<< logofs_flush;
#endif
-
+
continue;
}
}
@@ -2216,7 +2216,7 @@ int MessageStore::loadStore(istream *cachefs, md5_state_t *md5StateStream,
message -> hits_ = control -> StoreHitsLoadBonus;
#ifdef DEBUG
- *logofs << name() << ": Updated last hit of object at "
+ *logofs << name() << ": Updated last hit of object at "
<< strMsTimestamp() << " with a bonus of "
<< message -> hits_ << ".\n" << logofs_flush;
#endif
diff --git a/nxcomp/src/Message.h b/nxcomp/src/Message.h
index f3a588104..a81056071 100644
--- a/nxcomp/src/Message.h
+++ b/nxcomp/src/Message.h
@@ -183,7 +183,7 @@ class Message
}
//
- // This is the original message size
+ // This is the original message size
// including the data part regardless
// data is still stored in the object.
//
@@ -198,7 +198,7 @@ class Message
//
// This is the size, including identity,
- // after message has been 'updated' to
+ // after message has been 'updated' to
// reflect storage of data in compressed
// format.
//
@@ -220,7 +220,7 @@ class Message
time_t last_;
//
- // This is the number of cache hits
+ // This is the number of cache hits
// registered for the object.
//
@@ -228,7 +228,7 @@ class Message
//
// This is used to mark messages
- // that have been split.
+ // that have been split.
//
short int locks_;
@@ -835,7 +835,7 @@ class MessageStore
}
#ifdef DEBUG
- *logofs << name() << ": Got checksum for object at "
+ *logofs << name() << ": Got checksum for object at "
<< message << ".\n" << logofs_flush;
#endif
@@ -998,7 +998,7 @@ class MessageStore
StaticCompressor *compressor_;
//
- // Keep track of how many bytes
+ // Keep track of how many bytes
// are taken by cache.
//
diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
index d0d82d0aa..cb27cc610 100644
--- a/nxcomp/src/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -68,7 +68,7 @@ const int DEFAULT_LOOPBACK_BIND = 0;
const int DEFAULT_NX_PROXY_PORT_OFFSET = 4000;
//
-// Default TCP port used by client proxy to listen to
+// Default TCP port used by client proxy to listen to
// X clients and by server proxy to connect to remote.
//
@@ -1907,11 +1907,11 @@ void DumpHexData(const unsigned char *buffer, unsigned int size)
*logofs << message << logofs_flush;
- //
+ //
// "Index 0 1 2 3 4 5 6 7 8 9 a b c d e f Ascii "
// "----- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ----------------"
// "00000 : 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................"
- //
+ //
sprintf (message,"Index 0 1 2 3 4 5 6 7 8 9 a b c d e f Ascii \n");
*logofs << message << logofs_flush;
@@ -1929,7 +1929,7 @@ void DumpHexData(const unsigned char *buffer, unsigned int size)
sprintf (message,"%.5d ", index);
for (index_ascii = 0, linescan = index;
- ((index < (linescan + 16)) && (index < size));
+ ((index < (linescan + 16)) && (index < size));
index++, index_ascii++)
{
if (isprint(buffer [index]))
@@ -1952,7 +1952,7 @@ void DumpHexData(const unsigned char *buffer, unsigned int size)
sprintf (&message [strlen (message)]," %s\n", ascii);
*logofs << message << logofs_flush;
- }
+ }
sprintf (message,"\n#### End Dump Buffer ####\n\n");
diff --git a/nxcomp/src/Misc.h b/nxcomp/src/Misc.h
index 7808c34c2..95e482899 100644
--- a/nxcomp/src/Misc.h
+++ b/nxcomp/src/Misc.h
@@ -268,7 +268,7 @@ inline void CleanData(unsigned char *buffer, int size)
*buffer++ = 0x00;
}
}
-
+
int CheckData(istream *fs);
int CheckData(ostream *fs);
int PutData(ostream *fs, const unsigned char *buffer, int size);
diff --git a/nxcomp/src/OpcodeCache.h b/nxcomp/src/OpcodeCache.h
index e07a1b997..b0683b070 100644
--- a/nxcomp/src/OpcodeCache.h
+++ b/nxcomp/src/OpcodeCache.h
@@ -32,7 +32,7 @@ class OpcodeCache
{
friend class EncodeBuffer;
friend class DecodeBuffer;
-
+
public:
OpcodeCache()
diff --git a/nxcomp/src/Pgn.cpp b/nxcomp/src/Pgn.cpp
index 649227f52..b1862f3c6 100644
--- a/nxcomp/src/Pgn.cpp
+++ b/nxcomp/src/Pgn.cpp
@@ -475,7 +475,7 @@ int DecompressPng16(unsigned char *compressedData, int compressedLen,
//
// Follow the server byte order when arranging data.
//
-
+
if (byteOrder == LSBFirst)
{
data[0] = (unsigned char) (pixel & 0xff);
@@ -486,8 +486,8 @@ int DecompressPng16(unsigned char *compressedData, int compressedLen,
data[1] = (unsigned char) (pixel & 0xff);
data[0] = (unsigned char) ((pixel >> 8) & 0xff);
}
-
- data += 2;
+
+ data += 2;
}
//
@@ -594,7 +594,7 @@ int DecompressPng24(unsigned char *compressedData, int compressedLen,
pixelPtr = (CARD8 *) dstBuf;
rowPointers = (png_byte *)tmpBuf;
-
+
if (setjmp(png_jmpbuf(pngPtr)))
{
#ifdef PANIC
@@ -668,7 +668,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!pngPtr)
- {
+ {
#ifdef PANIC
*logofs << "DecompressPng32: PANIC! "
<< "Failed png_create_read_struct operation"
@@ -681,13 +681,13 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
infoPtr = png_create_info_struct(pngPtr);
if (!infoPtr)
- {
+ {
#ifdef PANIC
*logofs << "DecompressPng32: PANIC! "
<< "Failed png_create_info_struct operation."
<< ".\n" << logofs_flush;
#endif
-
+
png_destroy_read_struct(&pngPtr, NULL, NULL);
return -1;
@@ -707,7 +707,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
}
png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
-
+
if (setjmp(png_jmpbuf(pngPtr)))
{
#ifdef PANIC
@@ -738,7 +738,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
data = dstBuf;
rowPointers = (png_byte *) tmpBuf;
-
+
if (setjmp(png_jmpbuf(pngPtr)))
{
#ifdef PANIC
diff --git a/nxcomp/src/Pipe.cpp b/nxcomp/src/Pipe.cpp
index 228c556ae..95a1f99f7 100644
--- a/nxcomp/src/Pipe.cpp
+++ b/nxcomp/src/Pipe.cpp
@@ -74,7 +74,7 @@ static struct pid
// split each parameter in distinct strings. This is not going
// to work when dealing with parameters containing spaces, even
// if they are enclosed in quotes.
-//
+//
int Psplit(const char *command, char *parameters[], int limit)
{
diff --git a/nxcomp/src/PolyArc.h b/nxcomp/src/PolyArc.h
index d744d6a10..ab9a6ed75 100644
--- a/nxcomp/src/PolyArc.h
+++ b/nxcomp/src/PolyArc.h
@@ -73,7 +73,7 @@ class PolyArcMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/PolyFillArc.h b/nxcomp/src/PolyFillArc.h
index a4eff5b48..0cb0d3373 100644
--- a/nxcomp/src/PolyFillArc.h
+++ b/nxcomp/src/PolyFillArc.h
@@ -73,7 +73,7 @@ class PolyFillArcMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/PolyFillRectangle.h b/nxcomp/src/PolyFillRectangle.h
index 7ebb9270d..6f315d5e9 100644
--- a/nxcomp/src/PolyFillRectangle.h
+++ b/nxcomp/src/PolyFillRectangle.h
@@ -73,7 +73,7 @@ class PolyFillRectangleMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/PolyLine.h b/nxcomp/src/PolyLine.h
index 66fa5df1a..d59db5e63 100644
--- a/nxcomp/src/PolyLine.h
+++ b/nxcomp/src/PolyLine.h
@@ -73,7 +73,7 @@ class PolyLineMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/PolyPoint.h b/nxcomp/src/PolyPoint.h
index b8ea183bf..740d73d71 100644
--- a/nxcomp/src/PolyPoint.h
+++ b/nxcomp/src/PolyPoint.h
@@ -73,7 +73,7 @@ class PolyPointMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/PolySegment.h b/nxcomp/src/PolySegment.h
index 53fd42c60..e9e449a12 100644
--- a/nxcomp/src/PolySegment.h
+++ b/nxcomp/src/PolySegment.h
@@ -73,7 +73,7 @@ class PolySegmentMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/PolyText16.cpp b/nxcomp/src/PolyText16.cpp
index 32be45482..7217edb34 100644
--- a/nxcomp/src/PolyText16.cpp
+++ b/nxcomp/src/PolyText16.cpp
@@ -57,7 +57,7 @@ int PolyText16Store::parseIdentity(Message *message, const unsigned char *buffer
// Here is the fingerprint.
//
- polyText16 -> drawable = GetULONG(buffer + 4, bigEndian);
+ polyText16 -> drawable = GetULONG(buffer + 4, bigEndian);
polyText16 -> gcontext = GetULONG(buffer + 8, bigEndian);
polyText16 -> x = GetUINT(buffer + 12, bigEndian);
@@ -81,10 +81,10 @@ int PolyText16Store::parseIdentity(Message *message, const unsigned char *buffer
int length;
int delta;
int item;
-
+
unsigned int nitem;
- unsigned char *pad = NULL;
+ unsigned char *pad = NULL;
unsigned char *end = NULL;
delta = 1;
@@ -194,9 +194,9 @@ void PolyText16Store::dumpIdentity(const Message *message) const
PolyText16Message *polyText16 = (PolyText16Message *) message;
- *logofs << name() << ": Identity drawable " << polyText16 -> drawable
- << ", gcontext " << polyText16 -> gcontext << ", x " << polyText16 -> x
- << ", y " << polyText16 -> y << ", size " << polyText16 -> size_
+ *logofs << name() << ": Identity drawable " << polyText16 -> drawable
+ << ", gcontext " << polyText16 -> gcontext << ", x " << polyText16 -> x
+ << ", y " << polyText16 -> y << ", size " << polyText16 -> size_
<< ".\n";
#endif
diff --git a/nxcomp/src/PolyText16.h b/nxcomp/src/PolyText16.h
index 805e1fa04..6a607904a 100644
--- a/nxcomp/src/PolyText16.h
+++ b/nxcomp/src/PolyText16.h
@@ -73,7 +73,7 @@ class PolyText16Message : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/PolyText8.cpp b/nxcomp/src/PolyText8.cpp
index 61fef5a4f..b16601d21 100644
--- a/nxcomp/src/PolyText8.cpp
+++ b/nxcomp/src/PolyText8.cpp
@@ -57,7 +57,7 @@ int PolyText8Store::parseIdentity(Message *message, const unsigned char *buffer,
// Here is the fingerprint.
//
- polyText8 -> drawable = GetULONG(buffer + 4, bigEndian);
+ polyText8 -> drawable = GetULONG(buffer + 4, bigEndian);
polyText8 -> gcontext = GetULONG(buffer + 8, bigEndian);
polyText8 -> x = GetUINT(buffer + 12, bigEndian);
@@ -76,7 +76,7 @@ int PolyText8Store::parseIdentity(Message *message, const unsigned char *buffer,
#endif
if ((int) size > dataOffset)
- {
+ {
int length;
int current;
int delta;
@@ -90,7 +90,7 @@ int PolyText8Store::parseIdentity(Message *message, const unsigned char *buffer,
delta = 1;
nitem = 0;
- #ifdef DUMP
+ #ifdef DUMP
*logofs << name() << " Size " << size << ".\n" << logofs_flush;
#endif
@@ -109,38 +109,38 @@ int PolyText8Store::parseIdentity(Message *message, const unsigned char *buffer,
#endif
item = GetUINT(buffer + length , bigEndian);
-
+
if (item < 255)
{
//
// Text element. Number represents
// the 'Length of string' field.
//
-
+
length += (item + delta + 1);
nitem++;
- }
+ }
else if (item == 255)
{
//
// Element is a font shift.
//
-
+
length += 5;
nitem++;
}
- #ifdef DUMP
+ #ifdef DUMP
*logofs << name() << " Item " << item << ".\n" << logofs_flush;
#endif
current += length;
}
while(current < (int) size && item != 0);
-
-
+
+
#ifdef DUMP
*logofs << name() << " Final length " << length << ".\n" << logofs_flush;
#endif
@@ -194,9 +194,9 @@ void PolyText8Store::dumpIdentity(const Message *message) const
PolyText8Message *polyText8 = (PolyText8Message *) message;
- *logofs << name() << ": Identity drawable " << polyText8 -> drawable
- << ", gcontext " << polyText8 -> gcontext << ", x " << polyText8 -> x
- << ", y " << polyText8 -> y << ", size " << polyText8 -> size_
+ *logofs << name() << ": Identity drawable " << polyText8 -> drawable
+ << ", gcontext " << polyText8 -> gcontext << ", x " << polyText8 -> x
+ << ", y " << polyText8 -> y << ", size " << polyText8 -> size_
<< ".\n";
#endif
diff --git a/nxcomp/src/PolyText8.h b/nxcomp/src/PolyText8.h
index 3d5ff533a..07edcaa83 100644
--- a/nxcomp/src/PolyText8.h
+++ b/nxcomp/src/PolyText8.h
@@ -73,7 +73,7 @@ class PolyText8Message : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp
index 1713e308b..367580621 100644
--- a/nxcomp/src/Proxy.cpp
+++ b/nxcomp/src/Proxy.cpp
@@ -2522,7 +2522,7 @@ int Proxy::handleDrain()
// Keep draining the proxy socket while
// reading the incoming messages until
// the timeout is expired.
- //
+ //
for (;;)
{
@@ -2718,7 +2718,7 @@ int Proxy::handleStatistics(int type, ostream *stream)
// Need to update the stream pointer as the
// previous one could have been destroyed.
//
-
+
#ifdef WARNING
*logofs << "Proxy: WARNING! Replacing stream while producing "
<< "statistics in stream at " << currentStatistics_
@@ -2765,7 +2765,7 @@ int Proxy::handleStatisticsFromProxy(int type)
//
char *buffer = new char[STATISTICS_LENGTH];
-
+
*buffer = '\0';
if (control -> ProxyMode == proxy_client)
@@ -3414,7 +3414,7 @@ int Proxy::handleDrop(int channelId)
{
outputChannel_ = -1;
}
-
+
return 1;
}
@@ -4388,7 +4388,7 @@ int Proxy::handleLoadStores()
}
control -> PersistentCacheName = NULL;
-
+
return -1;
}
@@ -4474,7 +4474,7 @@ int Proxy::handleControl(T_proxy_code code, int data)
//
// Append the first data read from the opened
// channel to the control code.
- //
+ //
case code_new_x_connection:
case code_new_cups_connection:
@@ -4943,7 +4943,7 @@ int Proxy::handleLoadVersion(const unsigned char *buffer, int &major,
//
// Force the proxy to discard the
// incompatible caches.
- //
+ //
// Since ProtoStep8 (#issue 108)
if (major < 3)
@@ -6467,7 +6467,7 @@ int Proxy::handlePostConnectionFromProxy(int channelId, int serverFd,
assignChannelMap(channelId, serverFd);
#ifdef TEST
- *logofs << "Proxy: Descriptor FD#" << serverFd
+ *logofs << "Proxy: Descriptor FD#" << serverFd
<< " mapped to channel ID#" << channelId << ".\n"
<< logofs_flush;
#endif
diff --git a/nxcomp/src/ProxyReadBuffer.cpp b/nxcomp/src/ProxyReadBuffer.cpp
index 77f12771b..02425b6d7 100644
--- a/nxcomp/src/ProxyReadBuffer.cpp
+++ b/nxcomp/src/ProxyReadBuffer.cpp
@@ -72,7 +72,7 @@ unsigned int ProxyReadBuffer::suggestedLength(unsigned int pendingLength)
}
return readLength;
-}
+}
int ProxyReadBuffer::locateMessage(const unsigned char *start,
const unsigned char *end,
@@ -185,8 +185,8 @@ int ProxyReadBuffer::locateMessage(const unsigned char *start,
#endif
#if defined(TEST) || defined(INFO)
- *logofs << "ProxyReadBuffer: Produced plain input for " << dataLength
- << "+" << trailerLength << "+" << controlLength << " bytes out of "
+ *logofs << "ProxyReadBuffer: Produced plain input for " << dataLength
+ << "+" << trailerLength << "+" << controlLength << " bytes out of "
<< totalLength << " bytes.\n" << logofs_flush;
#endif
diff --git a/nxcomp/src/PutImage.cpp b/nxcomp/src/PutImage.cpp
index d14f922c3..0422fc8cd 100644
--- a/nxcomp/src/PutImage.cpp
+++ b/nxcomp/src/PutImage.cpp
@@ -231,7 +231,7 @@ int PutImageStore::parseIdentity(Message *message, const unsigned char *buffer,
putImage -> pos_x = GetUINT(buffer + 16, bigEndian);
putImage -> pos_y = GetUINT(buffer + 18, bigEndian);
- putImage -> drawable = GetULONG(buffer + 4, bigEndian);
+ putImage -> drawable = GetULONG(buffer + 4, bigEndian);
putImage -> gcontext = GetULONG(buffer + 8, bigEndian);
#ifdef DEBUG
@@ -277,11 +277,11 @@ void PutImageStore::dumpIdentity(const Message *message) const
PutImageMessage *putImage = (PutImageMessage *) message;
- *logofs << name() << ": Identity format " << (unsigned) putImage -> format
- << ", depth " << (unsigned) putImage -> depth << ", left_pad "
- << (unsigned) putImage -> left_pad << ", width " << putImage -> width
- << ", height " << putImage -> height << ", pos_x " << putImage -> pos_x
- << ", pos_y " << putImage -> pos_y << ", drawable " << putImage -> drawable
+ *logofs << name() << ": Identity format " << (unsigned) putImage -> format
+ << ", depth " << (unsigned) putImage -> depth << ", left_pad "
+ << (unsigned) putImage -> left_pad << ", width " << putImage -> width
+ << ", height " << putImage -> height << ", pos_x " << putImage -> pos_x
+ << ", pos_y " << putImage -> pos_y << ", drawable " << putImage -> drawable
<< ", gcontext " << putImage -> gcontext << ", size " << putImage -> size_
<< ".\n" << logofs_flush;
diff --git a/nxcomp/src/PutImage.h b/nxcomp/src/PutImage.h
index 93dde9dfb..feda33d4d 100644
--- a/nxcomp/src/PutImage.h
+++ b/nxcomp/src/PutImage.h
@@ -81,7 +81,7 @@ class PutImageMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
@@ -150,10 +150,10 @@ class PutImageStore : public MessageStore
unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
ChannelCache *channelCache) const;
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -163,7 +163,7 @@ class PutImageStore : public MessageStore
virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
ChannelCache *channelCache) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/PutPackedImage.cpp b/nxcomp/src/PutPackedImage.cpp
index 0bae2c0d4..301bbe282 100644
--- a/nxcomp/src/PutPackedImage.cpp
+++ b/nxcomp/src/PutPackedImage.cpp
@@ -308,7 +308,7 @@ int PutPackedImageStore::parseIdentity(Message *message, const unsigned char *bu
putPackedImage -> client = *(buffer + 1);
- putPackedImage -> drawable = GetULONG(buffer + 4, bigEndian);
+ putPackedImage -> drawable = GetULONG(buffer + 4, bigEndian);
putPackedImage -> gcontext = GetULONG(buffer + 8, bigEndian);
putPackedImage -> method = *(buffer + 12);
diff --git a/nxcomp/src/PutPackedImage.h b/nxcomp/src/PutPackedImage.h
index 9e3559625..d1cd02e08 100644
--- a/nxcomp/src/PutPackedImage.h
+++ b/nxcomp/src/PutPackedImage.h
@@ -196,10 +196,10 @@ class PutPackedImageStore : public MessageStore
unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
ChannelCache *channelCache) const;
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
@@ -209,7 +209,7 @@ class PutPackedImageStore : public MessageStore
virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
ChannelCache *channelCache) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/QueryFontReply.h b/nxcomp/src/QueryFontReply.h
index e12fe4e4b..f50499959 100644
--- a/nxcomp/src/QueryFontReply.h
+++ b/nxcomp/src/QueryFontReply.h
@@ -121,13 +121,13 @@ class QueryFontReplyStore : public MessageStore
delete (QueryFontReplyMessage *) message;
}
- virtual int parseIdentity(Message *message, const unsigned char *buffer,
+ virtual int parseIdentity(Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+ virtual int unparseIdentity(const Message *message, unsigned char *buffer,
unsigned int size, int bigEndian) const;
- virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+ virtual void identityChecksum(const Message *message, const unsigned char *buffer,
unsigned int size, int bigEndian) const;
virtual void dumpIdentity(const Message *message) const;
diff --git a/nxcomp/src/ReadBuffer.cpp b/nxcomp/src/ReadBuffer.cpp
index 154225e75..ea12927f3 100644
--- a/nxcomp/src/ReadBuffer.cpp
+++ b/nxcomp/src/ReadBuffer.cpp
@@ -302,7 +302,7 @@ int ReadBuffer::readMessage()
#ifdef TEST
*logofs << "ReadBuffer: Moving " << length_
<< " bytes of data " << "at beginning of "
- << "the buffer for FD#" << transport_ -> fd()
+ << "the buffer for FD#" << transport_ -> fd()
<< ".\n" << logofs_flush;
#endif
@@ -312,15 +312,15 @@ int ReadBuffer::readMessage()
start_ = 0;
#ifdef DEBUG
- *logofs << "ReadBuffer: Buffer size is now " << size_
- << " length is " << length_ << " and start is "
+ *logofs << "ReadBuffer: Buffer size is now " << size_
+ << " length is " << length_ << " and start is "
<< start_ << ".\n" << logofs_flush;
#endif
unsigned char *readData = buffer_ + length_;
#ifdef DEBUG
- *logofs << "ReadBuffer: Going to read " << readLength
+ *logofs << "ReadBuffer: Going to read " << readLength
<< " bytes from FD#" << transport_ -> fd() << ".\n"
<< logofs_flush;
#endif
@@ -454,7 +454,7 @@ const unsigned char *ReadBuffer::getMessage(unsigned int &controlLength,
convertBuffer();
}
-
+
return NULL;
}
else
diff --git a/nxcomp/src/RenderExtension.h b/nxcomp/src/RenderExtension.h
index aa9db1b55..9b7d4a76d 100644
--- a/nxcomp/src/RenderExtension.h
+++ b/nxcomp/src/RenderExtension.h
@@ -457,11 +457,11 @@ class RenderMinorExtensionStore : public MinorMessageStore
void encodeLongData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
unsigned int offset, unsigned int size, int bigEndian,
ChannelCache *channelCache) const;
-
+
void encodeIntData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
unsigned int offset, unsigned int size, int bigEndian,
ChannelCache *channelCache) const;
-
+
void encodeCharData(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
unsigned int offset, unsigned int size, int bigEndian,
ChannelCache *channelCache) const;
diff --git a/nxcomp/src/SendEvent.cpp b/nxcomp/src/SendEvent.cpp
index 8867d0a9e..1c78f8b33 100644
--- a/nxcomp/src/SendEvent.cpp
+++ b/nxcomp/src/SendEvent.cpp
@@ -114,11 +114,11 @@ void SendEventStore::dumpIdentity(const Message *message) const
SendEventMessage *sendEvent = (SendEventMessage *) message;
- *logofs << name() << ": Identity propagate " << (unsigned int) sendEvent -> propagate
+ *logofs << name() << ": Identity propagate " << (unsigned int) sendEvent -> propagate
<< ", window " << sendEvent -> window << ", mask " << sendEvent -> mask
<< ", code " << (unsigned int) sendEvent -> code << ", byte_data "
<< (unsigned int) sendEvent -> byte_data << ", sequence "
- << sendEvent -> sequence << ", int_data " << sendEvent -> int_data
+ << sendEvent -> sequence << ", int_data " << sendEvent -> int_data
<< ", size " << sendEvent -> size_ << ".\n" << logofs_flush;
#endif
@@ -182,7 +182,7 @@ void SendEventStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *m
<< " as code field.\n" << logofs_flush;
#endif
- encodeBuffer.encodeCachedValue(sendEvent -> code, 8,
+ encodeBuffer.encodeCachedValue(sendEvent -> code, 8,
clientCache -> sendEventCodeCache);
cachedSendEvent -> code = sendEvent -> code;
@@ -192,7 +192,7 @@ void SendEventStore::updateIdentity(EncodeBuffer &encodeBuffer, const Message *m
<< " as byte_data field.\n" << logofs_flush;
#endif
- encodeBuffer.encodeCachedValue(sendEvent -> byte_data, 8,
+ encodeBuffer.encodeCachedValue(sendEvent -> byte_data, 8,
clientCache -> sendEventByteDataCache);
cachedSendEvent -> byte_data = sendEvent -> byte_data;
diff --git a/nxcomp/src/SendEvent.h b/nxcomp/src/SendEvent.h
index a8841a706..80c0cc957 100644
--- a/nxcomp/src/SendEvent.h
+++ b/nxcomp/src/SendEvent.h
@@ -73,7 +73,7 @@ class SendEventMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/SequenceQueue.cpp b/nxcomp/src/SequenceQueue.cpp
index a045875d7..576854ee7 100644
--- a/nxcomp/src/SequenceQueue.cpp
+++ b/nxcomp/src/SequenceQueue.cpp
@@ -143,7 +143,7 @@ int SequenceQueue::peek(unsigned short int &sequence, unsigned char &opcode,
}
}
-int SequenceQueue::pop(unsigned short int &sequence, unsigned char &opcode,
+int SequenceQueue::pop(unsigned short int &sequence, unsigned char &opcode,
unsigned int &data1, unsigned int &data2,
unsigned int &data3)
{
diff --git a/nxcomp/src/SequenceQueue.h b/nxcomp/src/SequenceQueue.h
index 2a72bc3fe..3f200b691 100644
--- a/nxcomp/src/SequenceQueue.h
+++ b/nxcomp/src/SequenceQueue.h
@@ -52,7 +52,7 @@ class SequenceQueue
unsigned int &data1, unsigned int &data2,
unsigned int &data3);
- int pop(unsigned short int &sequence, unsigned char &opcode,
+ int pop(unsigned short int &sequence, unsigned char &opcode,
unsigned int &data1, unsigned int &data2,
unsigned int &data3);
diff --git a/nxcomp/src/ServerCache.h b/nxcomp/src/ServerCache.h
index c6e2b81b6..f2cb53a3e 100644
--- a/nxcomp/src/ServerCache.h
+++ b/nxcomp/src/ServerCache.h
@@ -137,7 +137,7 @@ class ServerCache : public ChannelCache
IntCache mapNotifyWindowCache;
//
- // MotionNotify event (also used for KeyPress,
+ // MotionNotify event (also used for KeyPress,
// KeyRelease, ButtonPress, ButtonRelease,
// EnterNotify, and LeaveNotify events and
// QueryPointer reply).
diff --git a/nxcomp/src/ServerChannel.cpp b/nxcomp/src/ServerChannel.cpp
index 4ee83507d..4dabd9130 100644
--- a/nxcomp/src/ServerChannel.cpp
+++ b/nxcomp/src/ServerChannel.cpp
@@ -219,7 +219,7 @@ ServerChannel::ServerChannel(Transport *transport, StaticCompressor *compressor)
fontPort_ = -1;
#ifdef REFERENCES
- *logofs << "ServerChannel: Created new object at "
+ *logofs << "ServerChannel: Created new object at "
<< this << " for FD#" << fd_ << " out of "
<< ++references_ << " allocated channels.\n"
<< logofs_flush;
@@ -258,7 +258,7 @@ ServerChannel::~ServerChannel()
#endif
#ifdef REFERENCES
- *logofs << "ServerChannel: Deleted object at "
+ *logofs << "ServerChannel: Deleted object at "
<< this << " for FD#" << fd_ << " out of "
<< --references_ << " allocated channels.\n"
<< logofs_flush;
@@ -341,7 +341,7 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
#endif
//
- // Extract any complete message which
+ // Extract any complete message which
// is available in the buffer.
//
@@ -469,7 +469,7 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
serverSequence_ = sequenceNum;
#ifdef DEBUG
- *logofs << "handleRead: Last server sequence number for FD#"
+ *logofs << "handleRead: Last server sequence number for FD#"
<< fd_ << " is " << serverSequence_ << " with "
<< "difference " << sequenceDiff << ".\n"
<< logofs_flush;
@@ -1506,7 +1506,7 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
serverSequence_ = inputSequence;
#ifdef DEBUG
- *logofs << "handleRead: Last server sequence number for FD#"
+ *logofs << "handleRead: Last server sequence number for FD#"
<< fd_ << " is " << serverSequence_ << " with "
<< "difference " << sequenceDiff << ".\n"
<< logofs_flush;
@@ -1997,7 +1997,7 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
#endif
//
- // Create the buffer from which to
+ // Create the buffer from which to
// decode messages.
//
@@ -2098,7 +2098,7 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
clientSequence_ &= 0xffff;
#ifdef DEBUG
- *logofs << "handleWrite: Last client sequence number for FD#"
+ *logofs << "handleWrite: Last client sequence number for FD#"
<< fd_ << " is " << clientSequence_ << ".\n"
<< logofs_flush;
#endif
@@ -2961,7 +2961,7 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
case X_NoOperation:
{
#ifdef DEBUG
- *logofs << "handleWrite: Managing (probably tainted) X_NoOperation request for FD#"
+ *logofs << "handleWrite: Managing (probably tainted) X_NoOperation request for FD#"
<< fd_ << ".\n" << logofs_flush;
#endif
@@ -4331,7 +4331,7 @@ int ServerChannel::handleWrite(const unsigned char *message, unsigned int length
//
#ifdef TEST
- *logofs << "handleWrite: Sending X_GetInputFocus request for FD#"
+ *logofs << "handleWrite: Sending X_GetInputFocus request for FD#"
<< fd_ << " due to OPCODE#" << (unsigned int) outputOpcode
<< ".\n" << logofs_flush;
#endif
@@ -5602,7 +5602,7 @@ int ServerChannel::handleMotion(EncodeBuffer &encodeBuffer)
serverSequence_ = sequenceNum;
#ifdef DEBUG
- *logofs << "handleMotion: Last server sequence number for FD#"
+ *logofs << "handleMotion: Last server sequence number for FD#"
<< fd_ << " is " << serverSequence_ << " with "
<< "difference " << sequenceDiff << ".\n"
<< logofs_flush;
@@ -6253,7 +6253,7 @@ int ServerChannel::handleAuthorization(unsigned char *buffer)
//
// Use the following code to simulate authentication
// failures on a LSB machine:
- //
+ //
// memcpy(buffer + 12 + (((buffer[6] + 256 *
// buffer[7]) + 3) & ~3), "1234567890123456", 16);
//
@@ -6765,7 +6765,7 @@ int ServerChannel::checkKeyboardEvent(unsigned char event, unsigned short sequen
//
// Handle the MIT-SHM initialization
// messages exchanged with the remote
-// proxy.
+// proxy.
//
int ServerChannel::handleShmemReply(EncodeBuffer &encodeBuffer, const unsigned char opcode,
diff --git a/nxcomp/src/ServerProxy.cpp b/nxcomp/src/ServerProxy.cpp
index 28f94842a..c3fcc300d 100644
--- a/nxcomp/src/ServerProxy.cpp
+++ b/nxcomp/src/ServerProxy.cpp
@@ -327,7 +327,7 @@ int ServerProxy::handleNewXConnectionFromProxy(int channelId)
assignChannelMap(channelId, xServerFd);
#ifdef TEST
- *logofs << "ServerProxy: X server descriptor FD#" << xServerFd
+ *logofs << "ServerProxy: X server descriptor FD#" << xServerFd
<< " mapped to channel ID#" << channelId << ".\n"
<< logofs_flush;
#endif
@@ -523,7 +523,7 @@ int ServerProxy::handleLoadFromProxy()
<< "in command load from proxy.\n";
return -1;
- }
+ }
else if (handleLoadStores() < 0)
{
#ifdef WARNING
diff --git a/nxcomp/src/ServerReadBuffer.cpp b/nxcomp/src/ServerReadBuffer.cpp
index 277b85216..0f5450cb3 100644
--- a/nxcomp/src/ServerReadBuffer.cpp
+++ b/nxcomp/src/ServerReadBuffer.cpp
@@ -68,7 +68,7 @@ unsigned int ServerReadBuffer::suggestedLength(unsigned int pendingLength)
}
return readLength;
-}
+}
int ServerReadBuffer::locateMessage(const unsigned char *start,
const unsigned char *end,
diff --git a/nxcomp/src/SetClipRectangles.cpp b/nxcomp/src/SetClipRectangles.cpp
index b43cea938..7785c3783 100644
--- a/nxcomp/src/SetClipRectangles.cpp
+++ b/nxcomp/src/SetClipRectangles.cpp
@@ -101,9 +101,9 @@ void SetClipRectanglesStore::dumpIdentity(const Message *message) const
SetClipRectanglesMessage *setClipRectangles = (SetClipRectanglesMessage *) message;
*logofs << name() << ": Identity ordering " << (unsigned int) setClipRectangles -> ordering
- << ", gcontext " << setClipRectangles -> gcontext << ", x_origin "
- << setClipRectangles -> x_origin << ", y_origin "
- << setClipRectangles -> y_origin << ", size "
+ << ", gcontext " << setClipRectangles -> gcontext << ", x_origin "
+ << setClipRectangles -> x_origin << ", y_origin "
+ << setClipRectangles -> y_origin << ", size "
<< setClipRectangles -> size_ << ".\n" << logofs_flush;
#endif
}
diff --git a/nxcomp/src/SetClipRectangles.h b/nxcomp/src/SetClipRectangles.h
index a2245360c..9186fb510 100644
--- a/nxcomp/src/SetClipRectangles.h
+++ b/nxcomp/src/SetClipRectangles.h
@@ -73,7 +73,7 @@ class SetClipRectanglesMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/SetUnpackAlpha.h b/nxcomp/src/SetUnpackAlpha.h
index 54714efaa..d71b9cdfd 100644
--- a/nxcomp/src/SetUnpackAlpha.h
+++ b/nxcomp/src/SetUnpackAlpha.h
@@ -75,7 +75,7 @@ class SetUnpackAlphaMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/SetUnpackColormap.h b/nxcomp/src/SetUnpackColormap.h
index 779366531..dc9c275e9 100644
--- a/nxcomp/src/SetUnpackColormap.h
+++ b/nxcomp/src/SetUnpackColormap.h
@@ -75,7 +75,7 @@ class SetUnpackColormapMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/SetUnpackGeometry.h b/nxcomp/src/SetUnpackGeometry.h
index 96104f57f..b726c67a3 100644
--- a/nxcomp/src/SetUnpackGeometry.h
+++ b/nxcomp/src/SetUnpackGeometry.h
@@ -73,7 +73,7 @@ class SetUnpackGeometryMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/ShapeExtension.cpp b/nxcomp/src/ShapeExtension.cpp
index 2ee2b67db..72b12d00b 100644
--- a/nxcomp/src/ShapeExtension.cpp
+++ b/nxcomp/src/ShapeExtension.cpp
@@ -182,7 +182,7 @@ int ShapeExtensionStore::parseIdentity(Message *message, const unsigned char *bu
{
if ((i * 2 + 4) < size)
{
- shapeExtension -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian);
+ shapeExtension -> data[i] = GetUINT(buffer + i * 2 + 4, bigEndian);
#ifdef DEBUG
*logofs << name() << ": Parsed data[" << i << "].\n"
diff --git a/nxcomp/src/Socket.cpp b/nxcomp/src/Socket.cpp
index 34fdea634..0eea5bbac 100644
--- a/nxcomp/src/Socket.cpp
+++ b/nxcomp/src/Socket.cpp
@@ -188,7 +188,7 @@ int GetKernelStep()
return _kernelStep;
}
-
+
int SetReuseAddress(int fd)
{
int flag = 1;
diff --git a/nxcomp/src/Split.cpp b/nxcomp/src/Split.cpp
index e2fea97cc..bba2df8ac 100644
--- a/nxcomp/src/Split.cpp
+++ b/nxcomp/src/Split.cpp
@@ -106,8 +106,8 @@ Split::Split()
references_++;
- *logofs << "Split: Created new Split at "
- << this << " out of " << references_
+ *logofs << "Split: Created new Split at "
+ << this << " out of " << references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -120,8 +120,8 @@ Split::~Split()
references_--;
- *logofs << "Split: Deleted Split at "
- << this << " out of " << references_
+ *logofs << "Split: Deleted Split at "
+ << this << " out of " << references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -147,7 +147,7 @@ SplitStore::SplitStore(StaticCompressor *compressor, CommitStore *commits, int r
{
*logofs << "commit";
}
-
+
*logofs << "].\n" << logofs_flush;
*logofs << "SplitStore: Total messages in stores are "
@@ -182,7 +182,7 @@ SplitStore::~SplitStore()
{
*logofs << "commit";
}
-
+
*logofs << "] with storage size " << splitStorageSize_
<< ".\n" << logofs_flush;
@@ -504,7 +504,7 @@ int SplitStore::send(EncodeBuffer &encodeBuffer, int packetSize)
if (splits_ -> size() == 0)
{
#ifdef PANIC
- *logofs << "SplitStore: PANIC! Function send called with no splits available.\n"
+ *logofs << "SplitStore: PANIC! Function send called with no splits available.\n"
<< logofs_flush;
#endif
@@ -517,7 +517,7 @@ int SplitStore::send(EncodeBuffer &encodeBuffer, int packetSize)
// A start operation must always be executed on
// the split, even in the case the split will be
// later aborted.
- //
+ //
if (current_ == splits_ -> end())
{
@@ -669,7 +669,7 @@ int SplitStore::start(EncodeBuffer &encodeBuffer)
#ifdef TEST
*logofs << "SplitStore: Split data of size " << split -> d_size_
- << " has been compressed to " << compressedSize
+ << " has been compressed to " << compressedSize
<< " bytes.\n" << logofs_flush;
#endif
@@ -833,7 +833,7 @@ int SplitStore::receive(DecodeBuffer &decodeBuffer)
if (splits_ -> size() == 0)
{
#ifdef PANIC
- *logofs << "SplitStore: PANIC! Function receive called with no splits available.\n"
+ *logofs << "SplitStore: PANIC! Function receive called with no splits available.\n"
<< logofs_flush;
#endif
@@ -949,7 +949,7 @@ int SplitStore::receive(DecodeBuffer &decodeBuffer)
#endif
- memcpy(split -> data_.begin() + split -> next_,
+ memcpy(split -> data_.begin() + split -> next_,
decodeBuffer.decodeMemory(count), count);
}
else
@@ -1027,7 +1027,7 @@ Split *SplitStore::pop()
// Move the pointer at the end of the list.
// The next send operation will eventually
// start a new split.
- //
+ //
current_ = splits_ -> end();
@@ -1123,7 +1123,7 @@ void SplitStore::remove(Split *split)
{
#ifdef PANIC
*logofs << "SplitStore: PANIC! Internal error calculating "
- << "split data size. It is " << splitStorageSize_
+ << "split data size. It is " << splitStorageSize_
<< " while should be 0.\n" << logofs_flush;
#endif
@@ -1773,7 +1773,7 @@ int CommitStore::update(Split *split)
c_size_ << ".\n" << logofs_flush;
#endif
- split -> store_ -> updateData(split -> position_, split -> data_.begin(),
+ split -> store_ -> updateData(split -> position_, split -> data_.begin(),
split -> d_size_, split -> c_size_);
}
diff --git a/nxcomp/src/Split.h b/nxcomp/src/Split.h
index ee5eae7fe..0acf227a6 100644
--- a/nxcomp/src/Split.h
+++ b/nxcomp/src/Split.h
@@ -139,7 +139,7 @@ class Split
{
return store_;
}
-
+
T_split_state getState()
{
return state_;
@@ -241,7 +241,7 @@ class Split
//
int r_size_;
-
+
//
// Position in the data buffer that will be
// the target of the next send or receive
diff --git a/nxcomp/src/StaticCompressor.cpp b/nxcomp/src/StaticCompressor.cpp
index b47193354..e9fd8c4e2 100644
--- a/nxcomp/src/StaticCompressor.cpp
+++ b/nxcomp/src/StaticCompressor.cpp
@@ -150,7 +150,7 @@ int StaticCompressor::compressBuffer(const unsigned char *plainBuffer,
EncodeBuffer &encodeBuffer)
{
if (control -> LocalDataCompression == 0 ||
- compressBuffer(plainBuffer, plainSize,
+ compressBuffer(plainBuffer, plainSize,
compressedBuffer, compressedSize) <= 0)
{
encodeBuffer.encodeBoolValue(0);
@@ -204,7 +204,7 @@ int StaticCompressor::compressBuffer(const unsigned char *plainBuffer,
//
// Determine the size of the temporary
- // buffer.
+ // buffer.
//
unsigned int newSize = plainSize + (plainSize / 1000) + 12;
@@ -241,7 +241,7 @@ int StaticCompressor::compressBuffer(const unsigned char *plainBuffer,
bufferSize_ = newSize;
}
- unsigned int resultingSize = newSize;
+ unsigned int resultingSize = newSize;
int result = ZCompress(&compressionStream_, buffer_, &resultingSize,
plainBuffer, plainSize);
@@ -360,7 +360,7 @@ int StaticCompressor::decompressBuffer(unsigned char *plainBuffer,
{
#ifdef PANIC
*logofs << "StaticCompressor: PANIC! Expected decompressed size was "
- << plainSize << " while it is " << checkSize
+ << plainSize << " while it is " << checkSize
<< ".\n" << logofs_flush;
#endif
@@ -411,7 +411,7 @@ int StaticCompressor::decompressBuffer(unsigned char *plainBuffer,
{
#ifdef PANIC
*logofs << "StaticCompressor: PANIC! Expected decompressed size was "
- << plainSize << " while it is " << checkSize
+ << plainSize << " while it is " << checkSize
<< ".\n" << logofs_flush;
#endif
diff --git a/nxcomp/src/TranslateCoords.cpp b/nxcomp/src/TranslateCoords.cpp
index f61caea47..f1f2a3207 100644
--- a/nxcomp/src/TranslateCoords.cpp
+++ b/nxcomp/src/TranslateCoords.cpp
@@ -98,8 +98,8 @@ void TranslateCoordsStore::dumpIdentity(const Message *message) const
TranslateCoordsMessage *translateCoords = (TranslateCoordsMessage *) message;
- *logofs << name() << ": Identity src_window " << translateCoords -> src_window << ", dst_window "
- << translateCoords -> dst_window << ", src_x " << translateCoords -> src_x << ", src_y "
+ *logofs << name() << ": Identity src_window " << translateCoords -> src_window << ", dst_window "
+ << translateCoords -> dst_window << ", src_x " << translateCoords -> src_x << ", src_y "
<< translateCoords -> src_y << ", size " << translateCoords -> size_ << ".\n" << logofs_flush;
#endif
diff --git a/nxcomp/src/TranslateCoords.h b/nxcomp/src/TranslateCoords.h
index fd9b1590b..c439f437f 100644
--- a/nxcomp/src/TranslateCoords.h
+++ b/nxcomp/src/TranslateCoords.h
@@ -73,7 +73,7 @@ class TranslateCoordsMessage : public Message
}
//
- // Put here the fields which constitute
+ // Put here the fields which constitute
// the 'identity' part of the message.
//
diff --git a/nxcomp/src/Transport.cpp b/nxcomp/src/Transport.cpp
index 63e26bae6..e93649a56 100644
--- a/nxcomp/src/Transport.cpp
+++ b/nxcomp/src/Transport.cpp
@@ -123,8 +123,8 @@ Transport::Transport(int fd) : fd_(fd)
finish_ = 0;
#ifdef REFERENCES
- *logofs << "Transport: Created new object at "
- << this << " out of " << ++references_
+ *logofs << "Transport: Created new object at "
+ << this << " out of " << ++references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -139,8 +139,8 @@ Transport::~Transport()
::close(fd_);
#ifdef REFERENCES
- *logofs << "Transport: Deleted object at "
- << this << " out of " << --references_
+ *logofs << "Transport: Deleted object at "
+ << this << " out of " << --references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -152,7 +152,7 @@ Transport::~Transport()
int Transport::read(unsigned char *data, unsigned int size)
{
#ifdef DEBUG
- *logofs << "Transport: Going to read " << size << " bytes from "
+ *logofs << "Transport: Going to read " << size << " bytes from "
<< "FD#" << fd_ << ".\n" << logofs_flush;
#endif
@@ -193,7 +193,7 @@ int Transport::read(unsigned char *data, unsigned int size)
else
{
#ifdef TEST
- *logofs << "Transport: Error reading from "
+ *logofs << "Transport: Error reading from "
<< "FD#" << fd_ << ".\n" << logofs_flush;
#endif
@@ -205,7 +205,7 @@ int Transport::read(unsigned char *data, unsigned int size)
else if (result == 0)
{
#ifdef TEST
- *logofs << "Transport: No data read from "
+ *logofs << "Transport: No data read from "
<< "FD#" << fd_ << ".\n" << logofs_flush;
#endif
@@ -232,8 +232,8 @@ int Transport::read(unsigned char *data, unsigned int size)
}
//
-// Write as many bytes as possible to socket.
-// Append the remaining data bytes to the end
+// Write as many bytes as possible to socket.
+// Append the remaining data bytes to the end
// of the buffer and update length to reflect
// changes.
//
@@ -343,7 +343,7 @@ int Transport::write(T_write type, const unsigned char *data, const unsigned int
else
{
#ifdef TEST
- *logofs << "Transport: Write to " << "FD#"
+ *logofs << "Transport: Write to " << "FD#"
<< fd_ << " failed.\n" << logofs_flush;
#endif
@@ -407,7 +407,7 @@ int Transport::write(T_write type, const unsigned char *data, const unsigned int
<< " has data for " << w_buffer_.length_ << " bytes.\n"
<< logofs_flush;
- *logofs << "Transport: Start is " << w_buffer_.start_
+ *logofs << "Transport: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " size is "
<< w_buffer_.data_.size() << " capacity is "
<< w_buffer_.data_.capacity() << ".\n"
@@ -449,8 +449,8 @@ int Transport::flush()
}
//
- // It's time to move data from the
- // write buffer to the real link.
+ // It's time to move data from the
+ // write buffer to the real link.
//
int written = 0;
@@ -513,7 +513,7 @@ int Transport::flush()
else
{
#ifdef TEST
- *logofs << "Transport: Write to " << "FD#"
+ *logofs << "Transport: Write to " << "FD#"
<< fd_ << " failed.\n" << logofs_flush;
#endif
@@ -525,7 +525,7 @@ int Transport::flush()
else
{
#ifdef TEST
- *logofs << "Transport: Flushed " << result << " bytes on "
+ *logofs << "Transport: Flushed " << result << " bytes on "
<< "FD#" << fd_ << ".\n" << logofs_flush;
#endif
@@ -568,8 +568,8 @@ int Transport::flush()
if (w_buffer_.length_ > 0)
{
#ifdef TEST
- *logofs << "Transport: There are still " << w_buffer_.length_
- << " bytes in write buffer for " << "FD#"
+ *logofs << "Transport: There are still " << w_buffer_.length_
+ << " bytes in write buffer for " << "FD#"
<< fd_ << ".\n" << logofs_flush;
#endif
@@ -581,7 +581,7 @@ int Transport::flush()
<< " has data for " << w_buffer_.length_ << " bytes.\n"
<< logofs_flush;
- *logofs << "Transport: Start is " << w_buffer_.start_
+ *logofs << "Transport: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " size is "
<< w_buffer_.data_.size() << " capacity is "
<< w_buffer_.data_.capacity() << ".\n"
@@ -805,8 +805,8 @@ int Transport::drain(int limit, int timeout)
w_buffer_.start_ += written;
#ifdef TEST
- *logofs << "Transport: There are still " << w_buffer_.length_
- << " bytes in write buffer for " << "FD#"
+ *logofs << "Transport: There are still " << w_buffer_.length_
+ << " bytes in write buffer for " << "FD#"
<< fd_ << ".\n" << logofs_flush;
#endif
@@ -827,7 +827,7 @@ int Transport::drain(int limit, int timeout)
<< " has data for " << w_buffer_.length_ << " bytes.\n"
<< logofs_flush;
- *logofs << "Transport: Start is " << w_buffer_.start_
+ *logofs << "Transport: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " size is "
<< w_buffer_.data_.size() << " capacity is "
<< w_buffer_.data_.capacity() << ".\n"
@@ -876,7 +876,7 @@ int Transport::wait(int timeout) const
else if (available == 0 && result > 0)
{
#ifdef TEST
- *logofs << "Transport: Read on " << "FD#"
+ *logofs << "Transport: Read on " << "FD#"
<< fd_ << " failed.\n" << logofs_flush;
#endif
@@ -921,7 +921,7 @@ int Transport::wait(int timeout) const
else
{
#ifdef TEST
- *logofs << "Transport: Select on " << "FD#"
+ *logofs << "Transport: Select on " << "FD#"
<< fd_ << " failed.\n" << logofs_flush;
#endif
@@ -994,9 +994,9 @@ int Transport::resize(T_buffer &buffer, const int &size)
buffer.start_ = 0;
#ifdef DEBUG
- *logofs << "Transport: Made room for "
+ *logofs << "Transport: Made room for "
<< buffer.data_.size() - buffer.start_
- << " bytes in buffer for " << "FD#"
+ << " bytes in buffer for " << "FD#"
<< fd_ << ".\n" << logofs_flush;
#endif
}
@@ -1053,8 +1053,8 @@ int Transport::resize(T_buffer &buffer, const int &size)
#endif
#ifdef TEST
- *logofs << "Transport: Data buffer for " << "FD#"
- << fd_ << " has now size " << buffer.data_.size()
+ *logofs << "Transport: Data buffer for " << "FD#"
+ << fd_ << " has now size " << buffer.data_.size()
<< " and capacity " << buffer.data_.capacity()
<< ".\n" << logofs_flush;
#endif
@@ -1174,8 +1174,8 @@ ProxyTransport::ProxyTransport(int fd) : Transport(fd)
flush_ = 0;
#ifdef REFERENCES
- *logofs << "ProxyTransport: Created new object at "
- << this << " out of " << ++references_
+ *logofs << "ProxyTransport: Created new object at "
+ << this << " out of " << ++references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -1199,8 +1199,8 @@ ProxyTransport::~ProxyTransport()
}
#ifdef REFERENCES
- *logofs << "ProxyTransport: Deleted object at "
- << this << " out of " << --references_
+ *logofs << "ProxyTransport: Deleted object at "
+ << this << " out of " << --references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -1283,8 +1283,8 @@ int ProxyTransport::read(unsigned char *data, unsigned int size)
r_buffer_.start_ += copied;
#ifdef TEST
- *logofs << "ProxyTransport: There are still " << r_buffer_.length_
- << " bytes in read buffer for proxy " << "FD#"
+ *logofs << "ProxyTransport: There are still " << r_buffer_.length_
+ << " bytes in read buffer for proxy " << "FD#"
<< fd_ << ".\n" << logofs_flush;
#endif
}
@@ -1311,7 +1311,7 @@ int ProxyTransport::read(unsigned char *data, unsigned int size)
//
#ifdef DEBUG
- *logofs << "ProxyTransport: Going to decompress data for "
+ *logofs << "ProxyTransport: Going to decompress data for "
<< "proxy FD#" << fd_ << ".\n" << logofs_flush;
#endif
@@ -1585,7 +1585,7 @@ int ProxyTransport::read(unsigned char *data, unsigned int size)
r_buffer_.start_ += copied;
#ifdef TEST
- *logofs << "ProxyTransport: There are still " << r_buffer_.length_
+ *logofs << "ProxyTransport: There are still " << r_buffer_.length_
<< " bytes in read buffer for proxy FD#" << fd_
<< ".\n" << logofs_flush;
#endif
@@ -1603,7 +1603,7 @@ int ProxyTransport::write(T_write type, const unsigned char *data, const unsigne
#ifdef TEST
if (size == 0)
{
- *logofs << "ProxyTransport: WARNING! Write called for FD#"
+ *logofs << "ProxyTransport: WARNING! Write called for FD#"
<< fd_ << " without any data to write.\n"
<< logofs_flush;
@@ -1635,7 +1635,7 @@ int ProxyTransport::write(T_write type, const unsigned char *data, const unsigne
}
#ifdef DEBUG
- *logofs << "ProxyTransport: Going to compress " << size
+ *logofs << "ProxyTransport: Going to compress " << size
<< " bytes to write buffer for proxy FD#" << fd_
<< ".\n" << logofs_flush;
#endif
@@ -1897,7 +1897,7 @@ int ProxyTransport::write(T_write type, const unsigned char *data, const unsigne
<< " has data for " << w_buffer_.length_ << " bytes.\n"
<< logofs_flush;
- *logofs << "ProxyTransport: Start is " << w_buffer_.start_
+ *logofs << "ProxyTransport: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " flush is "
<< flush_ << " size is " << w_buffer_.data_.size()
<< " capacity is " << w_buffer_.data_.capacity()
@@ -1962,7 +1962,7 @@ int ProxyTransport::write(T_write type, const unsigned char *data, const unsigne
<< " has data for " << w_buffer_.length_ << " bytes.\n"
<< logofs_flush;
- *logofs << "ProxyTransport: Start is " << w_buffer_.start_
+ *logofs << "ProxyTransport: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " flush is "
<< flush_ << " size is " << w_buffer_.data_.size()
<< " capacity is " << w_buffer_.data_.capacity()
@@ -2234,7 +2234,7 @@ int ProxyTransport::flush()
//
// Time to move data from the write
- // buffer to the real link.
+ // buffer to the real link.
//
#ifdef DEBUG
@@ -2249,7 +2249,7 @@ int ProxyTransport::flush()
<< " has data for " << w_buffer_.length_ << " bytes.\n"
<< logofs_flush;
- *logofs << "ProxyTransport: Start is " << w_buffer_.start_
+ *logofs << "ProxyTransport: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " flush is "
<< flush_ << " size is " << w_buffer_.data_.size()
<< " capacity is " << w_buffer_.data_.capacity()
@@ -2382,7 +2382,7 @@ AgentTransport::AgentTransport(int fd) : Transport(fd)
//
// Interfaces in pthread to handle mutex
- // type do not work in current version.
+ // type do not work in current version.
//
m_attributes.__mutexkind = PTHREAD_MUTEX_ERRORCHECK_NP;
@@ -2408,8 +2408,8 @@ AgentTransport::AgentTransport(int fd) : Transport(fd)
#endif
#ifdef REFERENCES
- *logofs << "AgentTransport: Child: Created new object at "
- << this << " out of " << ++references_
+ *logofs << "AgentTransport: Child: Created new object at "
+ << this << " out of " << ++references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -2436,8 +2436,8 @@ AgentTransport::~AgentTransport()
#endif
#ifdef REFERENCES
- *logofs << "AgentTransport: Child: Deleted object at "
- << this << " out of " << --references_
+ *logofs << "AgentTransport: Child: Deleted object at "
+ << this << " out of " << --references_
<< " allocated references.\n" << logofs_flush;
#endif
}
@@ -2593,7 +2593,7 @@ int AgentTransport::write(T_write type, const unsigned char *data, const unsigne
<< " has data for " << w_buffer_.length_ << " bytes.\n"
<< logofs_flush;
- *logofs << "AgentTransport: Child: Start is " << w_buffer_.start_
+ *logofs << "AgentTransport: Child: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " size is "
<< w_buffer_.data_.size() << " capacity is "
<< w_buffer_.data_.capacity() << ".\n"
@@ -2809,7 +2809,7 @@ int AgentTransport::enqueue(const char *data, const int size)
<< " has now data for " << r_buffer_.length_
<< " bytes.\n" << logofs_flush;
- *logofs << "AgentTransport: Parent: Start is " << r_buffer_.start_
+ *logofs << "AgentTransport: Parent: Start is " << r_buffer_.start_
<< " length is " << r_buffer_.length_ << " size is "
<< r_buffer_.data_.size() << " capacity is "
<< r_buffer_.data_.capacity() << ".\n"
@@ -2894,7 +2894,7 @@ int AgentTransport::dequeue(char *data, int size)
<< " has now data for " << length() << " bytes.\n"
<< logofs_flush;
- *logofs << "AgentTransport: Parent: Start is " << w_buffer_.start_
+ *logofs << "AgentTransport: Parent: Start is " << w_buffer_.start_
<< " length is " << w_buffer_.length_ << " size is "
<< w_buffer_.data_.size() << " capacity is "
<< w_buffer_.data_.capacity() << ".\n"
diff --git a/nxcomp/src/Transport.h b/nxcomp/src/Transport.h
index 4ae0e3c25..ba07e13d4 100644
--- a/nxcomp/src/Transport.h
+++ b/nxcomp/src/Transport.h
@@ -279,7 +279,7 @@ class Transport
};
//
-// This class handles buffered I/O and
+// This class handles buffered I/O and
// compression of the proxy stream.
//
diff --git a/nxcomp/src/Types.h b/nxcomp/src/Types.h
index e82664c81..3817ad869 100644
--- a/nxcomp/src/Types.h
+++ b/nxcomp/src/Types.h
@@ -42,8 +42,8 @@ using namespace std;
#define MD5_LENGTH 16
//
-// Types of repositories. Replace the original
-// clear() methods from STL in order to actually
+// Types of repositories. Replace the original
+// clear() methods from STL in order to actually
// free the unused memory.
//
diff --git a/nxcomp/src/Unpack.cpp b/nxcomp/src/Unpack.cpp
index e63e836f0..10d6169bb 100644
--- a/nxcomp/src/Unpack.cpp
+++ b/nxcomp/src/Unpack.cpp
@@ -216,7 +216,7 @@ int Unpack8To16(const T_colormask *colormask, const unsigned char *data,
unsigned short *out16 = (unsigned short *) out;
unsigned short *end16 = (unsigned short *) end;
-
+
while (out16 < end16)
{
if (*data == 0)
@@ -602,7 +602,7 @@ int Unpack16(T_geometry *geometry, const T_colormask *colormask, int src_depth,
(*unpack)(colormask, src_data, dst_data, dst_end);
}
-
+
return 1;
}
@@ -948,7 +948,7 @@ int Unpack15To16(const unsigned char *data, unsigned char *out, unsigned char *e
<< " bytes of colormapped data.\n"
<< logofs_flush;
#endif
-
+
unsigned short *data16 = (unsigned short *) data;
unsigned short *out16 = (unsigned short *) out;
unsigned short *end16 = (unsigned short *) end;
@@ -969,7 +969,7 @@ int Unpack15To16(const unsigned char *data, unsigned char *out, unsigned char *e
*logofs << "Unpack15To16: Pixel [" << *data16 << "]\n"
<< logofs_flush;
#endif
-
+
*out16 = ((*data16 & 0x7ff0) << 1) |
(*data16 & 0x001f);
}
@@ -977,7 +977,7 @@ int Unpack15To16(const unsigned char *data, unsigned char *out, unsigned char *e
out16 += 1;
data16 += 1;
}
-
+
return 1;
}
@@ -1048,8 +1048,8 @@ int Unpack15To32(const unsigned char *data, unsigned char *out, unsigned char *e
}
else
{
- *out32 = ((((*data16 >> 7) & 0xf8) | ((*data16 >> 12) & 0x07)) << 16) |
- ((((*data16 >> 2) & 0xf8) | ((*data16 >> 8) & 0x07)) << 8) |
+ *out32 = ((((*data16 >> 7) & 0xf8) | ((*data16 >> 12) & 0x07)) << 16) |
+ ((((*data16 >> 2) & 0xf8) | ((*data16 >> 8) & 0x07)) << 8) |
(((*data16 << 3) & 0xf8) | ((*data16 >> 2) & 0x07));
}
@@ -1154,13 +1154,13 @@ int Unpack16To16(const unsigned char *data, unsigned char *out,
<< " bytes of colormapped data.\n"
<< logofs_flush;
#endif
-
+
memcpy((unsigned char *) out, (unsigned char *) data, end - out);
return 1;
}
-int Unpack16To24(const unsigned char *data, unsigned char *out,
+int Unpack16To24(const unsigned char *data, unsigned char *out,
unsigned char *end, int imageByteOrder)
{
@@ -1205,7 +1205,7 @@ int Unpack16To24(const unsigned char *data, unsigned char *out,
}
-int Unpack16To32(const unsigned char *data, unsigned char *out,
+int Unpack16To32(const unsigned char *data, unsigned char *out,
unsigned char *end, int imageByteOrder)
{
#ifdef TEST
@@ -1228,7 +1228,7 @@ int Unpack16To32(const unsigned char *data, unsigned char *out,
if (pixel16 == 0x0)
{
- PutULONG(0x0, (unsigned char *) out32, imageByteOrder);
+ PutULONG(0x0, (unsigned char *) out32, imageByteOrder);
}
else if (pixel16 == 0xffff)
{
@@ -1236,11 +1236,11 @@ int Unpack16To32(const unsigned char *data, unsigned char *out,
}
else
{
- pixel32 = ((((pixel16 >> 8) & 0xf8) | ((pixel16 >> 13) & 0x07)) << 16) |
- ((((pixel16 >> 3) & 0xfc) | ((pixel16 >> 9) & 0x03)) << 8) |
+ pixel32 = ((((pixel16 >> 8) & 0xf8) | ((pixel16 >> 13) & 0x07)) << 16) |
+ ((((pixel16 >> 3) & 0xfc) | ((pixel16 >> 9) & 0x03)) << 8) |
(((pixel16 << 3) & 0xf8) | ((pixel16 >> 2) & 0x07));
-
- PutULONG(pixel32, (unsigned char *) out32, imageByteOrder);
+
+ PutULONG(pixel32, (unsigned char *) out32, imageByteOrder);
}
out32++;
@@ -1265,11 +1265,11 @@ int Unpack16(T_geometry *geometry, int src_depth, int src_width, int src_height,
return -1;
}
- int (*unpack)(const unsigned char *data, unsigned char *out,
+ int (*unpack)(const unsigned char *data, unsigned char *out,
unsigned char *end, int imageByteOrder);
int dst_bpp = UnpackBitsPerPixel(geometry, dst_depth);
-
+
switch (dst_bpp)
{
case 16:
@@ -1378,7 +1378,7 @@ int Unpack24To32(const unsigned char *data, unsigned char *out, unsigned char *e
}
else
{
- *out32 = (data[2] << 16) | (data[1] << 8) | data[0];
+ *out32 = (data[2] << 16) | (data[1] << 8) | data[0];
}
out32 += 1;
@@ -1391,7 +1391,7 @@ int Unpack24To32(const unsigned char *data, unsigned char *out, unsigned char *e
int Unpack24(T_geometry *geometry, int src_depth, int src_width, int src_height,
unsigned char *src_data, int src_size, int dst_depth, int dst_width,
int dst_height, unsigned char *dst_data, int dst_size)
-
+
{
if (src_depth != 24)
{
diff --git a/nxcomp/src/Unpack.h b/nxcomp/src/Unpack.h
index faaa41d82..d30d8a39f 100644
--- a/nxcomp/src/Unpack.h
+++ b/nxcomp/src/Unpack.h
@@ -65,7 +65,7 @@ typedef struct
// Colormap is used to remap colors
// from source to destination depth.
//
-
+
typedef struct
{
unsigned int entries;
@@ -78,7 +78,7 @@ typedef struct
// bits images at the time they are
// unpacked.
//
-
+
typedef struct
{
unsigned int entries;
diff --git a/nxcomp/src/Vars.c b/nxcomp/src/Vars.c
index 685969677..f5c1b659e 100644
--- a/nxcomp/src/Vars.c
+++ b/nxcomp/src/Vars.c
@@ -35,7 +35,7 @@ extern "C" {
* Allocate here instances of variables and
* pointers declared in NXvars.h.
*/
-
+
int _NXHandleDisplayError = 0;
NXDisplayErrorPredicate _NXDisplayErrorFunction = NULL;
diff --git a/nxcomp/src/XidCache.h b/nxcomp/src/XidCache.h
index 8a09ef9b1..4fffb5634 100644
--- a/nxcomp/src/XidCache.h
+++ b/nxcomp/src/XidCache.h
@@ -32,7 +32,7 @@ class XidCache
{
friend class EncodeBuffer;
friend class DecodeBuffer;
-
+
public:
XidCache();
diff --git a/testscripts/slave-agent b/testscripts/slave-agent
index 2f22c187a..a97e7cfbc 100755
--- a/testscripts/slave-agent
+++ b/testscripts/slave-agent
@@ -32,14 +32,14 @@
# Run:
# nxproxy [...] slave=12000
# nxagent -display nx/nx,options=nxagent.conf # slave=22000 in nxagent.conf
-#
+#
# Where 12000 and 22000 are example TCP ports the program will listen on.
-#
+#
# For ease of debugging and running both sides on a single machine, the script
# reacts to its own name and changes the prompt to "Proxy" if $0 contains
# "proxy", or "Agent" if it contains "agent". This has no other effect.
#
-#
+#
use strict;
use POSIX ":sys_wait_h";
@@ -99,7 +99,7 @@ while(!$EXIT) {
if (!defined $ret) {
die "Read failed: $!";
}
-
+
if (!$ret) {
last;
}
@@ -156,7 +156,7 @@ sub cmd_blkecho {
if ( !defined $ret ) {
die "Error reading from socket: $!";
}
-
+
last if ( $ret == 0 );
$buf .= $tmp;
}
@@ -226,7 +226,7 @@ sub cmd_fastgen {
}
}
-# Output RFC 864 chargen.
+# Output RFC 864 chargen.
# Used to test bandwidth
sub cmd_chargen {
my $text = "";
diff --git a/testscripts/slave-client b/testscripts/slave-client
index 4ce75f45f..99a8f1ae5 100755
--- a/testscripts/slave-client
+++ b/testscripts/slave-client
@@ -74,7 +74,7 @@ Options:
-d, --dump Dump benchmark data in tab separated format, for
graphing.
-e, --delay=FLOAT Delay between blocks or pings. None by default.
- -H, --host=HOST Host to connect to. 'localhost' by default.
+ -H, --host=HOST Host to connect to. 'localhost' by default.
-P, --port=PORT Port to connect to. Mandatory.
Benchmarks:
@@ -84,7 +84,7 @@ Benchmarks:
--fastreadbench Benchmark reading a single repeated character.
--fastwritebench Benchmark writing a single repeated character.
--pingbench Benchmark ping time.
- --randechobench Benchmark sending random data, and receiving it
+ --randechobench Benchmark sending random data, and receiving it
back
--randreadbench Benchmark reading random, incompressible data.
--randwritebench Benchmark writing random, incompressible data.
@@ -100,7 +100,7 @@ Example:
Connect to port 42000 and run all the benchmarks:
$0 --port 42000 -a
-
+
HELP
exit(0);
}
@@ -111,7 +111,7 @@ if (!$opt_port) {
}
-my $socket = IO::Socket::INET->new(PeerAddr => $opt_host, PeerPort => $opt_port, Proto => 'tcp');
+my $socket = IO::Socket::INET->new(PeerAddr => $opt_host, PeerPort => $opt_port, Proto => 'tcp');
if (!$socket) {
die "Can't connect to $opt_host:$opt_port: $!";
}
@@ -142,7 +142,7 @@ if ( $cmd_pingbench ) {
for(my $i=0;$i<$opt_count;$i++) {
send_cmd("echo $i");
read_until_prompt();
-
+
my $elapsed = tv_interval($t0, [gettimeofday()]);
if ( $opt_dump ) {
print "$elapsed\t$i\n";
@@ -413,4 +413,3 @@ sub show_last {
undef $self->{prev_time};
$self->set( $self->{last_str} ) if ( $self->{last_str} );
}
-