summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:09:18 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:09:18 -0700
commitfc0fc948d25dfa0f6f445a3b55610ea5b864dd60 (patch)
tree2dbe09b93360af112f8019d4016ee255bb6148cc
parent22601de3f38d035eb874d4bd9f649ddd2b3f0ae2 (diff)
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' git diff -w & git diff -b show no diffs from this change Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--README2
-rw-r--r--include/X11/ICE/ICEconn.h2
-rw-r--r--src/ICElibint.h2
-rw-r--r--src/authutil.c10
-rw-r--r--src/connect.c10
-rw-r--r--src/error.c10
-rw-r--r--src/getauth.c2
-rw-r--r--src/iceauth.c2
-rw-r--r--src/listen.c4
-rw-r--r--src/listenwk.c4
-rw-r--r--src/misc.c2
-rw-r--r--src/process.c44
-rw-r--r--src/protosetup.c4
-rw-r--r--src/register.c8
-rw-r--r--src/replywait.c4
-rw-r--r--src/shutdown.c2
-rw-r--r--src/watch.c2
17 files changed, 57 insertions, 57 deletions
diff --git a/README b/README
index 1ed24f2..0b6ffac 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ libICE - Inter-Client Exchange Library
Documentation for this API can be found in the doc directory of the source
code, or online at:
- http://xorg.freedesktop.org/releases/X11R7.0/doc/PDF/ICElib.pdf
+ http://xorg.freedesktop.org/releases/X11R7.0/doc/PDF/ICElib.pdf
All questions regarding this software should be directed at the
Xorg mailing list:
diff --git a/include/X11/ICE/ICEconn.h b/include/X11/ICE/ICEconn.h
index f169b6c..e5d493a 100644
--- a/include/X11/ICE/ICEconn.h
+++ b/include/X11/ICE/ICEconn.h
@@ -32,7 +32,7 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICElib.h>
/*
- * Data structures for ICE connection object
+ * Data structures for ICE connection object
*/
typedef struct _IceSavedReplyWait {
diff --git a/src/ICElibint.h b/src/ICElibint.h
index 3df59d6..c112690 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -289,7 +289,7 @@ typedef struct {
if (_pBuf > _end) { \
_bail; \
} \
-}
+}
#define SKIP_LISTOF_STRING(_pBuf, _swap, _count, _end, _bail) \
{ \
diff --git a/src/authutil.c b/src/authutil.c
index fd0a77d..747cacc 100644
--- a/src/authutil.c
+++ b/src/authutil.c
@@ -171,7 +171,7 @@ IceLockAuthFile (
unlink (link_name);
}
}
-
+
while (retries > 0)
{
if (creat_fd == -1)
@@ -406,18 +406,18 @@ read_string (FILE *file, char **stringp)
return (0);
data = malloc ((unsigned) len + 1);
-
+
if (!data)
return (0);
-
- if (len != 0)
+
+ if (len != 0)
{
if (fread (data, (int) sizeof (char), (int) len, file) != len)
{
free (data);
return (0);
}
-
+
}
data[len] = '\0';
diff --git a/src/connect.c b/src/connect.c
index 2542a0c..b59e94c 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -83,7 +83,7 @@ IceOpenConnection (
* connection if the specified 'context' is equal to the context
* associated with the ICE connection, or if the context associated
* with the ICE connection is NULL.
- *
+ *
* If 'majorOpcodeCheck' is non-zero, it will contain a protocol major
* opcode that we should make sure is not already active on the ICE
* connection. Some clients will want two seperate connections for the
@@ -471,7 +471,7 @@ ConnectToPeer (char *networkIdsList, char **actualConnectionRet)
{
address = malloc (len + 1);
address_size = len;
- }
+ }
while (ptr < endptr && !madeConnection)
{
@@ -513,18 +513,18 @@ ConnectToPeer (char *networkIdsList, char **actualConnectionRet)
}
}
- if (madeConnection)
+ if (madeConnection)
{
/*
* We need to return the actual network connection string
*/
*actualConnectionRet = strdup(address);
-
+
/*
* Return the file descriptor
*/
- }
+ }
else trans_conn = NULL;
if (address != addrbuf) free (address);
diff --git a/src/error.c b/src/error.c
index 0e7725a..d9419b1 100644
--- a/src/error.c
+++ b/src/error.c
@@ -116,7 +116,7 @@ _IceErrorBadValue (
if (PAD64 (length))
IceWritePad (iceConn, PAD64 (length));
-
+
IceFlush (iceConn);
}
@@ -563,12 +563,12 @@ _IceDefaultErrorHandler (
IceErrorHandler _IceErrorHandler = _IceDefaultErrorHandler;
-/*
+/*
* This procedure sets the ICE error handler to be the specified
* routine. If NULL is passed in the default error handler is restored.
* The function's return value is the previous error handler.
*/
-
+
IceErrorHandler
IceSetErrorHandler (
IceErrorHandler handler
@@ -605,13 +605,13 @@ _IceDefaultIOErrorHandler (
IceIOErrorHandler _IceIOErrorHandler = _IceDefaultIOErrorHandler;
-/*
+/*
* This procedure sets the ICE fatal I/O error handler to be the
* specified routine. If NULL is passed in the default error
* handler is restored. The function's return value is the
* previous error handler.
*/
-
+
IceIOErrorHandler
IceSetIOErrorHandler (
IceIOErrorHandler handler
diff --git a/src/getauth.c b/src/getauth.c
index aa5d72d..fdacd24 100644
--- a/src/getauth.c
+++ b/src/getauth.c
@@ -246,7 +246,7 @@ auth_valid (const char *auth_name, int num_auth_names,
{
break;
}
-
+
if (i < num_auth_names)
{
*index_ret = i;
diff --git a/src/iceauth.c b/src/iceauth.c
index 7dc46da..14370e2 100644
--- a/src/iceauth.c
+++ b/src/iceauth.c
@@ -54,7 +54,7 @@ IceGenerateMagicCookie (
int seed;
int value;
int i;
-
+
if ((auth = (char *) malloc (len + 1)) == NULL)
return (NULL);
diff --git a/src/listen.c b/src/listen.c
index 22602d4..0348fec 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -83,7 +83,7 @@ IceListenForConnections (
{
listenObjs[*countRet].trans_conn = transConns[i];
listenObjs[*countRet].network_id = networkId;
-
+
(*countRet)++;
}
}
@@ -140,7 +140,7 @@ IceListenForConnections (
{
if (errorStringRet && errorLength > 0)
*errorStringRet = '\0';
-
+
for (i = 0; i < *countRet; i++)
{
(*listenObjsRet)[i]->host_based_auth_proc = NULL;
diff --git a/src/listenwk.c b/src/listenwk.c
index 7747af6..06b56a3 100644
--- a/src/listenwk.c
+++ b/src/listenwk.c
@@ -83,7 +83,7 @@ IceListenForWellKnownConnections (
{
listenObjs[*countRet].trans_conn = transConns[i];
listenObjs[*countRet].network_id = networkId;
-
+
(*countRet)++;
}
}
@@ -140,7 +140,7 @@ IceListenForWellKnownConnections (
{
if (errorStringRet && errorLength > 0)
*errorStringRet = '\0';
-
+
for (i = 0; i < *countRet; i++)
{
(*listenObjsRet)[i]->host_based_auth_proc = NULL;
diff --git a/src/misc.c b/src/misc.c
index 890da9a..e201fda 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -246,7 +246,7 @@ _IceRead (
return (0);
}
- else
+ else
{
/*
* Fatal IO error. First notify each protocol's IceIOErrorProc
diff --git a/src/process.c b/src/process.c
index 6cde622..dbff404 100644
--- a/src/process.c
+++ b/src/process.c
@@ -304,7 +304,7 @@ IceProcessMessages (
* to use message replies unless we translate opcodes before
* comparing them.
*/
-
+
{
int op;
@@ -887,17 +887,17 @@ ProcessConnectionSetup (
pData = pStart;
pEnd = pStart + (length << 3);
-
- SKIP_STRING (pData, swap, pEnd,
+
+ SKIP_STRING (pData, swap, pEnd,
BAIL_STRING(iceConn, ICE_ConnectionSetup,
pStart)); /* vendor */
- SKIP_STRING (pData, swap, pEnd,
+ SKIP_STRING (pData, swap, pEnd,
BAIL_STRING(iceConn, ICE_ConnectionSetup,
pStart)); /* release */
- SKIP_LISTOF_STRING (pData, swap, (int) message->authCount, pEnd,
+ SKIP_LISTOF_STRING (pData, swap, (int) message->authCount, pEnd,
BAIL_STRING(iceConn, ICE_ConnectionSetup,
pStart)); /* auth names */
-
+
pData += (message->versionCount * 4); /* versions */
CHECK_COMPLETE_SIZE (iceConn, ICE_ConnectionSetup,
@@ -959,7 +959,7 @@ ProcessConnectionSetup (
{
for (i = 0; i < hisAuthCount; i++)
free (hisAuthNames[i]);
-
+
free ((char *) hisAuthNames);
}
@@ -1018,7 +1018,7 @@ ProcessConnectionSetup (
{
accept_setup_now = 1;
}
- else
+ else
{
_IceErrorAuthenticationRejected (iceConn,
ICE_ConnectionSetup, "None of the authentication protocols specified are supported and host-based authentication failed");
@@ -1078,7 +1078,7 @@ ProcessConnectionSetup (
if (errorString)
free (errorString);
}
-
+
if (accept_setup_now)
{
AcceptConnection (iceConn, hisVersionIndex);
@@ -1092,7 +1092,7 @@ ProcessConnectionSetup (
{
for (i = 0; i < hisAuthCount; i++)
free (hisAuthNames[i]);
-
+
free ((char *) hisAuthNames);
}
@@ -1266,7 +1266,7 @@ ProcessAuthRequired (
if (asprintf (&returnErrorString, "%s%s", prefix, errorString) == -1)
returnErrorString = NULL;
free (errorString);
-
+
if (iceConn->connect_to_you)
{
_IceConnectionError *errorReply =
@@ -1787,7 +1787,7 @@ ProcessConnectionReply (
_IceErrorBadValue (iceConn, 0,
ICE_ConnectionReply, 2, 1, &errIndex);
-
+
errorReply->type = ICE_CONNECTION_ERROR;
errorReply->error_message =
"Received bad version index in Connection Reply";
@@ -1878,16 +1878,16 @@ ProcessProtocolSetup (
pEnd = pStart + (length << 3);
SKIP_STRING (pData, swap, pEnd,
- BAIL_STRING(iceConn, ICE_ProtocolSetup,
+ BAIL_STRING(iceConn, ICE_ProtocolSetup,
pStart)); /* proto name */
SKIP_STRING (pData, swap, pEnd,
- BAIL_STRING(iceConn, ICE_ProtocolSetup,
+ BAIL_STRING(iceConn, ICE_ProtocolSetup,
pStart)); /* vendor */
SKIP_STRING (pData, swap, pEnd,
- BAIL_STRING(iceConn, ICE_ProtocolSetup,
+ BAIL_STRING(iceConn, ICE_ProtocolSetup,
pStart)); /* release */
SKIP_LISTOF_STRING (pData, swap, (int) message->authCount, pEnd,
- BAIL_STRING(iceConn, ICE_ProtocolSetup,
+ BAIL_STRING(iceConn, ICE_ProtocolSetup,
pStart)); /* auth names */
pData += (message->versionCount * 4); /* versions */
@@ -1997,7 +1997,7 @@ ProcessProtocolSetup (
{
for (i = 0; i < hisAuthCount; i++)
free (hisAuthNames[i]);
-
+
free ((char *) hisAuthNames);
}
@@ -2057,7 +2057,7 @@ ProcessProtocolSetup (
{
accept_setup_now = 1;
}
- else
+ else
{
_IceErrorAuthenticationRejected (iceConn,
ICE_ProtocolSetup, "None of the authentication protocols specified are supported and host-based authentication failed");
@@ -2087,7 +2087,7 @@ ProcessProtocolSetup (
_IceProtoSetupToMeInfo *setupInfo;
AuthRequired (iceConn, hisAuthIndex, authDataLen, authData);
-
+
iceConn->protosetup_to_me = setupInfo =
(_IceProtoSetupToMeInfo *) malloc (
sizeof (_IceProtoSetupToMeInfo));
@@ -2300,14 +2300,14 @@ ProcessProtocolReply (
_IceErrorBadValue (iceConn, 0,
ICE_ProtocolReply, 2, 1, &errIndex);
-
+
errorReply->type = ICE_PROTOCOL_ERROR;
errorReply->error_message =
"Received bad version index in Protocol Reply";
}
else
{
- _IceProtocolReply *reply =
+ _IceProtocolReply *reply =
&(((_IceReply *) (replyWait->reply))->protocol_reply);
reply->type = ICE_PROTOCOL_REPLY;
@@ -2362,7 +2362,7 @@ ProcessPingReply (
if (iceConn->ping_waits)
{
_IcePingWait *next = iceConn->ping_waits->next;
-
+
(*iceConn->ping_waits->ping_reply_proc) (iceConn,
iceConn->ping_waits->client_data);
diff --git a/src/protosetup.c b/src/protosetup.c
index 2aab6d9..a42b1a4 100644
--- a/src/protosetup.c
+++ b/src/protosetup.c
@@ -229,7 +229,7 @@ IceProtocolSetup (
else /* reply.type == ICE_PROTOCOL_ERROR */
{
/* Protocol Setup failed */
-
+
strncpy (errorStringRet, reply.protocol_error.error_message,
errorLength);
@@ -251,7 +251,7 @@ IceProtocolSetup (
*minorVersionRet = versionRec->minor_version;
*vendorRet = reply.protocol_reply.vendor;
*releaseRet = reply.protocol_reply.release;
-
+
/*
* Increase the reference count for the number of active protocols.
diff --git a/src/register.c b/src/register.c
index 5b67bf2..f1b76fb 100644
--- a/src/register.c
+++ b/src/register.c
@@ -56,7 +56,7 @@ IceRegisterForProtocolSetup (
/*
* We've already registered this protocol.
*/
-
+
return (i);
}
else
@@ -64,7 +64,7 @@ IceRegisterForProtocolSetup (
break;
}
}
-
+
if (i <= _IceLastMajorOpcode)
{
p = _IceProtocols[i - 1].orig_client =
@@ -156,7 +156,7 @@ IceRegisterForProtocolReply (
/*
* We've already registered this protocol.
*/
-
+
return (i);
}
else
@@ -164,7 +164,7 @@ IceRegisterForProtocolReply (
break;
}
}
-
+
if (i <= _IceLastMajorOpcode)
{
diff --git a/src/replywait.c b/src/replywait.c
index e29f019..eb3a814 100644
--- a/src/replywait.c
+++ b/src/replywait.c
@@ -58,7 +58,7 @@ _IceAddReplyWait (
prev = last;
last = last->next;
}
-
+
savedReplyWait = (_IceSavedReplyWait *) malloc (
sizeof (_IceSavedReplyWait));
@@ -148,7 +148,7 @@ _IceCheckReplyReady (
iceConn->saved_reply_waits = savedReplyWait->next;
else
prev->next = savedReplyWait->next;
-
+
free ((char *) savedReplyWait);
}
diff --git a/src/shutdown.c b/src/shutdown.c
index da80e1f..14874a0 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -145,7 +145,7 @@ IceCloseConnection (
IO free- dispatch protocol shutdown
error asap bit level refcount negotiation ACTION
occured set reached 0 reached 0
-
+
0 0 0 0 0 N
0 0 0 0 1 N
0 0 0 1 0 AB
diff --git a/src/watch.c b/src/watch.c
index b197a50..e414e19 100644
--- a/src/watch.c
+++ b/src/watch.c
@@ -71,7 +71,7 @@ IceAddConnectionWatch (
/*
* Invoke the watch proc with any previously opened ICE connections.
*/
-
+
for (i = 0; i < _IceConnectionCount; i++)
{
_IceWatchedConnection *newWatchedConn = (_IceWatchedConnection *)