summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/xsmp.xml16
-rw-r--r--include/X11/SM/SMlib.h2
-rw-r--r--src/sm_client.c6
-rw-r--r--src/sm_error.c8
-rw-r--r--src/sm_genid.c6
-rw-r--r--src/sm_process.c4
6 files changed, 21 insertions, 21 deletions
diff --git a/doc/xsmp.xml b/doc/xsmp.xml
index a087aff..b42621e 100644
--- a/doc/xsmp.xml
+++ b/doc/xsmp.xml
@@ -426,12 +426,12 @@ set of valid responses and possible error messages are listed. The
The client must send this message to the SM to register the client's
existence. If a client is being restarted from a previous session,
the <parameter>previous-ID</parameter> field must contain the client
-ID from the previous session. For new clients,
+ID from the previous session. For new clients,
<parameter>previous-ID</parameter> should be of zero length.
</para>
<para>
-If <parameter>previous-ID</parameter> is not valid,
+If <parameter>previous-ID</parameter> is not valid,
the SM will send a <errorname>BadValue</errorname>
error message to the client. At this point the SM reverts to the
register state and waits for another <function>RegisterClient</function>
@@ -447,9 +447,9 @@ null <parameter>previous-ID</parameter> field.
<para>
The <parameter>client-ID</parameter> specifies a unique identification
-for this client. If the client had specified an ID in the
-<parameter>previous-ID</parameter> field of the
-<function>RegisterClient</function> message,
+for this client. If the client had specified an ID in the
+<parameter>previous-ID</parameter> field of the
+<function>RegisterClient</function> message,
<parameter>client-ID</parameter> will be identical to the previously
specified ID. If <parameter>previous-ID</parameter> was null,
<parameter>client-ID</parameter> will be a unique ID freshly generated
@@ -779,7 +779,7 @@ and <function>Any</function> or <function>Errors</function> for the
<function>SaveComplete</function>
<function>Die</function>
<function>ShutdownCancelled</function>
-
+
</synopsis>
<para>
@@ -808,7 +808,7 @@ field of the <function>SaveYourselfDone</function> message.
Valid Responses:
<function>ShutdownCancelled</function>
<function>SaveYourselfPhase2</function>
-
+
</synopsis>
<para>
@@ -902,7 +902,7 @@ Sets the specified <parameter>properties</parameter> to the specified values.
Existing
properties not specified in the <function>Set&shy;Properties</function>
message are unaffected. Some properties have predefined semantics.
-See <link linkend='predefined_properties'>section 11,
+See <link linkend='predefined_properties'>section 11,
&ldquo;Predefined Properties.&rdquo;</link>
</para>
diff --git a/include/X11/SM/SMlib.h b/include/X11/SM/SMlib.h
index 86be664..fb1166b 100644
--- a/include/X11/SM/SMlib.h
+++ b/include/X11/SM/SMlib.h
@@ -168,7 +168,7 @@ typedef struct {
typedef Status (*SmsRegisterClientProc) (
SmsConn /* smsConn */,
SmPointer /* managerData */,
- char * /* previousId */
+ char * /* previousId */
);
typedef void (*SmsInteractRequestProc) (
diff --git a/src/sm_client.c b/src/sm_client.c
index a5c714f..70511c1 100644
--- a/src/sm_client.c
+++ b/src/sm_client.c
@@ -308,7 +308,7 @@ SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs)
pData += 4;
for (i = 0; i < count; i++)
- STORE_ARRAY8 (pData, strlen (reasonMsgs[i]), reasonMsgs[i]);
+ STORE_ARRAY8 (pData, strlen (reasonMsgs[i]), reasonMsgs[i]);
IceFlush (iceConn);
@@ -336,7 +336,7 @@ SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs)
free ((char *) ptr);
ptr = next;
}
-
+
}
free ((char *) smcConn);
@@ -408,7 +408,7 @@ SmcDeleteProperties(SmcConn smcConn, int numProps, char **propNames)
pData += 4;
for (i = 0; i < numProps; i++)
- STORE_ARRAY8 (pData, strlen (propNames[i]), propNames[i]);
+ STORE_ARRAY8 (pData, strlen (propNames[i]), propNames[i]);
IceFlush (iceConn);
}
diff --git a/src/sm_error.c b/src/sm_error.c
index 0714943..29f6e45 100644
--- a/src/sm_error.c
+++ b/src/sm_error.c
@@ -273,12 +273,12 @@ _SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode,
-/*
+/*
* This procedure sets the Smc 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.
*/
-
+
SmcErrorHandler
SmcSetErrorHandler(SmcErrorHandler handler)
{
@@ -294,12 +294,12 @@ SmcSetErrorHandler(SmcErrorHandler handler)
-/*
+/*
* This procedure sets the Sms 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.
*/
-
+
SmsErrorHandler
SmsSetErrorHandler(SmsErrorHandler handler)
{
diff --git a/src/sm_genid.c b/src/sm_genid.c
index 40afb0c..a138572 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -167,17 +167,17 @@ SmsGenerateClientID(SmsConn smsConn)
return NULL;
for (first_ai = ai; ai != NULL; ai = ai->ai_next) {
- if ( (ai->ai_family == AF_INET) || (ai->ai_family == AF_INET6) )
+ if ( (ai->ai_family == AF_INET) || (ai->ai_family == AF_INET6) )
break;
}
if (ai == NULL) {
freeaddrinfo(first_ai);
return NULL;
- }
+ }
if (ai->ai_family == AF_INET6) {
unsigned char *cp = (unsigned char *) &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr.s6_addr;
-
+
*addr_ptr++ = '6'; /* IPv6 address code */
for (i = 0 ; i < 16 ; i++) {
diff --git a/src/sm_process.c b/src/sm_process.c
index c7c7abe..b8f1b2c 100644
--- a/src/sm_process.c
+++ b/src/sm_process.c
@@ -152,7 +152,7 @@ _SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
{
smRegisterClientReplyMsg *pMsg;
char *pData, *pStart;
- _SmcRegisterClientReply *reply =
+ _SmcRegisterClientReply *reply =
(_SmcRegisterClientReply *) (replyWait->reply);
#if 0 /* No-op */
@@ -770,7 +770,7 @@ _SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
char *pData, *pStart;
SmProp **props = NULL;
int numProps;
-
+
#if 0 /* No-op */
CHECK_AT_LEAST_SIZE (iceConn, _SmsOpcode, opcode,
length, SIZEOF (smSetPropertiesMsg), IceFatalToProtocol);