From 5f4c7238bdf0c388094fe9e4c8af2b2e3b4ecf7a Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Tue, 18 Apr 2017 19:32:43 -0400 Subject: [PATCH] remove extraneous newlines from ml_string() & ml_printf() calls --- src/network/multi_fstracker.cpp | 6 +- src/network/multimsgs.cpp | 10 +-- src/network/psnet2.cpp | 128 ++++++++++++++++---------------- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/network/multi_fstracker.cpp b/src/network/multi_fstracker.cpp index eee4bad..f5df319 100644 --- a/src/network/multi_fstracker.cpp +++ b/src/network/multi_fstracker.cpp @@ -402,13 +402,13 @@ void multi_fs_tracker_init() // initialize the low-level validation stuff if(!InitValidateClient()){ - ml_printf("Error initializing tracker api (validateclient)\n"); + ml_printf("Error initializing tracker api (validateclient)"); return; } // initialize the low-level pilot tracking stuff if(!InitPilotTrackerClient()){ - ml_printf("Error initializing tracker api (pilotclient)\n"); + ml_printf("Error initializing tracker api (pilotclient)"); return; } @@ -418,7 +418,7 @@ void multi_fs_tracker_init() #else if(!InitGameTrackerClient(GT_FREESPACE)){ #endif - ml_printf("Error initializing tracker api (gameclient)\n"); + ml_printf("Error initializing tracker api (gameclient)"); return; } diff --git a/src/network/multimsgs.cpp b/src/network/multimsgs.cpp index 901af5e..3c6502d 100644 --- a/src/network/multimsgs.cpp +++ b/src/network/multimsgs.cpp @@ -6443,7 +6443,7 @@ void process_player_stats_block_packet(ubyte *data, header *hinfo) player_num = find_player_id(player_id); if (player_num == -1) { nprintf(("Network", "Couldn't find player for stats update!\n")); - ml_string("Couldn't find player for stats update!\n"); + ml_string("Couldn't find player for stats update!"); sc = &bogus; Int3(); @@ -6455,7 +6455,7 @@ void process_player_stats_block_packet(ubyte *data, header *hinfo) GET_DATA(val); switch(val){ case STATS_ALLTIME: - ml_string("Received STATS_ALLTIME\n"); + ml_string("Received STATS_ALLTIME"); // kills - alltime for (idx=0; idxm_kill_count); GET_INT(sc->m_kill_count_ok); @@ -6521,7 +6521,7 @@ void process_player_stats_block_packet(ubyte *data, header *hinfo) break; case STATS_DOGFIGHT_KILLS: - ml_string("Received STATS_DOGFIGHT_KILLS\n"); + ml_string("Received STATS_DOGFIGHT_KILLS"); if(player_num >= 0){ ml_printf("Dogfight stats for %s", Net_players[player_num].player->callsign); } diff --git a/src/network/psnet2.cpp b/src/network/psnet2.cpp index 73ee272..bb72397 100644 --- a/src/network/psnet2.cpp +++ b/src/network/psnet2.cpp @@ -492,7 +492,7 @@ void PSNET_TOP_LAYER_PROCESS() memset(&ip_addr, 0, sizeof(struct sockaddr_in)); if ( Network_status != NETWORK_STATUS_RUNNING ) { - ml_printf("Network ==> socket not inited in PSNET_TOP_LAYER_PROCESS\n"); + ml_printf("Network ==> socket not inited in PSNET_TOP_LAYER_PROCESS"); return; } @@ -506,7 +506,7 @@ void PSNET_TOP_LAYER_PROCESS() timeout.tv_usec = 0; if ( select( Unreliable_socket+1, &rfds, NULL, NULL, &timeout) == SOCKET_ERROR ) { - ml_printf("Error %d doing a socket select on read\n", WSAGetLastError()); + ml_printf("Error %d doing a socket select on read", WSAGetLastError()); break; } @@ -600,12 +600,12 @@ void psnet_init( int protocol, int port_num ) // initialize TCP now Tcp_active = 1; if(!psnet_init_tcp()){ - ml_printf("Error on TCP startup %d\n", Tcp_failure_code); + ml_printf("Error on TCP startup %d", Tcp_failure_code); Tcp_active = 0; } else { if(!psnet_init_rel_tcp(Psnet_default_port + 1, 0)){ - ml_printf("Network", "Error on TCP startup %d\n", Tcp_failure_code); + ml_printf("Network", "Error on TCP startup %d", Tcp_failure_code); Tcp_active = 0; } @@ -709,13 +709,13 @@ int psnet_use_protocol( int protocol ) Can_broadcast = Tcp_can_broadcast; if(Can_broadcast){ - ml_printf("Psnet : TCP broadcast\n"); + ml_printf("Psnet : TCP broadcast"); } // get the socket name, and put it into My_addr len = sizeof(struct sockaddr_in); if ( getsockname(TCP_socket, (struct sockaddr *)&ip_addr, &len) == SOCKET_ERROR ) { - ml_printf("Unable to get sock name for TCP unreliable socket (%d)\n", WSAGetLastError() ); + ml_printf("Unable to get sock name for TCP unreliable socket (%d)", WSAGetLastError() ); return 0; } @@ -723,7 +723,7 @@ int psnet_use_protocol( int protocol ) memcpy(Psnet_my_addr.addr, &ip_addr.sin_addr, 4); Psnet_my_addr.port = Psnet_default_port; - ml_printf("Psnet using - NET_TCP\n"); + ml_printf("Psnet using - NET_TCP"); Psnet_my_addr.type = protocol; @@ -851,7 +851,7 @@ int psnet_send( net_addr_t * who_to, void * data, int len, int np_index ) send_sock = Unreliable_socket; if ( Network_status != NETWORK_STATUS_RUNNING ) { - ml_printf("Network ==> Socket not inited in psnet_send\n"); + ml_printf("Network ==> Socket not inited in psnet_send"); return 0; } @@ -867,14 +867,14 @@ int psnet_send( net_addr_t * who_to, void * data, int len, int np_index ) memcpy(iaddr, who_to->addr, 4); if ( memcmp(iaddr, Null_address, 4) == 0) { - ml_printf("Network ==> send to address is 0 in psnet_send\n"); + ml_printf("Network ==> send to address is 0 in psnet_send"); return 0; } port = who_to->port; if ( port == 0) { - ml_printf("Network ==> destination port %d invalid in psnet_send\n", port); + ml_printf("Network ==> destination port %d invalid in psnet_send", port); return 0; } @@ -888,7 +888,7 @@ int psnet_send( net_addr_t * who_to, void * data, int len, int np_index ) timeout.tv_usec = 0; if ( SELECT( send_sock+1, NULL, &wfds, NULL, &timeout, PSNET_TYPE_UNRELIABLE) == SOCKET_ERROR ) { - ml_printf("Error on blocking select for write %d\n", WSAGetLastError() ); + ml_printf("Error on blocking select for write %d", WSAGetLastError() ); return 0; } @@ -930,12 +930,12 @@ int psnet_get( void * data, net_addr_t * from_addr ) int psnet_broadcast( net_addr_t * who_to, void * data, int len ) { if ( Network_status != NETWORK_STATUS_RUNNING ) { - ml_printf("Network ==> Socket not inited in psnet_broadcast\n"); + ml_printf("Network ==> Socket not inited in psnet_broadcast"); return 0; } if ( !Can_broadcast ) { - ml_printf("Cannot broadcast -- returning without doing anything\n"); + ml_printf("Cannot broadcast -- returning without doing anything"); return 0; } @@ -1042,10 +1042,10 @@ void psnet_rel_close_socket( PSNET_SOCKET_RELIABLE *sockp ) // if the socket is out of range if(*sockp>=MAXRELIABLESOCKETS) { - ml_printf("Invalid socket id passed to nw_NewCloseSocket() -- %d\n",*sockp); + ml_printf("Invalid socket id passed to nw_NewCloseSocket() -- %d",*sockp); return; } - ml_printf("Closing socket %d\n",*sockp); + ml_printf("Closing socket %d",*sockp); // go through every buffer and "free it up(tm)" int i; @@ -1078,7 +1078,7 @@ void psnet_rel_close_socket( PSNET_SOCKET_RELIABLE *sockp ) SDL_assert(Tcp_active); SENDTO(Unreliable_socket, (char *)&diss_conn_header,RELIABLE_PACKET_HEADER_ONLY_SIZE,0,&Reliable_sockets[*sockp].addr,sizeof(struct sockaddr), PSNET_TYPE_RELIABLE); } else { - ml_printf("Unknown protocol type in nw_CloseSocket()!\n"); + ml_printf("Unknown protocol type in nw_CloseSocket()!"); // Int3(); } @@ -1102,7 +1102,7 @@ int psnet_rel_send(PSNET_SOCKET_RELIABLE socketid, ubyte *data, int length, int reliable_socket *rsocket; if(socketid >= MAXRELIABLESOCKETS){ - ml_printf("Invalid socket id passed to psnet_rel_send() -- %d\n",socketid); + ml_printf("Invalid socket id passed to psnet_rel_send() -- %d",socketid); return -1; } @@ -1112,7 +1112,7 @@ int psnet_rel_send(PSNET_SOCKET_RELIABLE socketid, ubyte *data, int length, int rsocket=&Reliable_sockets[socketid]; if(rsocket->status!=RNF_CONNECTED) { //We can't send because this isn't a connected reliable socket. - ml_printf("Can't send packet because of status %d in nw_SendReliable(). socket = %d\n",rsocket->status,socketid); + ml_printf("Can't send packet because of status %d in nw_SendReliable(). socket = %d",rsocket->status,socketid); return -1; } @@ -1143,7 +1143,7 @@ int psnet_rel_send(PSNET_SOCKET_RELIABLE socketid, ubyte *data, int length, int multi_rate_add(np_index, "tcp(h)", RELIABLE_PACKET_HEADER_ONLY_SIZE+rsocket->send_len[i]); bytesout = SENDTO(Unreliable_socket, (char *)&send_header,RELIABLE_PACKET_HEADER_ONLY_SIZE+rsocket->send_len[i],0,&rsocket->addr,sizeof(struct sockaddr), PSNET_TYPE_RELIABLE); } else { - ml_printf("Unknown protocol type in nw_SendReliable()!\n"); + ml_printf("Unknown protocol type in nw_SendReliable()!"); Int3(); } } @@ -1160,7 +1160,7 @@ int psnet_rel_send(PSNET_SOCKET_RELIABLE socketid, ubyte *data, int length, int return bytesout; } } - ml_printf("PSNET RELIABLE SEND BUFFER OVERRUN. socket = %d\n",socketid); + ml_printf("PSNET RELIABLE SEND BUFFER OVERRUN. socket = %d",socketid); // Int3(); return 0; } @@ -1176,12 +1176,12 @@ int psnet_rel_get(PSNET_SOCKET socketid, ubyte *buffer, int max_len) reliable_socket *rsocket = NULL; psnet_rel_work(); if(socketid >= MAXRELIABLESOCKETS){ - ml_printf("Invalid socket id passed to nw_NewReceiveReliable() -- %d\n",socketid); + ml_printf("Invalid socket id passed to nw_NewReceiveReliable() -- %d",socketid); return -1; } rsocket = &Reliable_sockets[socketid]; if( (RNF_CONNECTED!=rsocket->status) && (RNF_LIMBO!=rsocket->status) ){ - ml_printf("Can't receive packet because it isn't connected in nw_ReceiveReliable(). socket = %d\n",socketid); + ml_printf("Can't receive packet because it isn't connected in nw_ReceiveReliable(). socket = %d",socketid); return 0; } //If the buffer position is the position we are waiting for, fill in @@ -1275,7 +1275,7 @@ void psnet_rel_work() link_type = NET_TCP; if(bytesin==-1){ - ml_printf("recvfrom returned an error! -- %d\n",WSAGetLastError()); + ml_printf("recvfrom returned an error! -- %d",WSAGetLastError()); //Int3();//See Kevin return; } @@ -1287,7 +1287,7 @@ void psnet_rel_work() //if(memcmp(&rcv_addr,&reliable_sockets[i].addr,sizeof(struct sockaddr))==0) if(memcmp(&d3_rcv_addr, &Reliable_sockets[i].net_addr, sizeof(net_addr_t)) == 0){ //We already have a reliable link to this user, so we will ignore it... - ml_printf("Received duplicate connection request. %d\n",i); + ml_printf("Received duplicate connection request. %d",i); //reliable_sockets[i].last_packet_received = timer_GetTime(); psnet_rel_send_ack(&Reliable_sockets[i].addr, rcv_buff.seq, link_type, rcv_buff.send_time); //We will change this as a hack to prevent later code from hooking us up @@ -1308,13 +1308,13 @@ void psnet_rel_work() Reliable_sockets[i].last_packet_received = psnet_get_time(); rsocket = &Reliable_sockets[i]; rcvaddr = (struct sockaddr_in *)&rcv_addr; - ml_printf("Connect from %s:%d\n", inet_ntoa(rcvaddr->sin_addr), htons(rcvaddr->sin_port)); + ml_printf("Connect from %s:%d", inet_ntoa(rcvaddr->sin_addr), htons(rcvaddr->sin_port)); break; } } if(i==MAXRELIABLESOCKETS){ //No more connections! - ml_printf("Out of incoming reliable connection sockets\n"); + ml_printf("Out of incoming reliable connection sockets"); //Int3();//See Kevin continue; } @@ -1330,8 +1330,8 @@ void psnet_rel_work() } } if(rsocket == NULL){ - ml_printf("Received reliable data from unconnected client.\n"); - ml_printf("Received from %s:%d\n",inet_ntoa(rcvaddr->sin_addr),rcvaddr->sin_port); + ml_printf("Received reliable data from unconnected client."); + ml_printf("Received from %s:%d",inet_ntoa(rcvaddr->sin_addr),rcvaddr->sin_port); continue ; } rsocket->last_packet_received = psnet_get_time(); @@ -1345,14 +1345,14 @@ void psnet_rel_work() ushort *acknum = (ushort *)&rcv_buff.data; if(*acknum == (~CONNECTSEQ & 0xffff)){ rsocket->status = RNF_CONNECTED; - ml_printf("Got ACK for IAMHERE!\n"); + ml_printf("Got ACK for IAMHERE!"); } continue; } } else if(rcv_buff.type == RNT_I_AM_HERE){ rsocket->status = RNF_CONNECTING; psnet_rel_send_ack(&rsocket->addr, rcv_buff.seq, link_type, rcv_buff.send_time); - ml_printf("Got IAMHERE!\n"); + ml_printf("Got IAMHERE!"); continue; } } @@ -1418,7 +1418,7 @@ void psnet_rel_work() seqdelta = rcv_buff.seq - rsocket->oursequence; if(seqdelta<0) seqdelta = seqdelta*-1; if(seqdelta>=MAXNETBUFFERS - 1){ - ml_printf("Received reliable packet out of order!\n"); + ml_printf("Received reliable packet out of order!"); //It's out of order, so we won't ack it, which will mean we will get it again soon. continue; } @@ -1470,7 +1470,7 @@ void psnet_rel_work() if(Serverconn == 0xffffffff){ if(rsocket->status==RNF_LIMBO){ if(fl_abs((psnet_get_time() - rsocket->last_packet_received))>Nettimeout){ - ml_printf("Reliable (but in limbo) socket (%d) timed out in nw_WorkReliable().\n",j); + ml_printf("Reliable (but in limbo) socket (%d) timed out in nw_WorkReliable().",j); memset(rsocket,0,sizeof(reliable_socket)); rsocket->status = RNF_UNUSED;//Won't work if this is an outgoing connection. } @@ -1478,7 +1478,7 @@ void psnet_rel_work() } else { if((rsocket->status == RNF_LIMBO) && (fl_abs((psnet_get_time() - First_sent_iamhere)) > Nettimeout)){ rsocket->status = RNF_BROKEN; - ml_printf("Reliable socket (%d) timed out in nw_WorkReliable().\n",j); + ml_printf("Reliable socket (%d) timed out in nw_WorkReliable().",j); } } @@ -1540,7 +1540,7 @@ void psnet_rel_work() if((rsocket->status == RNF_CONNECTED) && (fl_abs((psnet_get_time() - rsocket->last_packet_received))>Nettimeout)){ //This socket is hosed.....inform someone? - ml_printf("Reliable Socket (%d) timed out in nw_WorkReliable().\n",j); + ml_printf("Reliable Socket (%d) timed out in nw_WorkReliable().",j); rsocket->status = RNF_BROKEN; } } @@ -1569,7 +1569,7 @@ int psnet_rel_check_for_listen(net_addr_t *from_addr) if(Reliable_sockets[i].status == RNF_CONNECTING){ Reliable_sockets[i].status = RNF_CONNECTED; //memcpy(from_addr,&reliable_sockets[i].addr,sizeof(struct sockaddr)); - ml_printf("New reliable connection in nw_CheckListenSocket().\n"); + ml_printf("New reliable connection in nw_CheckListenSocket()."); if (Reliable_sockets[i].connection_type != NET_TCP) { continue; @@ -1637,7 +1637,7 @@ void psnet_rel_connect_to_server(PSNET_SOCKET *socket, net_addr_t *server_addr) bytesin = RECVFROM(Unreliable_socket, (char *)&ack_header,sizeof(reliable_header),0,(struct sockaddr *)&rcv_addr,&addrlen, PSNET_TYPE_RELIABLE); if(bytesin==-1){ //Int3();//See Kevin - ml_printf("UDP recvfrom returned an error! -- %d\n",WSAGetLastError()); + ml_printf("UDP recvfrom returned an error! -- %d",WSAGetLastError()); break; //return; } @@ -1656,7 +1656,7 @@ void psnet_rel_connect_to_server(PSNET_SOCKET *socket, net_addr_t *server_addr) sockaddr.sin_port = htons(port); addr = (struct sockaddr *)&sockaddr; if( SOCKET_ERROR == SENDTO(Unreliable_socket, (char *)&conn_header,RELIABLE_PACKET_HEADER_ONLY_SIZE,0,addr,sizeof(struct sockaddr), PSNET_TYPE_RELIABLE) ){ - ml_printf("Unable to send UDP packet in nw_ConnectToServer()! -- %d\n",WSAGetLastError()); + ml_printf("Unable to send UDP packet in nw_ConnectToServer()! -- %d",WSAGetLastError()); return; } memcpy(d3_rcv_addr.addr, &sockaddr.sin_addr.s_addr, 4); @@ -1681,7 +1681,7 @@ void psnet_rel_connect_to_server(PSNET_SOCKET *socket, net_addr_t *server_addr) addrlen = sizeof(struct sockaddr); bytesin = RECVFROM(typeless_sock,(char *)&ack_header,sizeof(reliable_header),0,(struct sockaddr *)&rcv_addr,&addrlen, PSNET_TYPE_RELIABLE); if(bytesin==-1){ - ml_printf("recvfrom returned an error! -- %d\n",WSAGetLastError()); + ml_printf("recvfrom returned an error! -- %d",WSAGetLastError()); Int3();//See Kevin return; } @@ -1702,7 +1702,7 @@ void psnet_rel_connect_to_server(PSNET_SOCKET *socket, net_addr_t *server_addr) memcpy(&Reliable_sockets[i].addr,&rcv_addr,sizeof(struct sockaddr)); Reliable_sockets[i].status = RNF_LIMBO; *socket = i; - ml_printf("Succesfully connected to server in nw_ConnectToServer().\n"); + ml_printf("Succesfully connected to server in nw_ConnectToServer()."); //Now send I_AM_HERE packet conn_header.type = RNT_I_AM_HERE; conn_header.seq = (ushort)(~CONNECTSEQ); @@ -1715,7 +1715,7 @@ void psnet_rel_connect_to_server(PSNET_SOCKET *socket, net_addr_t *server_addr) *socket = INVALID_SOCKET; Reliable_sockets[i].status = RNF_UNUSED; memset(&Reliable_sockets[i],0,sizeof(reliable_socket)); - ml_printf("Unable to send packet in nw_ConnectToServer()\n"); + ml_printf("Unable to send packet in nw_ConnectToServer()"); return; } Reliable_sockets[i].last_packet_sent = psnet_get_time(); @@ -1728,21 +1728,21 @@ void psnet_rel_connect_to_server(PSNET_SOCKET *socket, net_addr_t *server_addr) return; } } - ml_printf("Out of reliable socket space in nw_ConnectToServer().\n"); + ml_printf("Out of reliable socket space in nw_ConnectToServer()."); return; - } else ml_printf("Received out of sequence ACK in nw_ConnectToServer().\n"); - } else ml_printf("Received something that isn't an ACK in nw_ConnectToServer().\n"); - } else ml_printf("Received 0 bytes from recvfrom() in nw_ConnectToServer().\n"); + } else ml_printf("Received out of sequence ACK in nw_ConnectToServer()."); + } else ml_printf("Received something that isn't an ACK in nw_ConnectToServer()."); + } else ml_printf("Received 0 bytes from recvfrom() in nw_ConnectToServer()."); } /* if((psnet_get_time()-time_sent_req)>2) { - ml_printf("Resending connect request.\n"); + ml_printf("Resending connect request."); int ret = SENDTO(typeless_sock,(char *)&conn_header,RELIABLE_PACKET_HEADER_ONLY_SIZE,0,addr,sizeof(struct sockaddr), PSNET_TYPE_RELIABLE); if(ret != SOCKET_ERROR){ time_sent_req = psnet_get_time(); } else { - ml_printf("Error sending connection request! -- %d\n",WSAGetLastError() ); + ml_printf("Error sending connection request! -- %d",WSAGetLastError() ); } } */ @@ -1771,7 +1771,7 @@ int psnet_rel_get_ip() } else { ml_string("SOCKET_ERROR in psnet_rel_get_ip()!"); } - ml_printf(%s:%d\n", inet_ntoa(rcvaddr->sin_addr), htons(rcvaddr->sin_port) + ml_printf(%s:%d", inet_ntoa(rcvaddr->sin_addr), htons(rcvaddr->sin_port) return local_address.sin_addr.s_addr; } */ @@ -1792,7 +1792,7 @@ int psnet_get_ip() } // NOTE: for memeory checkers, do NOT try to free this - ml_printf("psnet_get_ip() reports IP : %s\n", inet_ntoa(local_address.sin_addr)); + ml_printf("psnet_get_ip() reports IP : %s", inet_ntoa(local_address.sin_addr)); return local_address.sin_addr.s_addr; } @@ -1806,7 +1806,7 @@ int psnet_init_rel_tcp(int port, int should_listen) sockaddr.sin_port = htons((ushort)port); sockaddr.sin_family = AF_INET; unsigned int my_ip; - ml_printf("Setting up reliable sockets.\n"); + ml_printf("Setting up reliable sockets."); my_ip = psnet_get_ip(); @@ -1814,11 +1814,11 @@ int psnet_init_rel_tcp(int port, int should_listen) Reliable_UDP_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP ); if(INVALID_SOCKET == Reliable_UDP_socket){ - ml_printf("Unable to create reliable UDP socket -- %d\n", WSAGetLastError() ); + ml_printf("Unable to create reliable UDP socket -- %d", WSAGetLastError() ); return 0; } else if(bind(Reliable_UDP_socket,(struct sockaddr *)&sockaddr,sizeof(struct sockaddr))!=0){ - ml_printf("Unable to bind reliable socket -- %d\n", WSAGetLastError() ); + ml_printf("Unable to bind reliable socket -- %d", WSAGetLastError() ); return 0; } @@ -1830,7 +1830,7 @@ int psnet_init_rel_tcp(int port, int should_listen) arg = TRUE; error = ioctlsocket( Reliable_UDP_socket, FIONBIO, &arg ); if ( error == SOCKET_ERROR ) { - ml_printf("Unable to make reliable UDP socket non-blocking -- %d\n", WSAGetLastError() ); + ml_printf("Unable to make reliable UDP socket non-blocking -- %d", WSAGetLastError() ); return 0; } @@ -1893,7 +1893,7 @@ void psnet_buffer_packet(network_packet_buffer_list *l, ubyte *data, int length, // if we didn't find the buffer, report an overrun if(!found_buf){ - ml_printf("WARNING - Buffer overrun in psnet\n"); + ml_printf("WARNING - Buffer overrun in psnet"); } else { // copy in the data memcpy(l->psnet_buffers[idx].data, data, length); @@ -2172,22 +2172,22 @@ void psnet_ras_status() // JAS: My computer gets to this point, but I have no RAS connections, // so just exit if ( num_connections < 1 ) { - ml_printf("Found no connections\n" ); + ml_printf("Found no connections" ); FreeLibrary( ras_handle ); return; } - ml_printf("Found %d connections\n", num_connections); + ml_printf("Found %d connections", num_connections); for (i = 0; i < num_connections; i++ ) { RASCONNSTATUS status; RASPPPIP projection; unsigned long size; - ml_printf("Connection %d:\n", i); - ml_printf("Entry Name: %s\n", rasbuffer[i].szEntryName); - ml_printf("Device Type: %s\n", rasbuffer[i].szDeviceType); - ml_printf("Device Name: %s\n", rasbuffer[i].szDeviceName); + ml_printf("Connection %d:", i); + ml_printf("Entry Name: %s", rasbuffer[i].szEntryName); + ml_printf("Device Type: %s", rasbuffer[i].szDeviceType); + ml_printf("Device Name: %s", rasbuffer[i].szDeviceName); // get the connection status status.dwSize = sizeof(RASCONNSTATUS); @@ -2197,7 +2197,7 @@ void psnet_ras_status() return; } - ml_printf("\tStatus: %s\n", (status.rasconnstate==RASCS_Connected)?"Connected":"Not Connected"); + ml_printf("\tStatus: %s", (status.rasconnstate==RASCS_Connected)?"Connected":"Not Connected"); // get the projection informatiom size = sizeof(projection); @@ -2251,7 +2251,7 @@ void psnet_socket_options( SOCKET sock ) }*/ // } getsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char *)&cursize, &cursizesize); - ml_printf("Receive buffer set to %d\n", cursize); + ml_printf("Receive buffer set to %d", cursize); // set the current size of the send buffer cursizesize = sizeof(int); @@ -2267,7 +2267,7 @@ void psnet_socket_options( SOCKET sock ) // } }*/ getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&cursize, &cursizesize); - ml_printf("Send buffer set to %d\n", cursize); + ml_printf("Send buffer set to %d", cursize); } // initialize tcp socket @@ -2280,7 +2280,7 @@ int psnet_init_tcp() TCP_socket = socket( AF_INET, SOCK_DGRAM, 0 ); if ( TCP_socket == (int)INVALID_SOCKET ) { Tcp_failure_code = WSAGetLastError(); - ml_printf("Error on TCP startup %d\n", Tcp_failure_code); + ml_printf("Error on TCP startup %d", Tcp_failure_code); return 0; } @@ -2291,7 +2291,7 @@ int psnet_init_tcp() sockaddr.sin_port = htons( Psnet_default_port ); if ( bind(TCP_socket, (struct sockaddr*)&sockaddr, sizeof (sockaddr)) == SOCKET_ERROR) { Tcp_failure_code = WSAGetLastError(); - ml_printf("Couldn't bind TCP socket (%d)! Invalidating TCP\n", Tcp_failure_code ); + ml_printf("Couldn't bind TCP socket (%d)! Invalidating TCP", Tcp_failure_code ); return 0; } -- 2.39.2