diff options
Diffstat (limited to 'dcop/KDE-ICE/Xtrans.c')
-rw-r--r-- | dcop/KDE-ICE/Xtrans.c | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/dcop/KDE-ICE/Xtrans.c b/dcop/KDE-ICE/Xtrans.c index 371752919..b954d4b3b 100644 --- a/dcop/KDE-ICE/Xtrans.c +++ b/dcop/KDE-ICE/Xtrans.c @@ -144,7 +144,7 @@ void TRANS(FreeConnInfo) (XtransConnInfo ciptr) { - PRMSG (3,"FreeConnInfo(%x)\n", ciptr, 0, 0); + PRMSG (3,"[Xtrans] FreeConnInfo(%x)\n", ciptr, 0, 0); if (ciptr->addr) xfree (ciptr->addr); @@ -168,7 +168,7 @@ TRANS(SelectTransport) (char *protocol) char protobuf[PROTOBUFSIZE]; int i; - PRMSG (3,"SelectTransport(%s)\n", protocol, 0, 0); + PRMSG (3,"[Xtrans] SelectTransport(%s)\n", protocol, 0, 0); /* * Force Protocol to be lowercase as a way of doing @@ -217,7 +217,7 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port) char *_protocol, *_host, *_port; char hostnamebuf[256]; - PRMSG (3,"ParseAddress(%s)\n", address, 0, 0); + PRMSG (3,"[Xtrans] ParseAddress(%s)\n", address, 0, 0); /* Copy the string so it can be changed */ @@ -383,12 +383,12 @@ TRANS(Open) (int type, char *address) XtransConnInfo ciptr = NULL; Xtransport *thistrans; - PRMSG (2,"Open(%d,%s)\n", type, address, 0); + PRMSG (2,"[Xtrans] Open(%d,%s)\n", type, address, 0); #if defined(_WIN32) && (defined(TCPCONN) || defined(DNETCONN)) if (TRANS(WSAStartup)()) { - PRMSG (1,"Open: WSAStartup failed\n", 0, 0, 0); + PRMSG (1,"[Xtrans] Open: WSAStartup failed\n", 0, 0, 0); return NULL; } #endif @@ -397,7 +397,7 @@ TRANS(Open) (int type, char *address) if (TRANS(ParseAddress) (address, &protocol, &host, &port) == 0) { - PRMSG (1,"Open: Unable to Parse address %s\n", address, 0, 0); + PRMSG (1,"[Xtrans] Open: Unable to Parse address %s\n", address, 0, 0); return NULL; } @@ -405,7 +405,7 @@ TRANS(Open) (int type, char *address) if ((thistrans = TRANS(SelectTransport) (protocol)) == NULL) { - PRMSG (1,"Open: Unable to find transport for %s\n", + PRMSG (1,"[Xtrans] Open: Unable to find transport for %s\n", protocol, 0, 0); xfree (protocol); @@ -439,14 +439,14 @@ TRANS(Open) (int type, char *address) #endif /* TRANS_SERVER */ break; default: - PRMSG (1,"Open: Unknown Open type %d\n", type, 0, 0); + PRMSG (1,"[Xtrans] Open: Unknown Open type %d\n", type, 0, 0); } if (ciptr == NULL) { if (!(thistrans->flags & TRANS_DISABLED)) { - PRMSG (1,"Open: transport open failed for %s/%s:%s\n", + PRMSG (1,"[Xtrans] Open: transport open failed for %s/%s:%s\n", protocol, host, port); } xfree (protocol); @@ -482,7 +482,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port) char *save_port; int i; - PRMSG (2,"Reopen(%d,%d,%s)\n", trans_id, fd, port); + PRMSG (2,"[Xtrans] Reopen(%d,%d,%s)\n", trans_id, fd, port); /* Determine the transport type */ @@ -495,7 +495,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port) if (thistrans == NULL) { - PRMSG (1,"Reopen: Unable to find transport id %d\n", + PRMSG (1,"[Xtrans] Reopen: Unable to find transport id %d\n", trans_id, 0, 0); return NULL; @@ -503,7 +503,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port) if ((save_port = (char *) xalloc (strlen (port) + 1)) == NULL) { - PRMSG (1,"Reopen: Unable to malloc port string\n", 0, 0, 0); + PRMSG (1,"[Xtrans] Reopen: Unable to malloc port string\n", 0, 0, 0); return NULL; } @@ -521,12 +521,12 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port) ciptr = thistrans->ReopenCLTSServer(thistrans, fd, port); break; default: - PRMSG (1,"Reopen: Bad Open type %d\n", type, 0, 0); + PRMSG (1,"[Xtrans] Reopen: Bad Open type %d\n", type, 0, 0); } if (ciptr == NULL) { - PRMSG (1,"Reopen: transport open failed\n", 0, 0, 0); + PRMSG (1,"[Xtrans] Reopen: transport open failed\n", 0, 0, 0); return NULL; } @@ -552,7 +552,7 @@ XtransConnInfo TRANS(OpenCOTSClient) (char *address) { - PRMSG (2,"OpenCOTSClient(%s)\n", address, 0, 0); + PRMSG (2,"[Xtrans] OpenCOTSClient(%s)\n", address, 0, 0); return TRANS(Open) (XTRANS_OPEN_COTS_CLIENT, address); } @@ -565,7 +565,7 @@ XtransConnInfo TRANS(OpenCOTSServer) (char *address) { - PRMSG (2,"OpenCOTSServer(%s)\n", address, 0, 0); + PRMSG (2,"[Xtrans] OpenCOTSServer(%s)\n", address, 0, 0); return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address); } @@ -578,7 +578,7 @@ XtransConnInfo TRANS(OpenCLTSClient) (char *address) { - PRMSG (2,"OpenCLTSClient(%s)\n", address, 0, 0); + PRMSG (2,"[Xtrans] OpenCLTSClient(%s)\n", address, 0, 0); return TRANS(Open) (XTRANS_OPEN_CLTS_CLIENT, address); } @@ -591,7 +591,7 @@ XtransConnInfo TRANS(OpenCLTSServer) (char *address) { - PRMSG (2,"OpenCLTSServer(%s)\n", address, 0, 0); + PRMSG (2,"[Xtrans] OpenCLTSServer(%s)\n", address, 0, 0); return TRANS(Open) (XTRANS_OPEN_CLTS_SERVER, address); } @@ -604,7 +604,7 @@ XtransConnInfo TRANS(ReopenCOTSServer) (int trans_id, int fd, char *port) { - PRMSG (2,"ReopenCOTSServer(%d, %d, %s)\n", trans_id, fd, port); + PRMSG (2,"[Xtrans] ReopenCOTSServer(%d, %d, %s)\n", trans_id, fd, port); return TRANS(Reopen) (XTRANS_OPEN_COTS_SERVER, trans_id, fd, port); } @@ -612,7 +612,7 @@ XtransConnInfo TRANS(ReopenCLTSServer) (int trans_id, int fd, char *port) { - PRMSG (2,"ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port); + PRMSG (2,"[Xtrans] ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port); return TRANS(Reopen) (XTRANS_OPEN_CLTS_SERVER, trans_id, fd, port); } @@ -652,7 +652,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) int fd = ciptr->fd; int ret = 0; - PRMSG (2,"SetOption(%d,%d,%d)\n", fd, option, arg); + PRMSG (2,"[Xtrans] SetOption(%d,%d,%d)\n", fd, option, arg); /* * For now, all transport type use the same stuff for setting options. @@ -750,7 +750,7 @@ TRANS(NoListen) (char * protocol) if ((trans = TRANS(SelectTransport)(protocol)) == NULL) { - PRMSG (1,"TRANS(TransNoListen): unable to find transport: %s\n", + PRMSG (1,"[Xtrans] TRANS(TransNoListen): unable to find transport: %s\n", protocol, 0, 0); return -1; @@ -777,7 +777,7 @@ TRANS(Accept) (XtransConnInfo ciptr, int *status) { XtransConnInfo newciptr; - PRMSG (2,"Accept(%d)\n", ciptr->fd, 0, 0); + PRMSG (2,"[Xtrans] Accept(%d)\n", ciptr->fd, 0, 0); newciptr = ciptr->transptr->Accept (ciptr, status); @@ -801,18 +801,18 @@ TRANS(Connect) (XtransConnInfo ciptr, char *address) char *port; int ret; - PRMSG (2,"Connect(%d,%s)\n", ciptr->fd, address, 0); + PRMSG (2,"[Xtrans] Connect(%d,%s)\n", ciptr->fd, address, 0); if (TRANS(ParseAddress) (address, &protocol, &host, &port) == 0) { - PRMSG (1,"Connect: Unable to Parse address %s\n", + PRMSG (1,"[Xtrans] Connect: Unable to Parse address %s\n", address, 0, 0); return -1; } if (!port || !*port) { - PRMSG (1,"Connect: Missing port specification in %s\n", + PRMSG (1,"[Xtrans] Connect: Missing port specification in %s\n", address, 0, 0); if (protocol) xfree (protocol); if (host) xfree (host); @@ -879,7 +879,7 @@ TRANS(Close) (XtransConnInfo ciptr) { int ret; - PRMSG (2,"Close(%d)\n", ciptr->fd, 0, 0); + PRMSG (2,"[Xtrans] Close(%d)\n", ciptr->fd, 0, 0); ret = ciptr->transptr->Close (ciptr); @@ -894,7 +894,7 @@ TRANS(CloseForCloning) (XtransConnInfo ciptr) { int ret; - PRMSG (2,"CloseForCloning(%d)\n", ciptr->fd, 0, 0); + PRMSG (2,"[Xtrans] CloseForCloning(%d)\n", ciptr->fd, 0, 0); ret = ciptr->transptr->CloseForCloning (ciptr); @@ -916,14 +916,14 @@ TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp, Xtransaddr **addrp) { - PRMSG (2,"GetMyAddr(%d)\n", ciptr->fd, 0, 0); + PRMSG (2,"[Xtrans] GetMyAddr(%d)\n", ciptr->fd, 0, 0); *familyp = ciptr->family; *addrlenp = ciptr->addrlen; if ((*addrp = (Xtransaddr *) xalloc (ciptr->addrlen)) == NULL) { - PRMSG (1,"GetMyAddr: malloc failed\n", 0, 0, 0); + PRMSG (1,"[Xtrans] GetMyAddr: malloc failed\n", 0, 0, 0); return -1; } memcpy(*addrp, ciptr->addr, ciptr->addrlen); @@ -936,14 +936,14 @@ TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp, Xtransaddr **addrp) { - PRMSG (2,"GetPeerAddr(%d)\n", ciptr->fd, 0, 0); + PRMSG (2,"[Xtrans] GetPeerAddr(%d)\n", ciptr->fd, 0, 0); *familyp = ciptr->family; *addrlenp = ciptr->peeraddrlen; if ((*addrp = (Xtransaddr *) xalloc (ciptr->peeraddrlen)) == NULL) { - PRMSG (1,"GetPeerAddr: malloc failed\n", 0, 0, 0); + PRMSG (1,"[Xtrans] GetPeerAddr: malloc failed\n", 0, 0, 0); return -1; } memcpy(*addrp, ciptr->peeraddr, ciptr->peeraddrlen); @@ -1006,7 +1006,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, XtransConnInfo ciptr, temp_ciptrs[NUMTRANS]; int status, i, j; - PRMSG (2,"MakeAllCOTSServerListeners(%s,%x)\n", + PRMSG (2,"[Xtrans] MakeAllCOTSServerListeners(%s,%x)\n", port ? port : "NULL", ciptrs_ret, 0); *count_ret = 0; @@ -1020,7 +1020,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, snprintf(buffer, sizeof(buffer), "%s/:%s", trans->TransName, port ? port : ""); - PRMSG (5,"MakeAllCOTSServerListeners: opening %s\n", + PRMSG (5,"[Xtrans] MakeAllCOTSServerListeners: opening %s\n", buffer, 0, 0); if ((ciptr = TRANS(OpenCOTSServer(buffer))) == NULL) @@ -1029,7 +1029,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, continue; PRMSG (1, - "MakeAllCOTSServerListeners: failed to open listener for %s\n", + "[Xtrans] MakeAllCOTSServerListeners: failed to open listener for %s\n", trans->TransName, 0, 0); continue; } @@ -1045,7 +1045,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, */ PRMSG (1, - "MakeAllCOTSServerListeners: server already running\n", + "[Xtrans] MakeAllCOTSServerListeners: server already running\n", 0, 0, 0); for (j = 0; j < *count_ret; j++) @@ -1059,7 +1059,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, else { PRMSG (1, - "MakeAllCOTSServerListeners: failed to create listener for %s\n", + "[Xtrans] MakeAllCOTSServerListeners: failed to create listener for %s\n", trans->TransName, 0, 0); continue; @@ -1067,7 +1067,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, } PRMSG (5, - "MakeAllCOTSServerListeners: opened listener for %s, %d\n", + "[Xtrans] MakeAllCOTSServerListeners: opened listener for %s, %d\n", trans->TransName, ciptr->fd, 0); temp_ciptrs[*count_ret] = ciptr; @@ -1077,7 +1077,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, *partial = (*count_ret < complete_network_count()); PRMSG (5, - "MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n", + "[Xtrans] MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n", *partial, *count_ret, complete_network_count()); if (*count_ret > 0) @@ -1108,7 +1108,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret, XtransConnInfo ciptr, temp_ciptrs[NUMTRANS]; int status, i, j; - PRMSG (2,"MakeAllCLTSServerListeners(%s,%x)\n", + PRMSG (2,"[Xtrans] MakeAllCLTSServerListeners(%s,%x)\n", port ? port : "NULL", ciptrs_ret, 0); *count_ret = 0; @@ -1122,13 +1122,13 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret, snprintf(buffer, sizeof(buffer), "%s/:%s", trans->TransName, port ? port : ""); - PRMSG (5,"MakeAllCLTSServerListeners: opening %s\n", + PRMSG (5,"[Xtrans] MakeAllCLTSServerListeners: opening %s\n", buffer, 0, 0); if ((ciptr = TRANS(OpenCLTSServer (buffer))) == NULL) { PRMSG (1, - "MakeAllCLTSServerListeners: failed to open listener for %s\n", + "[Xtrans] MakeAllCLTSServerListeners: failed to open listener for %s\n", trans->TransName, 0, 0); continue; } @@ -1144,7 +1144,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret, */ PRMSG (1, - "MakeAllCLTSServerListeners: server already running\n", + "[Xtrans] MakeAllCLTSServerListeners: server already running\n", 0, 0, 0); for (j = 0; j < *count_ret; j++) @@ -1158,7 +1158,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret, else { PRMSG (1, - "MakeAllCLTSServerListeners: failed to create listener for %s\n", + "[Xtrans] MakeAllCLTSServerListeners: failed to create listener for %s\n", trans->TransName, 0, 0); continue; @@ -1166,7 +1166,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret, } PRMSG (5, - "MakeAllCLTSServerListeners: opened listener for %s, %d\n", + "[Xtrans] MakeAllCLTSServerListeners: opened listener for %s, %d\n", trans->TransName, ciptr->fd, 0); temp_ciptrs[*count_ret] = ciptr; (*count_ret)++; @@ -1175,7 +1175,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret, *partial = (*count_ret < complete_network_count()); PRMSG (5, - "MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n", + "[Xtrans] MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n", *partial, *count_ret, complete_network_count()); if (*count_ret > 0) |