diff options
Diffstat (limited to 'dcop/KDE-ICE')
-rw-r--r-- | dcop/KDE-ICE/ICE-def.cpp | 2 | ||||
-rw-r--r-- | dcop/KDE-ICE/ICEmsg.h | 6 | ||||
-rw-r--r-- | dcop/KDE-ICE/ICEutil.h | 2 | ||||
-rw-r--r-- | dcop/KDE-ICE/Xtrans.c | 8 | ||||
-rw-r--r-- | dcop/KDE-ICE/Xtranssock.c | 20 | ||||
-rw-r--r-- | dcop/KDE-ICE/authutil.c | 26 | ||||
-rw-r--r-- | dcop/KDE-ICE/iceauth.c | 4 | ||||
-rw-r--r-- | dcop/KDE-ICE/listen.c | 4 | ||||
-rw-r--r-- | dcop/KDE-ICE/listenwk.c | 4 | ||||
-rw-r--r-- | dcop/KDE-ICE/locking.c | 2 | ||||
-rw-r--r-- | dcop/KDE-ICE/ping.c | 2 | ||||
-rw-r--r-- | dcop/KDE-ICE/watch.c | 2 |
12 files changed, 41 insertions, 41 deletions
diff --git a/dcop/KDE-ICE/ICE-def.cpp b/dcop/KDE-ICE/ICE-def.cpp index 0bf780f59..df1d9ea58 100644 --- a/dcop/KDE-ICE/ICE-def.cpp +++ b/dcop/KDE-ICE/ICE-def.cpp @@ -11,7 +11,7 @@ EXPORTS IceCloseConnection IceComposeNetworkIdList IceConnectionNumber - IceConnectiontqStatus + IceConnectionStatus IceConnectionString IceFlush IceFreeAuthFileEntry diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h index db76c8252..cf4d98975 100644 --- a/dcop/KDE-ICE/ICEmsg.h +++ b/dcop/KDE-ICE/ICEmsg.h @@ -39,7 +39,7 @@ Author: Ralph Mor, X Consortium #define _IceRead _kde_IceRead -extern tqStatus _IceRead ( +extern Status _IceRead ( #if NeedFunctionPrototypes IceConn /* iceConn */, unsigned long /* nbytes */, @@ -221,7 +221,7 @@ extern void _IceErrorBadValue ( /* - * Write pad bytes. Used to force 32 or 64 bit tqalignment. + * Write pad bytes. Used to force 32 or 64 bit alignment. * A maxium of 7 pad bytes can be specified. */ @@ -306,7 +306,7 @@ extern void _IceErrorBadValue ( /* - * Read pad bytes (for 32 or 64 bit tqalignment). + * Read pad bytes (for 32 or 64 bit alignment). * A maxium of 7 pad bytes can be specified. */ diff --git a/dcop/KDE-ICE/ICEutil.h b/dcop/KDE-ICE/ICEutil.h index 84ebc158d..dd32fe620 100644 --- a/dcop/KDE-ICE/ICEutil.h +++ b/dcop/KDE-ICE/ICEutil.h @@ -119,7 +119,7 @@ extern void IceFreeAuthFileEntry ( #define IceWriteAuthFileEntry KDE_IceWriteAuthFileEntry -extern tqStatus KDE_IceWriteAuthFileEntry ( +extern Status KDE_IceWriteAuthFileEntry ( #if NeedFunctionPrototypes FILE * /* auth_file */, IceAuthFileEntry * /* auth */ diff --git a/dcop/KDE-ICE/Xtrans.c b/dcop/KDE-ICE/Xtrans.c index 1f072d8cd..371752919 100644 --- a/dcop/KDE-ICE/Xtrans.c +++ b/dcop/KDE-ICE/Xtrans.c @@ -54,7 +54,7 @@ extern char *strchr(const char *, int); #endif /* - * The transport table tqcontains a definition for every transport (protocol) + * The transport table contains a definition for every transport (protocol) * family. All operations that can be made on the transport go through this * table. * @@ -405,7 +405,7 @@ TRANS(Open) (int type, char *address) if ((thistrans = TRANS(SelectTransport) (protocol)) == NULL) { - PRMSG (1,"Open: Unable to tqfind transport for %s\n", + PRMSG (1,"Open: Unable to find transport for %s\n", protocol, 0, 0); xfree (protocol); @@ -495,7 +495,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port) if (thistrans == NULL) { - PRMSG (1,"Reopen: Unable to tqfind transport id %d\n", + PRMSG (1,"Reopen: Unable to find transport id %d\n", trans_id, 0, 0); return NULL; @@ -750,7 +750,7 @@ TRANS(NoListen) (char * protocol) if ((trans = TRANS(SelectTransport)(protocol)) == NULL) { - PRMSG (1,"TRANS(TransNoListen): unable to tqfind transport: %s\n", + PRMSG (1,"TRANS(TransNoListen): unable to find transport: %s\n", protocol, 0, 0); return -1; diff --git a/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c index 812eb7b9d..7b14ca9ab 100644 --- a/dcop/KDE-ICE/Xtranssock.c +++ b/dcop/KDE-ICE/Xtranssock.c @@ -176,7 +176,7 @@ static int IBMsockInit = 0; /* * This is the Socket implementation of the X Transport service layer * - * This file tqcontains the implementation for both the UNIX and INET domains, + * This file contains the implementation for both the UNIX and INET domains, * and can be built for either one, or both. * */ @@ -910,7 +910,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port) { struct sockaddr_un sockname; int namelen; - int oldUtqmask; + int oldUmask; int status; unsigned int mode; @@ -919,7 +919,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port) /* Make sure the directory is created */ - oldUtqmask = umask (0); + oldUmask = umask (0); #ifdef UNIX_DIR #ifdef HAS_STICKY_DIR_BIT @@ -930,7 +930,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port) if (trans_mkdir((char*)UNIX_DIR, mode) == -1) { PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n", UNIX_DIR, errno, 0); - (void) umask (oldUtqmask); + (void) umask (oldUmask); return TRANS_CREATE_LISTENER_FAILED; } #endif @@ -952,7 +952,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port) #endif unlink (sockname.sun_path); - (void) umask (oldUtqmask); + (void) umask (oldUmask); if ((status = TRANS(SocketCreateListener) (ciptr, (struct sockaddr *) &sockname, namelen)) < 0) @@ -1011,7 +1011,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) S_IFSOCK)) #endif { - int oldUtqmask = umask (0); + int oldUmask = umask (0); #ifdef UNIX_DIR #ifdef HAS_STICKY_DIR_BIT @@ -1022,7 +1022,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) if (trans_mkdir((char*)UNIX_DIR, mode) == -1) { PRMSG (1, "SocketUNIXResetListener: mkdir(%s) failed, errno = %d\n", UNIX_DIR, errno, 0); - (void) umask (oldUtqmask); + (void) umask (oldUmask); return TRANS_RESET_FAILURE; } #endif @@ -1033,7 +1033,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) if ((ciptr->fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) { TRANS(FreeConnInfo) (ciptr); - (void) umask (oldUtqmask); + (void) umask (oldUmask); return TRANS_RESET_FAILURE; } @@ -1048,11 +1048,11 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) { close (ciptr->fd); TRANS(FreeConnInfo) (ciptr); - (void) umask (oldUtqmask); + (void) umask (oldUmask); return TRANS_RESET_FAILURE; } - umask (oldUtqmask); + umask (oldUmask); status = TRANS_RESET_NEW_FD; } diff --git a/dcop/KDE-ICE/authutil.c b/dcop/KDE-ICE/authutil.c index 38fc68cff..41a2eefaa 100644 --- a/dcop/KDE-ICE/authutil.c +++ b/dcop/KDE-ICE/authutil.c @@ -62,12 +62,12 @@ extern unsigned sleep (); #endif #endif -static tqStatus read_short (FILE *file, unsigned short *shortp); -static tqStatus read_string (FILE *file, char **stringp); -static tqStatus read_counted_string (FILE *file, unsigned short *countp, char **stringp); -static tqStatus write_short (FILE *file, unsigned short s); -static tqStatus write_string (FILE *file, char *string); -static tqStatus write_counted_string (FILE *file, unsigned short count, char *string); +static Status read_short (FILE *file, unsigned short *shortp); +static Status read_string (FILE *file, char **stringp); +static Status read_counted_string (FILE *file, unsigned short *countp, char **stringp); +static Status write_short (FILE *file, unsigned short s); +static Status write_string (FILE *file, char *string); +static Status write_counted_string (FILE *file, unsigned short count, char *string); @@ -322,7 +322,7 @@ IceAuthFileEntry *auth; -tqStatus +Status IceWriteAuthFileEntry (auth_file, auth) FILE *auth_file; @@ -398,7 +398,7 @@ const char *auth_name; * local routines */ -static tqStatus +static Status read_short (FILE *file, unsigned short *shortp) { unsigned char file_short[2]; @@ -411,7 +411,7 @@ read_short (FILE *file, unsigned short *shortp) } -static tqStatus +static Status read_string (FILE *file, char **stringp) { unsigned short len; @@ -447,7 +447,7 @@ read_string (FILE *file, char **stringp) } -static tqStatus +static Status read_counted_string (FILE *file, unsigned short *countp, char **stringp) { unsigned short len; @@ -481,7 +481,7 @@ read_counted_string (FILE *file, unsigned short *countp, char **stringp) } -static tqStatus +static Status write_short (FILE *file, unsigned short s) { unsigned char file_short[2]; @@ -496,7 +496,7 @@ write_short (FILE *file, unsigned short s) } -static tqStatus +static Status write_string (FILE *file, char *string) { unsigned short count = strlen (string); @@ -511,7 +511,7 @@ write_string (FILE *file, char *string) } -static tqStatus +static Status write_counted_string (FILE *file, unsigned short count, char *string) { if (!write_short (file, count)) diff --git a/dcop/KDE-ICE/iceauth.c b/dcop/KDE-ICE/iceauth.c index f8bb87785..72297ceb5 100644 --- a/dcop/KDE-ICE/iceauth.c +++ b/dcop/KDE-ICE/iceauth.c @@ -135,7 +135,7 @@ char **errorStringRet; if (!data) { const char *tempstr = - "Could not tqfind correct MIT-MAGIC-COOKIE-1 authentication"; + "Could not find correct MIT-MAGIC-COOKIE-1 authentication"; *errorStringRet = (char *) malloc (strlen (tempstr) + 1); if (*errorStringRet) @@ -243,7 +243,7 @@ char **errorStringRet; /* * We should never get here because in the ConnectionReply * we should have passed all the valid methods. So we should - * always tqfind a valid entry. + * always find a valid entry. */ const char *tempstr = diff --git a/dcop/KDE-ICE/listen.c b/dcop/KDE-ICE/listen.c index 0547a6243..03b715c27 100644 --- a/dcop/KDE-ICE/listen.c +++ b/dcop/KDE-ICE/listen.c @@ -36,7 +36,7 @@ Author: Ralph Mor, X Consortium #include <string.h> -tqStatus +Status IceListenForConnections (countRet, listenObjsRet, errorLength, errorStringRet) int *countRet; @@ -50,7 +50,7 @@ char *errorStringRet; int transCount, partial, i, j; int result = -1; int count = 0; - tqStatus status = 1; + Status status = 1; XtransConnInfo *transConns = NULL; while ((result < 0) && (count < 5)) diff --git a/dcop/KDE-ICE/listenwk.c b/dcop/KDE-ICE/listenwk.c index 21d47a66a..80ff1dbae 100644 --- a/dcop/KDE-ICE/listenwk.c +++ b/dcop/KDE-ICE/listenwk.c @@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group. #include <string.h> -tqStatus +Status IceListenForWellKnownConnections (port, countRet, listenObjsRet, errorLength, errorStringRet) char *port; @@ -46,7 +46,7 @@ char *errorStringRet; struct _IceListenObj *listenObjs; char *networkId; int transCount, partial, i, j; - tqStatus status = 1; + Status status = 1; XtransConnInfo *transConns = NULL; diff --git a/dcop/KDE-ICE/locking.c b/dcop/KDE-ICE/locking.c index 0454704cf..0acce8368 100644 --- a/dcop/KDE-ICE/locking.c +++ b/dcop/KDE-ICE/locking.c @@ -32,7 +32,7 @@ Author: Ralph Mor, X Consortium */ -tqStatus +Status IceInitThreads () { diff --git a/dcop/KDE-ICE/ping.c b/dcop/KDE-ICE/ping.c index bfee548c8..5c0c601d6 100644 --- a/dcop/KDE-ICE/ping.c +++ b/dcop/KDE-ICE/ping.c @@ -26,7 +26,7 @@ Author: Ralph Mor, X Consortium #include <KDE-ICE/ICElib.h> #include "KDE-ICE/ICElibint.h" -tqStatus +Status IcePing (iceConn, pingReplyProc, clientData) IceConn iceConn; diff --git a/dcop/KDE-ICE/watch.c b/dcop/KDE-ICE/watch.c index 18be1ddc5..79a2b8910 100644 --- a/dcop/KDE-ICE/watch.c +++ b/dcop/KDE-ICE/watch.c @@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium #include "KDE-ICE/ICElibint.h" #include "KDE-ICE/globals.h" -tqStatus +Status IceAddConnectionWatch (watchProc, clientData) IceWatchProc watchProc; |