aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/src
diff options
context:
space:
mode:
Diffstat (limited to 'nxcomp/src')
-rw-r--r--nxcomp/src/Agent.h2
-rw-r--r--nxcomp/src/Children.cpp2
-rw-r--r--nxcomp/src/ClientChannel.cpp4
-rw-r--r--nxcomp/src/Control.cpp2
-rw-r--r--nxcomp/src/DecodeBuffer.cpp2
-rw-r--r--nxcomp/src/GenericReadBuffer.cpp2
-rw-r--r--nxcomp/src/Keeper.cpp2
-rw-r--r--nxcomp/src/Loop.cpp8
-rw-r--r--nxcomp/src/MD5.c2
-rw-r--r--nxcomp/src/Proxy.h2
-rw-r--r--nxcomp/src/PutPackedImage.h2
-rw-r--r--nxcomp/src/Statistics.cpp6
12 files changed, 18 insertions, 18 deletions
diff --git a/nxcomp/src/Agent.h b/nxcomp/src/Agent.h
index 3e1a50ae5..a7c8b63bb 100644
--- a/nxcomp/src/Agent.h
+++ b/nxcomp/src/Agent.h
@@ -50,7 +50,7 @@ class Agent
//
// Must be created by passing the fake descriptor that
// will be used for simulating socket communication
- // betwen the agent and the proxy. I/O will take place
+ // between the agent and the proxy. I/O will take place
// by copying data to the agent's read and write buf-
// fers.
//
diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
index e586292da..2431e5329 100644
--- a/nxcomp/src/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -893,7 +893,7 @@ int NXTransKeeper(int caches, int images, const char *root)
}
//
- // Take care of the persisten image cache.
+ // Take care of the persistent image cache.
// Run a number of iterations and then exit,
// so we can keep the memory consumption
// low. The parent will check our exit code
diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp
index 1c6354897..f67ee0a34 100644
--- a/nxcomp/src/ClientChannel.cpp
+++ b/nxcomp/src/ClientChannel.cpp
@@ -3850,7 +3850,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
//
// Use differential compression at startup and plain
// data compression later. Check X_ListFonts message
- // for an explaination.
+ // for an explanation.
//
MessageStore *messageStore = serverStore_ ->
@@ -5974,7 +5974,7 @@ int ClientChannel::handleRestart(T_sequence_mode mode, int resource)
// integer number (0-255) referred to as the 'resource' field.
//
// Before the proxy will be able to report the status of the
- // split, the agent will have to close the sequence by issueing
+ // split, the agent will have to close the sequence by issuing
// an end-split. The proxy will then report the result of the
// operation, so that the agent will have the option of suspend-
// ing the client or marking the drawable as dirty and take
diff --git a/nxcomp/src/Control.cpp b/nxcomp/src/Control.cpp
index 75fd56e3f..d894e652a 100644
--- a/nxcomp/src/Control.cpp
+++ b/nxcomp/src/Control.cpp
@@ -131,7 +131,7 @@
#define SHMEM_TIMEOUT 200
//
// Before closing down the proxy, wait for the
-// given amount of miliseconds to let all the
+// given amount of milliseconds to let all the
// running applications to close down their
// connections.
//
diff --git a/nxcomp/src/DecodeBuffer.cpp b/nxcomp/src/DecodeBuffer.cpp
index 4c1530d9b..09ed67347 100644
--- a/nxcomp/src/DecodeBuffer.cpp
+++ b/nxcomp/src/DecodeBuffer.cpp
@@ -476,7 +476,7 @@ const unsigned char *DecodeBuffer::decodeMemory(unsigned int numBytes)
//
// Force ourselves to a byte boundary.
// Is up to application to ensure data
- // is word alligned when needed.
+ // is word aligned when needed.
//
if (srcMask_ != 0x80)
diff --git a/nxcomp/src/GenericReadBuffer.cpp b/nxcomp/src/GenericReadBuffer.cpp
index 78217157e..dd8bfd83c 100644
--- a/nxcomp/src/GenericReadBuffer.cpp
+++ b/nxcomp/src/GenericReadBuffer.cpp
@@ -52,7 +52,7 @@ int GenericReadBuffer::locateMessage(const unsigned char *start,
unsigned int &trailerLength)
{
//
- // We don't care about the endianess
+ // We don't care about the endianness
// in generic channels.
//
diff --git a/nxcomp/src/Keeper.cpp b/nxcomp/src/Keeper.cpp
index 4babbe8a6..d945e6ab5 100644
--- a/nxcomp/src/Keeper.cpp
+++ b/nxcomp/src/Keeper.cpp
@@ -100,7 +100,7 @@ File::File()
//
// TODO: This class can leak industrial amounts of memory.
-// I'm 100% sure that the desctructor is called and that
+// I'm 100% sure that the destructor is called and that
// also the string pointed in the File structure is dele-
// ted. Everything is logged, but still the memory is not
// freed. This is less a problem on Windows, where the me-
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index f22053cc6..ddffcd1ca 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -751,7 +751,7 @@ static char sessionDir[DEFAULT_STRING_LENGTH] = { 0 };
//
// Log files for errors and statistics. Error log is
-// the place where we print also debug informations.
+// the place where we print also debug information.
// Both files are closed, deleted and reopened as
// their size exceed the limit set in control class.
// The session log is not reopened, as it is used by
@@ -3100,7 +3100,7 @@ int InitBeforeNegotiation()
SetDescriptors();
//
- // Set local endianess.
+ // Set local endianness.
//
unsigned int test = 1;
@@ -5664,7 +5664,7 @@ void HandleSignal(int signal)
// if (agentFD[1] != -1)
// {
// cerr << "Info" << ": Received signal 'SIGPIPE'. "
- // << "Closing agent conection.\n";
+ // << "Closing agent connection.\n";
//
// shutdown(agentFD[1], SHUT_RDWR);
// }
@@ -6636,7 +6636,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
// Show an alert after 20 seconds and use the
// same timeout to interrupt the connect. The
// retry timeout is incremental, starting from
- // 100 miliseconds up to 1 second.
+ // 100 milliseconds up to 1 second.
//
int alertTimeout = 20000;
diff --git a/nxcomp/src/MD5.c b/nxcomp/src/MD5.c
index 7255ca5c0..43a2793e3 100644
--- a/nxcomp/src/MD5.c
+++ b/nxcomp/src/MD5.c
@@ -60,7 +60,7 @@
#include <string.h>
/*
- * Try to determine the CPU endianess
+ * Try to determine the CPU endianness
* at compile time.
*/
diff --git a/nxcomp/src/Proxy.h b/nxcomp/src/Proxy.h
index ea60c827a..2c4353f0e 100644
--- a/nxcomp/src/Proxy.h
+++ b/nxcomp/src/Proxy.h
@@ -184,7 +184,7 @@ class Proxy
static const int TOKEN_TYPES = 3;
//
- // Lenght of buffer we use to add our
+ // Length of buffer we use to add our
// control messages plus the length of
// the data frame.
//
diff --git a/nxcomp/src/PutPackedImage.h b/nxcomp/src/PutPackedImage.h
index d28ad39eb..9e3559625 100644
--- a/nxcomp/src/PutPackedImage.h
+++ b/nxcomp/src/PutPackedImage.h
@@ -47,7 +47,7 @@
#define PUTPACKEDIMAGE_ENABLE_COMPRESS 0
//
-// We can't exceed lenght of 262144 bytes.
+// We can't exceed a length of 262144 bytes.
//
#define PUTPACKEDIMAGE_DATA_LIMIT 262144 - 40
diff --git a/nxcomp/src/Statistics.cpp b/nxcomp/src/Statistics.cpp
index 68673ffc1..c6f665849 100644
--- a/nxcomp/src/Statistics.cpp
+++ b/nxcomp/src/Statistics.cpp
@@ -348,9 +348,9 @@ void Statistics::addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut)
// receives the data from the upper layers. The reason
// is that data can be compressed by the stream com-
// pressor, so we can become aware of the new bitrate
-// only afer having flushed the ZLIB stream. This also
-// means that, to have a reliable estimate, we need to
-// flush the link often.
+// only after having flushed the ZLIB stream. This also
+// means that, to have a reliable estimatation, we need
+// to flush the link often.
//
void Statistics::updateBitrate(int bytes)