| ICElib.h | ICElib.h | |||
|---|---|---|---|---|
| skipping to change at line 207 | skipping to change at line 207 | |||
| IceConn /* iceConn */ | IceConn /* iceConn */ | |||
| ); | ); | |||
| /* | /* | |||
| * Function prototypes | * Function prototypes | |||
| */ | */ | |||
| _XFUNCPROTOBEGIN | _XFUNCPROTOBEGIN | |||
| extern int IceRegisterForProtocolSetup ( | extern int IceRegisterForProtocolSetup ( | |||
| char * /* protocolName */, | const char * /* protocolName */, | |||
| char * /* vendor */, | const char * /* vendor */, | |||
| char * /* release */, | const char * /* release */, | |||
| int /* versionCount */, | int /* versionCount */, | |||
| IcePoVersionRec * /* versionRecs */, | IcePoVersionRec * /* versionRecs */, | |||
| int /* authCount */, | int /* authCount */, | |||
| const char ** /* authNames */, | const char ** /* authNames */, | |||
| IcePoAuthProc * /* authProcs */, | IcePoAuthProc * /* authProcs */, | |||
| IceIOErrorProc /* IOErrorProc */ | IceIOErrorProc /* IOErrorProc */ | |||
| ); | ); | |||
| extern int IceRegisterForProtocolReply ( | extern int IceRegisterForProtocolReply ( | |||
| char * /* protocolName */, | const char * /* protocolName */, | |||
| char * /* vendor */, | const char * /* vendor */, | |||
| char * /* release */, | const char * /* release */, | |||
| int /* versionCount */, | int /* versionCount */, | |||
| IcePaVersionRec * /* versionRecs */, | IcePaVersionRec * /* versionRecs */, | |||
| int /* authCount */, | int /* authCount */, | |||
| const char ** /* authNames */, | const char ** /* authNames */, | |||
| IcePaAuthProc * /* authProcs */, | IcePaAuthProc * /* authProcs */, | |||
| IceHostBasedAuthProc /* hostBasedAuthProc */, | IceHostBasedAuthProc /* hostBasedAuthProc */, | |||
| IceProtocolSetupProc /* protocolSetupProc */, | IceProtocolSetupProc /* protocolSetupProc */, | |||
| IceProtocolActivateProc /* protocolActivateProc */, | IceProtocolActivateProc /* protocolActivateProc */, | |||
| IceIOErrorProc /* IOErrorProc */ | IceIOErrorProc /* IOErrorProc */ | |||
| ); | ); | |||
| End of changes. 2 change blocks. | ||||
| 6 lines changed or deleted | 6 lines changed or added | |||
| ICEmsg.h | ICEmsg.h | |||
|---|---|---|---|---|
| skipping to change at line 213 | skipping to change at line 213 | |||
| #define IceSendData(_iceConn, _bytes, _data) \ | #define IceSendData(_iceConn, _bytes, _data) \ | |||
| { \ | { \ | |||
| if (_iceConn->outbufptr > _iceConn->outbuf) \ | if (_iceConn->outbufptr > _iceConn->outbuf) \ | |||
| IceFlush (_iceConn); \ | IceFlush (_iceConn); \ | |||
| _IceWrite (_iceConn, (unsigned long) (_bytes), _data); \ | _IceWrite (_iceConn, (unsigned long) (_bytes), _data); \ | |||
| } | } | |||
| /* | /* | |||
| * Write pad bytes. Used to force 32 or 64 bit alignment. | * Write pad bytes. Used to force 32 or 64 bit alignment. | |||
| * A maxium of 7 pad bytes can be specified. | * A maximum of 7 pad bytes can be specified. | |||
| */ | */ | |||
| #define IceWritePad(_iceConn, _bytes) \ | #define IceWritePad(_iceConn, _bytes) \ | |||
| { \ | { \ | |||
| if ((_iceConn->outbufptr + (_bytes)) > _iceConn->outbufmax) \ | if ((_iceConn->outbufptr + (_bytes)) > _iceConn->outbufmax) \ | |||
| { \ | { \ | |||
| char _dummy[7]; \ | char _dummy[7] = { 0 }; \ | |||
| IceFlush (_iceConn); \ | IceFlush (_iceConn); \ | |||
| _IceWrite (_iceConn, (unsigned long) (_bytes), _dummy); \ | _IceWrite (_iceConn, (unsigned long) (_bytes), _dummy); \ | |||
| } \ | } \ | |||
| else \ | else \ | |||
| { \ | { \ | |||
| _iceConn->outbufptr += (_bytes); \ | _iceConn->outbufptr += (_bytes); \ | |||
| } \ | } \ | |||
| } | } | |||
| /* | /* | |||
| * Macros for reading messages. | * Macros for reading messages. | |||
| End of changes. 2 change blocks. | ||||
| 3 lines changed or deleted | 3 lines changed or added | |||
| ICEutil.h | ICEutil.h | |||
|---|---|---|---|---|
| skipping to change at line 104 | skipping to change at line 104 | |||
| extern void IceFreeAuthFileEntry ( | extern void IceFreeAuthFileEntry ( | |||
| IceAuthFileEntry * /* auth */ | IceAuthFileEntry * /* auth */ | |||
| ); | ); | |||
| extern Status IceWriteAuthFileEntry ( | extern Status IceWriteAuthFileEntry ( | |||
| FILE * /* auth_file */, | FILE * /* auth_file */, | |||
| IceAuthFileEntry * /* auth */ | IceAuthFileEntry * /* auth */ | |||
| ); | ); | |||
| extern IceAuthFileEntry *IceGetAuthFileEntry ( | extern IceAuthFileEntry *IceGetAuthFileEntry ( | |||
| char * /* protocol_name */, | const char * /* protocol_name */, | |||
| char * /* network_id */, | const char * /* network_id */, | |||
| char * /* auth_name */ | const char * /* auth_name */ | |||
| ); | ); | |||
| extern char *IceGenerateMagicCookie ( | extern char *IceGenerateMagicCookie ( | |||
| int /* len */ | int /* len */ | |||
| ); | ); | |||
| extern void IceSetPaAuthData ( | extern void IceSetPaAuthData ( | |||
| int /* numEntries */, | int /* numEntries */, | |||
| IceAuthDataEntry * /* entries */ | IceAuthDataEntry * /* entries */ | |||
| ); | ); | |||
| End of changes. 1 change blocks. | ||||
| 3 lines changed or deleted | 3 lines changed or added | |||