summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ICElibint.h48
-rw-r--r--src/process.c20
2 files changed, 13 insertions, 55 deletions
diff --git a/src/ICElibint.h b/src/ICElibint.h
index ab979ac..d595680 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.6 2001/12/14 19:53:35 dawes Exp $ */
+/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.7 2003/11/17 22:20:05 dawes Exp $ */
#ifndef _ICELIBINT_H_
#define _ICELIBINT_H_
@@ -127,7 +127,6 @@ struct _IceListenObj {
*/
typedef void (*_IceProcessCoreMsgProc) (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* opcode */,
unsigned long /* length */,
@@ -135,7 +134,6 @@ typedef void (*_IceProcessCoreMsgProc) (
IceReplyWaitInfo * /* replyWait */,
Bool * /* replyReadyRet */,
Bool * /* connectionClosedRet */
-#endif
);
typedef struct {
@@ -411,173 +409,129 @@ extern IceIOErrorHandler _IceIOErrorHandler;
extern void _IceErrorBadMajor (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMajor */,
int /* offendingMinor */,
int /* severity */
-#endif
);
extern void _IceErrorNoAuthentication (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */
-#endif
);
extern void _IceErrorNoVersion (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */
-#endif
);
extern void _IceErrorSetupFailed (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */,
char * /* reason */
-#endif
);
extern void _IceErrorAuthenticationRejected (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */,
char * /* reason */
-#endif
);
extern void _IceErrorAuthenticationFailed (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* offendingMinor */,
char * /* reason */
-#endif
);
extern void _IceErrorProtocolDuplicate (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
char * /* protocolName */
-#endif
);
extern void _IceErrorMajorOpcodeDuplicate (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */
-#endif
);
extern void _IceErrorUnknownProtocol (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
char * /* protocolName */
-#endif
);
extern void _IceAddOpcodeMapping (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* hisOpcode */,
int /* myOpcode */
-#endif
);
extern char *_IceGetPeerName (
-#if NeedFunctionPrototypes
IceConn /* iceConn */
-#endif
);
extern void _IceFreeConnection (
-#if NeedFunctionPrototypes
IceConn /* iceConn */
-#endif
);
extern void _IceAddReplyWait (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */
-#endif
);
extern IceReplyWaitInfo *_IceSearchReplyWaits (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
int /* majorOpcode */
-#endif
);
extern void _IceSetReplyReady (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */
-#endif
);
extern Bool _IceCheckReplyReady (
-#if NeedFunctionPrototypes
IceConn /* iceConn */,
IceReplyWaitInfo * /* replyWait */
-#endif
);
extern void _IceConnectionOpened (
-#if NeedFunctionPrototypes
IceConn /* iceConn */
-#endif
);
extern void _IceConnectionClosed (
-#if NeedFunctionPrototypes
IceConn /* iceConn */
-#endif
);
extern void _IceGetPoAuthData (
-#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
char * /* auth_name */,
unsigned short * /* auth_data_length_ret */,
char ** /* auth_data_ret */
-#endif
);
extern void _IceGetPaAuthData (
-#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
char * /* auth_name */,
unsigned short * /* auth_data_length_ret */,
char ** /* auth_data_ret */
-#endif
);
extern void _IceGetPoValidAuthIndices (
-#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
int /* num_auth_names */,
char ** /* auth_names */,
int * /* num_indices_ret */,
int * /* indices_ret */
-#endif
);
extern void _IceGetPaValidAuthIndices (
-#if NeedFunctionPrototypes
char * /* protocol_name */,
char * /* address */,
int /* num_auth_names */,
char ** /* auth_names */,
int * /* num_indices_ret */,
int * /* indices_ret */
-#endif
);
#endif /* _ICELIBINT_H_ */
diff --git a/src/process.c b/src/process.c
index 0136f41..d733017 100644
--- a/src/process.c
+++ b/src/process.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/process.c,v 3.8 2001/12/14 19:53:36 dawes Exp $ */
+/* $XFree86: xc/lib/ICE/process.c,v 3.10 2003/10/23 21:31:49 tsi Exp $ */
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
@@ -37,11 +37,11 @@ Author: Ralph Mor, X Consortium
* Check for bad length
*/
-#define CHECK_SIZE_MATCH(_iceConn, _opcode, _expected_len, _actual_len, _severity) \
+#define CHECK_SIZE_MATCH(_iceConn, _opcode, _expected_len, _actual_len, _severity, _return) \
if ((((_actual_len) - SIZEOF (iceMsg)) >> 3) != _expected_len) \
{ \
_IceErrorBadLength (_iceConn, 0, _opcode, _severity); \
- return (0); \
+ return (_return); \
}
#define CHECK_AT_LEAST_SIZE(_iceConn, _opcode, _expected_len, _actual_len, _severity) \
@@ -187,7 +187,7 @@ Bool *replyReadyRet;
CHECK_SIZE_MATCH (iceConn, ICE_ByteOrder,
header->length, SIZEOF (iceByteOrderMsg),
- IceFatalToConnection);
+ IceFatalToConnection, IceProcessMessagesIOError);
if (byteOrder != IceMSBfirst && byteOrder != IceLSBfirst)
{
@@ -1697,8 +1697,10 @@ IceReplyWaitInfo *replyWait;
char *pData, *pStart, *pEnd;
Bool replyReady;
+#if 0 /* No-op */
CHECK_AT_LEAST_SIZE (iceConn, ICE_ConnectionReply,
length, SIZEOF (iceConnectionReplyMsg), IceFatalToConnection);
+#endif
IceReadCompleteMessage (iceConn, SIZEOF (iceConnectionReplyMsg),
iceConnectionReplyMsg, message, pStart);
@@ -2196,8 +2198,10 @@ IceReplyWaitInfo *replyWait;
char *pData, *pStart, *pEnd;
Bool replyReady;
+#if 0 /* No-op */
CHECK_AT_LEAST_SIZE (iceConn, ICE_ProtocolReply,
length, SIZEOF (iceProtocolReplyMsg), IceFatalToProtocol);
+#endif
IceReadCompleteMessage (iceConn, SIZEOF (iceProtocolReplyMsg),
iceProtocolReplyMsg, message, pStart);
@@ -2304,7 +2308,7 @@ unsigned long length;
{
CHECK_SIZE_MATCH (iceConn, ICE_Ping,
- length, SIZEOF (icePingMsg), IceFatalToConnection);
+ length, SIZEOF (icePingMsg), IceFatalToConnection, 0);
PingReply (iceConn);
@@ -2321,7 +2325,7 @@ unsigned long length;
{
CHECK_SIZE_MATCH (iceConn, ICE_PingReply,
- length, SIZEOF (icePingReplyMsg), IceFatalToConnection);
+ length, SIZEOF (icePingReplyMsg), IceFatalToConnection, 0);
if (iceConn->ping_waits)
{
@@ -2354,7 +2358,7 @@ Bool *connectionClosedRet;
*connectionClosedRet = False;
CHECK_SIZE_MATCH (iceConn, ICE_WantToClose,
- length, SIZEOF (iceWantToCloseMsg), IceFatalToConnection);
+ length, SIZEOF (iceWantToCloseMsg), IceFatalToConnection, 0);
if (iceConn->want_to_close || iceConn->open_ref_count == 0)
{
@@ -2411,7 +2415,7 @@ unsigned long length;
{
CHECK_SIZE_MATCH (iceConn, ICE_NoClose,
- length, SIZEOF (iceNoCloseMsg), IceFatalToConnection);
+ length, SIZEOF (iceNoCloseMsg), IceFatalToConnection, 0);
if (iceConn->want_to_close)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:26:55 +0000