remove whitespace from end of lines Modified: trunk/reactos/apps/utils/cat/cat.c Modified: trunk/reactos/apps/utils/driver/load/load.c Modified: trunk/reactos/apps/utils/driver/unload/unload.c Modified: trunk/reactos/apps/utils/net/arp/trace.c Modified: trunk/reactos/apps/utils/net/finger/finger.c Modified: trunk/reactos/apps/utils/net/finger/net.c Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c Modified: trunk/reactos/apps/utils/net/ipconfig/trace.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.c Modified: trunk/reactos/apps/utils/net/netstat/trace.c Modified: trunk/reactos/apps/utils/net/ping/ping.c Modified: trunk/reactos/apps/utils/net/roshttpd/include/list.h Modified: trunk/reactos/apps/utils/net/route/route.c Modified: trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h Modified: trunk/reactos/apps/utils/net/telnet/src/keytrans.h Modified: trunk/reactos/apps/utils/net/telnet/src/stl_bids.h Modified: trunk/reactos/apps/utils/net/telnet/src/tconsole.h Modified: trunk/reactos/apps/utils/net/telnet/src/tkeydef.h Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.h Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.h Modified: trunk/reactos/apps/utils/net/telnet/src/tnmsg.h Modified: trunk/reactos/apps/utils/net/tracert/tracert.c Modified: trunk/reactos/apps/utils/net/whois/whois.c Modified: trunk/reactos/apps/utils/nts2w32err/nts2w32err.c Modified: trunk/reactos/apps/utils/objdir/objdir.c Modified: trunk/reactos/apps/utils/patchnv4/patchnv4.c Modified: trunk/reactos/apps/utils/pesum/pesum.c Modified: trunk/reactos/apps/utils/pice/loader/terminal.h Modified: trunk/reactos/apps/utils/pice/module/dblflt.h Modified: trunk/reactos/apps/utils/pice/module/disassembler.c Modified: trunk/reactos/apps/utils/pice/module/disassembler.h Modified: trunk/reactos/apps/utils/pice/module/disassemblerdata.h Modified: trunk/reactos/apps/utils/pice/module/gpfault.h Modified: trunk/reactos/apps/utils/pice/module/hercules.h Modified: trunk/reactos/apps/utils/pice/module/hooks.h Modified: trunk/reactos/apps/utils/pice/module/init.h Modified: trunk/reactos/apps/utils/pice/module/pci_ids.h Modified: trunk/reactos/apps/utils/pice/module/pgflt.h Modified: trunk/reactos/apps/utils/pice/module/pice_ver.h Modified: trunk/reactos/apps/utils/pice/module/regs.h Modified: trunk/reactos/apps/utils/pice/module/remods.h Modified: trunk/reactos/apps/utils/pice/module/scancodes.h Modified: trunk/reactos/apps/utils/pice/module/serial.h Modified: trunk/reactos/apps/utils/pice/module/serial_port.h Modified: trunk/reactos/apps/utils/pice/module/stab_gnu.h Modified: trunk/reactos/apps/utils/pice/module/symbols.c Modified: trunk/reactos/apps/utils/pice/module/syscall.h Modified: trunk/reactos/apps/utils/pice/module/trace.h Modified: trunk/reactos/apps/utils/pice/module/vga.h Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/apps/utils/rosperf/rosperf.c Modified: trunk/reactos/apps/utils/sc/command.c Modified: trunk/reactos/apps/utils/sc/main.h Modified: trunk/reactos/apps/utils/sdkparse/assert.h Modified: trunk/reactos/apps/utils/sdkparse/test.h Modified: trunk/reactos/apps/utils/stats/stats.c Modified: trunk/reactos/apps/utils/tickcount/tickcount.c Modified: trunk/reactos/apps/utils/winetest/gui.c Modified: trunk/reactos/apps/utils/winetest/main.c _____
Modified: trunk/reactos/apps/utils/cat/cat.c --- trunk/reactos/apps/utils/cat/cat.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/cat/cat.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -6,7 +6,7 @@
int i; FILE* in; char ch; - + for (i=1; i<argc; i++) { in = fopen(argv[i],"r"); @@ -15,7 +15,7 @@ printf("Failed to open file %s\n", argv[i]); return(0); } - + while ((ch = fgetc(in)) != EOF) { putchar(ch); _____
Modified: trunk/reactos/apps/utils/driver/load/load.c --- trunk/reactos/apps/utils/driver/load/load.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/driver/load/load.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,6 +1,6 @@
/* * Load a device driver - */ + */ #include <windows.h> #include <ntos/zw.h>
_____
Modified: trunk/reactos/apps/utils/driver/unload/unload.c --- trunk/reactos/apps/utils/driver/unload/unload.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/driver/unload/unload.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,6 +1,6 @@
/* * Unload a device driver - */ + */ #include <windows.h> #include <ntos/zw.h>
_____
Modified: trunk/reactos/apps/utils/net/arp/trace.c --- trunk/reactos/apps/utils/net/arp/trace.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/arp/trace.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////// ///// // Diagnostic Trace // -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> _____
Modified: trunk/reactos/apps/utils/net/finger/finger.c --- trunk/reactos/apps/utils/net/finger/finger.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/finger/finger.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -161,10 +161,10 @@
fprintf(stderr, "Warning: Can't do local finger\n"); }
- /* Start winsock */ + /* Start winsock */ wVersionRequested = MAKEWORD( 1, 1 ); iErr = WSAStartup( wVersionRequested, &wsaData ); - if ( iErr != 0 ) + if ( iErr != 0 ) { /* Tell the user that we couldn't find a usable */ /* WinSock DLL. */ _____
Modified: trunk/reactos/apps/utils/net/finger/net.c --- trunk/reactos/apps/utils/net/finger/net.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/finger/net.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -115,7 +115,7 @@
* Otherwise, all high bits are stripped; if it isn't printable and * it isn't a space, we can simply set the 7th bit. Every ASCII * character with bit 7 set is printable. - */ + */ lastc = 0; while (recv(s, &c, 1, 0) == 1) { c &= 0x7f; _____
Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -142,7 +142,7 @@
buffer[1] = '\0';
if(SOCKET_ERROR==send(s, buffer, 1, 0)) { - int iret=WSAGetLastError (); + int iret=WSAGetLastError (); fprintf(stdout,"fputcSocket: %d\n",iret); return 0; } @@ -154,9 +154,9 @@ { int iret; while(len) { - if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) + if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) { - iret=WSAGetLastError (); + iret=WSAGetLastError (); fprintf(stdout,"fputcSocket: %d\n",iret); return 0; } @@ -187,7 +187,7 @@ if (count == 1) { string[i] = buffer[0]; - + if (i == MAX_ASCII - 3) { count = 0; _____
Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c --- trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -126,7 +126,7 @@
case LOGIN: if (token()) - if (*aname == 0) { + if (*aname == 0) { *aname = malloc((unsigned) strlen(tokval) + 1); (void) strcpy(*aname, tokval); } else { @@ -237,7 +237,7 @@ char *cp; int c; struct toktab *t; - + if (feof(cfile)) return (0); while ((c = getc(cfile)) != EOF && _____
Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -132,13 +132,13 @@
} /* typedef struct _IP_ADAPTER_INDEX_MAP { - ULONG Index; // adapter index - WCHAR Name[MAX_ADAPTER_NAME]; // name of the adapter + ULONG Index; // adapter index + WCHAR Name[MAX_ADAPTER_NAME]; // name of the adapter } IP_ADAPTER_INDEX_MAP, * PIP_ADAPTER_INDEX_MAP;
typedef struct _IP_INTERFACE_INFO { - LONG NumAdapters; // number of adapters in array - IP_ADAPTER_INDEX_MAP Adapter[1]; // adapter indices and names + LONG NumAdapters; // number of adapters in array + IP_ADAPTER_INDEX_MAP Adapter[1]; // adapter indices and names } IP_INTERFACE_INFO,*PIP_INTERFACE_INFO; */ result = GetInterfaceInfo(pIfTable, &dwOutBufLen); @@ -194,7 +194,7 @@ IP_ADDR_STRING PrimaryWinsServer; IP_ADDR_STRING SecondaryWinsServer; a time_t LeaseObtained; -b time_t LeaseExpires; +b time_t LeaseExpires; } IP_ADAPTER_INFO, *PIP_ADAPTER_INFO; */ /* _____
Modified: trunk/reactos/apps/utils/net/ipconfig/trace.c --- trunk/reactos/apps/utils/net/ipconfig/trace.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ipconfig/trace.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////// ///// // Diagnostic Trace // -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> _____
Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -52,7 +52,7 @@
VOID PrintError(DWORD ErrorCode) { LPVOID lpMsgBuf; - + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL); @@ -66,21 +66,21 @@ GetTcpStatistics(&TcpStatsMIB);
_tprintf(_T("TCP/IP Statistics\t\n")); - _tprintf(_T(" time-out algorithm:\t\t%d\n"), TcpStatsMIB.dwRtoAlgorithm); - _tprintf(_T(" minimum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMin); - _tprintf(_T(" maximum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMax); - _tprintf(_T(" maximum connections:\t\t%d\n"), TcpStatsMIB.dwMaxConn); - _tprintf(_T(" active opens:\t\t\t%d\n"), TcpStatsMIB.dwActiveOpens); - _tprintf(_T(" passive opens:\t\t\t%d\n"), TcpStatsMIB.dwPassiveOpens); - _tprintf(_T(" failed attempts:\t\t%d\n"), TcpStatsMIB.dwAttemptFails); - _tprintf(_T(" established connections reset:\t%d\n"), TcpStatsMIB.dwEstabResets); - _tprintf(_T(" established connections:\t%d\n"), TcpStatsMIB.dwCurrEstab); - _tprintf(_T(" segments received:\t\t%d\n"), TcpStatsMIB.dwInSegs); - _tprintf(_T(" segment sent:\t\t\t%d\n"), TcpStatsMIB.dwOutSegs); - _tprintf(_T(" segments retransmitted:\t\t%d\n"), TcpStatsMIB.dwRetransSegs); - _tprintf(_T(" incoming errors:\t\t%d\n"), TcpStatsMIB.dwInErrs); - _tprintf(_T(" outgoing resets:\t\t%d\n"), TcpStatsMIB.dwOutRsts); - _tprintf(_T(" cumulative connections:\t\t%d\n"), TcpStatsMIB.dwNumConns); + _tprintf(_T(" time-out algorithm:\t\t%d\n"), TcpStatsMIB.dwRtoAlgorithm); + _tprintf(_T(" minimum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMin); + _tprintf(_T(" maximum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMax); + _tprintf(_T(" maximum connections:\t\t%d\n"), TcpStatsMIB.dwMaxConn); + _tprintf(_T(" active opens:\t\t\t%d\n"), TcpStatsMIB.dwActiveOpens); + _tprintf(_T(" passive opens:\t\t\t%d\n"), TcpStatsMIB.dwPassiveOpens); + _tprintf(_T(" failed attempts:\t\t%d\n"), TcpStatsMIB.dwAttemptFails); + _tprintf(_T(" established connections reset:\t%d\n"), TcpStatsMIB.dwEstabResets); + _tprintf(_T(" established connections:\t%d\n"), TcpStatsMIB.dwCurrEstab); + _tprintf(_T(" segments received:\t\t%d\n"), TcpStatsMIB.dwInSegs); + _tprintf(_T(" segment sent:\t\t\t%d\n"), TcpStatsMIB.dwOutSegs); + _tprintf(_T(" segments retransmitted:\t\t%d\n"), TcpStatsMIB.dwRetransSegs); + _tprintf(_T(" incoming errors:\t\t%d\n"), TcpStatsMIB.dwInErrs); + _tprintf(_T(" outgoing resets:\t\t%d\n"), TcpStatsMIB.dwOutRsts); + _tprintf(_T(" cumulative connections:\t\t%d\n"), TcpStatsMIB.dwNumConns); }
static void ShowUdpStatistics() @@ -90,7 +90,7 @@
_tprintf(_T("UDP Statistics\t\n")); _tprintf(_T(" received datagrams:\t\t\t%d\n"), UDPStatsMIB.dwInDatagrams); - _tprintf(_T(" datagrams for which no port exists:\t%d\n"), UDPStatsMIB.dwNoPorts); + _tprintf(_T(" datagrams for which no port exists:\t%d\n"), UDPStatsMIB.dwNoPorts); _tprintf(_T(" errors on received datagrams:\t\t%d\n"), UDPStatsMIB.dwInErrors); _tprintf(_T(" sent datagrams:\t\t\t\t%d\n"), UDPStatsMIB.dwOutDatagrams); _tprintf(_T(" number of entries in listener table:\t%d\n"), UDPStatsMIB.dwNumAddrs); @@ -102,27 +102,27 @@ GetIpStatistics(&IPStatsMIB);
_tprintf(_T("IP Statistics\t\n")); - _tprintf(_T(" IP forwarding enabled or disabled:\t%d\n"), IPStatsMIB.dwForwarding); - _tprintf(_T(" default time-to-live:\t\t\t%d\n"), IPStatsMIB.dwDefaultTTL); - _tprintf(_T(" datagrams received:\t\t\t%d\n"), IPStatsMIB.dwInReceives); - _tprintf(_T(" received header errors:\t\t\t%d\n"), IPStatsMIB.dwInHdrErrors); - _tprintf(_T(" received address errors:\t\t%d\n"), IPStatsMIB.dwInAddrErrors); - _tprintf(_T(" datagrams forwarded:\t\t\t%d\n"), IPStatsMIB.dwForwDatagrams); - _tprintf(_T(" datagrams with unknown protocol:\t%d\n"), IPStatsMIB.dwInUnknownProtos); - _tprintf(_T(" received datagrams discarded:\t\t%d\n"), IPStatsMIB.dwInDiscards); - _tprintf(_T(" received datagrams delivered:\t\t%d\n"), IPStatsMIB.dwInDelivers); - _tprintf(_T(" sent datagrams discarded:\t\t%d\n"), IPStatsMIB.dwOutDiscards); - _tprintf(_T(" datagrams for which no route exists:\t%d\n"), IPStatsMIB.dwOutNoRoutes); - _tprintf(_T(" datagrams for which frags didn't arrive:%d\n"), IPStatsMIB.dwReasmTimeout); - _tprintf(_T(" datagrams requiring reassembly:\t\t%d\n"), IPStatsMIB.dwReasmReqds); - _tprintf(_T(" successful reassemblies:\t\t%d\n"), IPStatsMIB.dwReasmOks); - _tprintf(_T(" failed reassemblies:\t\t\t%d\n"), IPStatsMIB.dwReasmFails); - _tprintf(_T(" successful fragmentations:\t\t%d\n"), IPStatsMIB.dwFragOks); - _tprintf(_T(" failed fragmentations:\t\t\t%d\n"), IPStatsMIB.dwFragFails); - _tprintf(_T(" datagrams fragmented:\t\t\t%d\n"), IPStatsMIB.dwFragCreates); - _tprintf(_T(" number of interfaces on computer:\t%d\n"), IPStatsMIB.dwNumIf); - _tprintf(_T(" number of IP address on computer:\t%d\n"), IPStatsMIB.dwNumAddr); - _tprintf(_T(" number of routes in routing table:\t%d\n"), IPStatsMIB.dwNumRoutes); + _tprintf(_T(" IP forwarding enabled or disabled:\t%d\n"), IPStatsMIB.dwForwarding); + _tprintf(_T(" default time-to-live:\t\t\t%d\n"), IPStatsMIB.dwDefaultTTL); + _tprintf(_T(" datagrams received:\t\t\t%d\n"), IPStatsMIB.dwInReceives); + _tprintf(_T(" received header errors:\t\t\t%d\n"), IPStatsMIB.dwInHdrErrors); + _tprintf(_T(" received address errors:\t\t%d\n"), IPStatsMIB.dwInAddrErrors); + _tprintf(_T(" datagrams forwarded:\t\t\t%d\n"), IPStatsMIB.dwForwDatagrams); + _tprintf(_T(" datagrams with unknown protocol:\t%d\n"), IPStatsMIB.dwInUnknownProtos); + _tprintf(_T(" received datagrams discarded:\t\t%d\n"), IPStatsMIB.dwInDiscards); + _tprintf(_T(" received datagrams delivered:\t\t%d\n"), IPStatsMIB.dwInDelivers); + _tprintf(_T(" sent datagrams discarded:\t\t%d\n"), IPStatsMIB.dwOutDiscards); + _tprintf(_T(" datagrams for which no route exists:\t%d\n"), IPStatsMIB.dwOutNoRoutes); + _tprintf(_T(" datagrams for which frags didn't arrive:%d\n"), IPStatsMIB.dwReasmTimeout); + _tprintf(_T(" datagrams requiring reassembly:\t\t%d\n"), IPStatsMIB.dwReasmReqds); + _tprintf(_T(" successful reassemblies:\t\t%d\n"), IPStatsMIB.dwReasmOks); + _tprintf(_T(" failed reassemblies:\t\t\t%d\n"), IPStatsMIB.dwReasmFails); + _tprintf(_T(" successful fragmentations:\t\t%d\n"), IPStatsMIB.dwFragOks); + _tprintf(_T(" failed fragmentations:\t\t\t%d\n"), IPStatsMIB.dwFragFails); + _tprintf(_T(" datagrams fragmented:\t\t\t%d\n"), IPStatsMIB.dwFragCreates); + _tprintf(_T(" number of interfaces on computer:\t%d\n"), IPStatsMIB.dwNumIf); + _tprintf(_T(" number of IP address on computer:\t%d\n"), IPStatsMIB.dwNumAddr); + _tprintf(_T(" number of routes in routing table:\t%d\n"), IPStatsMIB.dwNumRoutes); }
static void ShowNetworkParams() @@ -262,20 +262,20 @@ // Translate port numbers into their text equivalent if there is one // PCHAR -GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen) +GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen) { struct servent *psrvent;
if (Flags & FLAG_SHOW_NUMBERS) { sprintf(name, "%d", htons((WORD)port)); return name; - } + } // Try to translate to a name if (psrvent = getservbyport(port, proto)) { strcpy(name, psrvent->s_name ); } else { sprintf(name, "%d", htons((WORD)port)); - } + } return name; }
@@ -286,7 +286,7 @@ // Translate IP addresses into their name-resolved form if possible. // PCHAR -GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen) +GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen) { // struct hostent *phostent; UINT nipaddr; @@ -294,7 +294,7 @@ // Does the user want raw numbers? nipaddr = htonl(ipaddr); if (Flags & FLAG_SHOW_NUMBERS ) { - sprintf(name, "%d.%d.%d.%d", + sprintf(name, "%d.%d.%d.%d", (nipaddr >> 24) & 0xFF, (nipaddr >> 16) & 0xFF, (nipaddr >> 8) & 0xFF, @@ -307,7 +307,7 @@ // Try to translate to a name if (!ipaddr) { if (!local) { - sprintf(name, "%d.%d.%d.%d", + sprintf(name, "%d.%d.%d.%d", (nipaddr >> 24) & 0xFF, (nipaddr >> 16) & 0xFF, (nipaddr >> 8) & 0xFF, @@ -339,7 +339,7 @@
sprintf(name, "%d.%d.%d.%d", i1,i2,i3,i4); #else - sprintf(name, "%d.%d.%d.%d", + sprintf(name, "%d.%d.%d.%d", ((nipaddr >> 24) & 0x000000FF), ((nipaddr >> 16) & 0x000000FF), ((nipaddr >> 8) & 0x000000FF), @@ -360,10 +360,10 @@
// // GetOptions -// +// // Parses the command line arguments. // -BOOLEAN +BOOLEAN GetOptions(int argc, char *argv[], PDWORD pFlags) { int i, j; @@ -466,12 +466,12 @@ for (i = 0; i < tcpTable->dwNumEntries; i++) { if (flags & FLAG_SHOW_ALL_ENDPOINTS || tcpTable->table[i].dwState == MIB_TCP_STATE_ESTAB) { - sprintf(localaddr, "%s:%s", - GetIpHostName(flags, TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), + sprintf(localaddr, "%s:%s", + GetIpHostName(flags, TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), GetPortName(flags, tcpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); sprintf(remoteaddr, "%s:%s", - GetIpHostName(flags, FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN), - tcpTable->table[i].dwRemoteAddr ? + GetIpHostName(flags, FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN), + tcpTable->table[i].dwRemoteAddr ? GetPortName(flags, tcpTable->table[i].dwRemotePort, "tcp", remoteport, PORTNAMELEN): "0"); printf("%4s\tState: %s\n", "[TCP]", TcpState[tcpTable->table[i].dwState]); @@ -481,14 +481,14 @@ // Dump the UDP table if (flags & FLAG_SHOW_ALL_ENDPOINTS) { for (i = 0; i < udpTable->dwNumEntries; i++) { - sprintf(localaddr, "%s:%s", - GetIpHostName(flags, TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), + sprintf(localaddr, "%s:%s", + GetIpHostName(flags, TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), GetPortName(flags, udpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); printf("%4s", "[UDP]"); printf(" Local: %s\n Remote: %s\n", localaddr, "*.*.*.*:*"); } } - } + } printf("\n"); return 0; } _____
Modified: trunk/reactos/apps/utils/net/netstat/trace.c --- trunk/reactos/apps/utils/net/netstat/trace.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/netstat/trace.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////// ///// // Diagnostic Trace // -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #define WIN32_LEAN_AND_MEAN #include <windows.h> _____
Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -306,10 +306,10 @@
PHOSTENT phe;
wVersionRequested = MAKEWORD(2, 2); - + Status = WSAStartup(wVersionRequested, &WsaData); if (Status != 0) { - printf("Could not initialize winsock dll.\n"); + printf("Could not initialize winsock dll.\n"); return FALSE; }
@@ -327,9 +327,9 @@ if (phe == NULL) { printf("Unknown host %s.\n", TargetName); return FALSE; - } + } } - + if (phe != NULL) { CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length); } else { @@ -341,7 +341,7 @@ } else { Target.sin_family = AF_INET; } - + TargetIP = inet_ntoa(Target.sin_addr); CurrentSeqNum = 0; SentCount = 0; @@ -391,7 +391,7 @@ LARGE_INTEGER LargeTime;
LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart; - + _i64toa(LargeTime.QuadPart, Convstr, 10); strcpy(String, Convstr); strcat(String, "ms"); @@ -449,7 +449,7 @@ }
- printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), + printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); if (RelativeTime.QuadPart < MinRTT.QuadPart) { MinRTT.QuadPart = RelativeTime.QuadPart; @@ -586,7 +586,7 @@
printf("\nPinging %s [%s] with %d bytes of data:\n\n", TargetName, TargetIP, DataSize); - + Count = 0; while ((NeverStop) || (Count < PingCount)) { Ping(); _____
Modified: trunk/reactos/apps/utils/net/roshttpd/include/list.h --- trunk/reactos/apps/utils/net/roshttpd/include/list.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/roshttpd/include/list.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -25,7 +25,7 @@
CListNode *GetPrev(); private: PVOID Element; - CListNode *Next; + CListNode *Next; CListNode *Prev; static HANDLE hHeap; static INT nRef; @@ -37,7 +37,7 @@ CList(); ~CList(); CList& operator=(CList&); - + CIterator<Item> *CreateIterator() const; LONG Count() const; Item& Get(const LONG index) const; @@ -82,7 +82,7 @@ // Default destructor template <class Item> CList<Item>::~CList() -{ +{ RemoveAll(); delete Trailer; delete Header; @@ -157,7 +157,7 @@ tmp = node->GetNext(); delete node; node = tmp; - } + } Header->SetNext(Trailer); Trailer->SetPrev(Header); NodeCount = 0; _____
Modified: trunk/reactos/apps/utils/net/route/route.c --- trunk/reactos/apps/utils/net/route/route.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/route/route.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -20,7 +20,7 @@
#define IN_ADDR_OF(x) *((struct in_addr *)&(x))
int usage() { - fprintf( stderr, + fprintf( stderr, "route usage:\n" "route print\n" " prints the route table\n" @@ -35,7 +35,7 @@ PMIB_IPFORWARDTABLE IpForwardTable; DWORD Error; ULONG Size = 0; - char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], + char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], Index[IPBUF], Metric[IPBUF]; int i;
@@ -46,7 +46,7 @@ }
if( Error == ERROR_SUCCESS ) { - printf( "%-16s%-16s%-16s%-10s%-10s\n", + printf( "%-16s%-16s%-16s%-10s%-10s\n", "Destination", "Netmask", "Gateway", @@ -63,7 +63,7 @@ inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i]. dwForwardNextHop) ) );
- printf( "%-16s%-16s%-16s%-10d%-10d\n", + printf( "%-16s%-16s%-16s%-10d%-10d\n", Destination, Netmask, Gateway, @@ -80,7 +80,7 @@ } }
-int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, +int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, int argc, char **argv ) { int i;
@@ -106,7 +106,7 @@ DWORD Error;
if( argc < 2 || !convert_add_cmd_line( &RowToAdd, argc, argv ) ) { - fprintf( stderr, + fprintf( stderr, "route add usage:\n" "route add <target> [mask <mask>] <gw> [metric <m>]\n" " Adds a route to the IP route table.\n" @@ -116,10 +116,10 @@ " <m> is the metric to use (lower is preferred)\n" ); return 1; } - - if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS ) + + if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS ) return 0; - + fprintf( stderr, "Route addition failed\n" ); return Error; } @@ -129,7 +129,7 @@ DWORD Error;
if( argc < 2 || !convert_add_cmd_line( &RowToDel, argc, argv ) ) { - fprintf( stderr, + fprintf( stderr, "route delete usage:\n" "route delete <target> <gw>\n" " Removes a route from the IP route table.\n" @@ -137,21 +137,21 @@ " <gw> is the gateway to remove the route from.\n" ); return 1; } - - if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS ) + + if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS ) return 0; - + fprintf( stderr, "Route addition failed\n" ); return Error; }
int main( int argc, char **argv ) { if( argc < 2 ) return usage(); - else if( !strcasecmp( argv[1], "print" ) ) + else if( !strcasecmp( argv[1], "print" ) ) return print_routes(); - else if( !strcasecmp( argv[1], "add" ) ) + else if( !strcasecmp( argv[1], "add" ) ) return add_route( argc-2, argv+2 ); - else if( !strcasecmp( argv[1], "delete" ) ) + else if( !strcasecmp( argv[1], "delete" ) ) return del_route( argc-2, argv+2 ); else return usage(); } _____
Modified: trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h --- trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/resource/tnmsg.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -97,7 +97,7 @@
#define MSG_WSANO_DATA 0x2AFC
// Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 _____
Modified: trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h --- trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/ansiprsr.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -49,7 +49,7 @@
void SaveCurY(int iY);
void resetTabStops(); - + int iSavedCurX; int iSavedCurY; unsigned char iSavedAttributes; @@ -77,7 +77,7 @@ TANSIParser(TConsole &Console, KeyTranslator &RefKeyTrans, TScroller &RefScroller, TNetwork &NetHandler, TCharmap &RefCharmap); ~TANSIParser(); - + char* ParseBuffer(char* pszBuffer, char* pszBufferEnd); static int StripBuffer(char* pszBuffer, char* pszBufferEnd, int width); }; _____
Modified: trunk/reactos/apps/utils/net/telnet/src/keytrans.h --- trunk/reactos/apps/utils/net/telnet/src/keytrans.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/keytrans.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -93,5 +93,5 @@
int currentKeyMap, mainKeyMap; // AVS
}; - + #endif // __KEYTRANS_H _____
Modified: trunk/reactos/apps/utils/net/telnet/src/stl_bids.h --- trunk/reactos/apps/utils/net/telnet/src/stl_bids.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/stl_bids.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -29,36 +29,36 @@
growable(delta), lowerbound(lower) { vector<T>::reserve(upper-lower + 1);} - + ~TArrayAsVector( ) { // This call is unnecessary? (Paul Brannan 5/7/98) // vector<T>::~vector( ); } - + int Add(const T& item) { if(!growable && vector<T>::size( ) == vector<T>::capacity( )) return 0; else insert(vector<T>::end( ), item); return 1; } - + int AddAt(const T& item, size_type index) { if(!growable && ((vector<T>::size( ) == vector<T>::capacity( )) || (ZeroBase(index > vector<T>::capacity( )) ))) return 0; if(ZeroBase(index) > vector<T>::capacity( )) // out of bounds - { insert(vector<T>::end( ), + { insert(vector<T>::end( ), ZeroBase(index) - vector<T>::size( ), T( )); insert(vector<T>::end( ), item); } else { insert(vector<T>::begin( ) + ZeroBase(index), item); } return 1; } - + size_type ArraySize( ) { return vector<T>::capacity( ); } - + size_type BoundBase(size_type location) const { if(location == UINT_MAX) return INT_MAX; @@ -66,44 +66,44 @@ return location + lowerbound; } void Detach(size_type index) { erase(vector<T>::begin( ) + ZeroBase(index)); } - + void Detach(const T& item) { Destroy(Find(item)); } - + void Destroy(size_type index) { erase(vector<T>::begin( ) + ZeroBase(index)); } - + void Destroy(const T& item) { Destroy(Find(item)); } - + size_type Find(const T& item) const - { const_iterator location = find(vector<T>::begin( ), + { const_iterator location = find(vector<T>::begin( ), vector<T>::end( ), item); if(location != vector<T>::end( )) - return BoundBase(size_type(location - + return BoundBase(size_type(location - vector<T>::begin( ))); else return INT_MAX; } - + size_type GetItemsInContainer( ) { return vector<T>::size( ); } - + void Grow(size_type index) { if( index < lowerbound ) - Reallocate(ArraySize( ) + (index - + Reallocate(ArraySize( ) + (index - lowerbound)); else if( index >= BoundBase(vector<T>::size( ))) Reallocate(ZeroBase(index) ); } - + int HasMember(const T& item) { if(Find(item) != INT_MAX) return 1; else return 0; } - + int IsEmpty( ) { return vector<T>::empty( ); } - + int IsFull( ) { if(growable) return 0; @@ -111,42 +111,42 @@ return 1; else return 0; } - + size_type LowerBound( ) { return lowerbound; } - + T& operator[] (size_type index) { return vector<T>:: operator[](ZeroBase(index)); } - + const T& operator[] (size_type index) const { return vector<T>:: operator[](ZeroBase(index)); } - + void Flush( ) { vector<T>::clear(); } - - void Reallocate(size_type sz, + + void Reallocate(size_type sz, size_type offset = 0) { if(offset) insert(vector<T>::begin( ), offset, T( )); vector<T>::reserve(sz); erase(vector<T>::end( ) - offset, vector<T>::end( )); } - + void RemoveEntry(size_type index) { Detach(index); } - + void SetData(size_type index, const T& item) { (*this)[index] = item; } - + size_type UpperBound( ) { return BoundBase(vector<T>::capacity( )) - 1; } - + size_type ZeroBase(size_type index) const { return index - lowerbound; } - + // The assignment operator is not inherited (Paul Brannan 5/25/98) TArrayAsVector& operator=(const TArrayAsVector& v) { vector<T>::operator=(v); _____
Modified: trunk/reactos/apps/utils/net/telnet/src/tconsole.h --- trunk/reactos/apps/utils/net/telnet/src/tconsole.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tconsole.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -25,9 +25,9 @@
* | . | | | * | . | <-- OR --> | | * | . | | | - * CON_LEFT | . | CON_RIGHT | + * CON_LEFT | . | CON_RIGHT | * (=0) | . | (=CON_ | CON_LINES - * |..............* | WIDTH) | + * |..............* | WIDTH) | * | (CON_CUR_X, | | | * | CON_CUR_Y) | | | * | | | | @@ -77,15 +77,15 @@ void SetCursorPosition(int x, int y); void SetCursorSize(int pct); void MoveCursorPosition(int x, int y); - + // Screen mode/size routines int GetWidth() {return CON_COLS;} int GetHeight() {return CON_LINES;} void SetExtendedMode(int iFunction, BOOL bEnable); void SetWindowSize(int width, int height); // Set the size of the window,
// but not the buffer - - // Color/attribute routines + + // Color/attribute routines void SetAttrib(unsigned char wAttr) {wAttributes = wAttr;} unsigned char GetAttrib() {return wAttributes;} void Normal(); // Reset all attributes @@ -130,13 +130,13 @@ void index(); void reverse_index(); void setLineWrap(bool bEnabled){ - if(!ini.get_lock_linewrap()) + if(!ini.get_lock_linewrap()) ini.set_value("Wrap_Line", bEnabled ? "true" : "false"); } bool getLineWrap() {return ini.get_wrapline();}
// Insert/delete characters/lines - void InsertLine(int numlines); // Added by Titus von Boxberg 30/3/97 + void InsertLine(int numlines); // Added by Titus von Boxberg 30/3/97 void InsertCharacter(int numchar); // " void DeleteCharacter(int numchar); // " void InsertMode(int i) {insert_mode = i;} @@ -148,7 +148,7 @@ HANDLE hConsole;
CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; - + unsigned char wAttributes; unsigned char fg, bg; unsigned char defaultfg, defaultbg; @@ -157,7 +157,7 @@ bool blink; bool underline; bool reverse; - + int iScrollStart; int iScrollEnd; int insert_mode; _____
Modified: trunk/reactos/apps/utils/net/telnet/src/tkeydef.h --- trunk/reactos/apps/utils/net/telnet/src/tkeydef.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tkeydef.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -39,20 +39,20 @@
KeyDefType uKeyDef; DWORD vk_code; DWORD dwState; - + public: TKeyDef(); TKeyDef(char *def, DWORD state, DWORD code); TKeyDef(optype op, DWORD state, DWORD code); TKeyDef(const TKeyDef &t); - + char *operator=(char *def); DWORD operator=(DWORD code); TKeyDef& operator=(const TKeyDef &t); const optype& operator=(optype op); - + ~TKeyDef(); - + #ifdef __BORLANDC__ int operator==(TKeyDef &t); #else @@ -61,7 +61,7 @@ friend bool operator==(const TKeyDef &t1, const TKeyDef &t2); friend bool operator<(const TKeyDef &t1, const TKeyDef &t2); #endif - + const char *GetszKey() { return uKeyDef.szKeyDef; } const KeyDefType GetKeyDef() { return uKeyDef; } DWORD GetCodeKey() { return vk_code; } _____
Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.h --- trunk/reactos/apps/utils/net/telnet/src/tnclass.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tnclass.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -26,7 +26,7 @@
int Open(const char *szHost, const char *strPort = "23"); int Close(); // close current connection int Resume(); // resume current session - + // changes to the keymap profile in the file int LoadKeyMap( const char * file, const char * name); void DisplayKeyMap(); // display available keymaps @@ -35,7 +35,7 @@ SOCKET Connect(); void telSetConsoleTitle(const char * szHost); void DoInit(); - + SOCKET Socket; char strPort[32]; // int iPort; char szHost[127]; _____
Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.h --- trunk/reactos/apps/utils/net/telnet/src/tnmisc.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tnmisc.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -2,7 +2,7 @@
#define __TNMISC_H
// Process-related functions -BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi, +BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi, LPHANDLE phInWrite, LPHANDLE phOutRead, LPHANDLE phErrRead); BOOL SpawnProcess(char *cmd_line, PROCESS_INFORMATION *pi); _____
Modified: trunk/reactos/apps/utils/net/telnet/src/tnmsg.h --- trunk/reactos/apps/utils/net/telnet/src/tnmsg.h 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/telnet/src/tnmsg.h 2005-05-08 04:22:15 UTC (rev 15112) @@ -97,7 +97,7 @@
#define MSG_WSANO_DATA 0x2AFC
// Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 _____
Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-05-08 04:07:56 UTC (rev 15111) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-05-08 04:22:15 UTC (rev 15112) @@ -222,7 +222,7 @@
#include <stdlib.h> #include <string.h> #include <unistd.h> - [truncated at 1000 lines; 1095 more skipped]