aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-04-27 14:23:39 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-04-27 14:23:39 +0200
commit9b94209f53782ecaf7084722ce90836573ceb86b (patch)
tree42354553aeeb29d9490a3120f0c5cd687cbad370 /nxcomp
parent91d9218c0cc659f40918af6ac6c035c6c48d2c6d (diff)
parent16f6803f1597788b3bebcfa15e8900d8420b54a4 (diff)
downloadnx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.gz
nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.bz2
nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.zip
Merge branch 'uli42-pr/various9' into 3.6.x
Attributes GH PR #1029: https://github.com/ArcticaProject/nx-libs/pull/1029
Diffstat (limited to 'nxcomp')
-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
108 files changed, 464 insertions, 464 deletions
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();