removed empty lines

svn path=/trunk/boinc/; revision=480

client/win/hostinfo_win.cpp

@@ -1,298 +1,150 @@
 // The contents of this file are subject to the Mozilla Public License
-
 // Version 1.0 (the "License"); you may not use this file except in
-
 // compliance with the License. You may obtain a copy of the License at
-
 // http://www.mozilla.org/MPL/ 
-
 // 
-
 // Software distributed under the License is distributed on an "AS IS"
-
 // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-
 // License for the specific language governing rights and limitations
-
 // under the License. 
-
 // 
-
 // The Original Code is the Berkeley Open Infrastructure for Network Computing. 
-
 // 
-
 // The Initial Developer of the Original Code is the SETI@home project.
-
 // Portions created by the SETI@home project are Copyright (C) 2002
-
 // University of California at Berkeley. All Rights Reserved. 
-
 // 
-
 // Contributor(s):
-
 //
 
-
-
 #include <afxwin.h>
-
 #include "client_types.h"
 
-
-
 extern int get_local_domain_name(char* p);
-
 extern int get_local_ip_addr_str(char* p);
 
-
-
 // Gets windows specific host information (not complete)
-
 //
-
 int get_host_info2(HOST_INFO& host) {
-
     OSVERSIONINFO OSVersionInfo;
-
     memset( &OSVersionInfo, NULL, sizeof( OSVersionInfo ) );
-
     OSVersionInfo.dwOSVersionInfoSize = sizeof( OSVersionInfo );
-
     ::GetVersionEx( &OSVersionInfo );
-
     switch ( OSVersionInfo.dwPlatformId ) {
-
     case VER_PLATFORM_WIN32s:
-
         strcpy( host.os_name, "Windows 3.1/Win32s" ); // does ANYBODY use this anymore?
-
         break;
-
     case VER_PLATFORM_WIN32_WINDOWS:
-
         if ( OSVersionInfo.dwMajorVersion > 4
-
 	        || ( OSVersionInfo.dwMajorVersion == 4
-
 	        && OSVersionInfo.dwMinorVersion >= 90 ) )
-
         {
-
             strcpy( host.os_name, "Windows Me" );
-
         }
-
 		else if ( OSVersionInfo.dwMajorVersion == 4
-
             && OSVersionInfo.dwMinorVersion >= 10 )
-
 		{
-
             strcpy( host.os_name, "Windows 98" );
-
         }
-
 		else
-
 		{
-
             strcpy( host.os_name, "Windows 95" );
-
         }
-
         break;
 
-
-
     case VER_PLATFORM_WIN32_NT:
-
 		if ( OSVersionInfo.dwMajorVersion > 5
-
             || (OSVersionInfo.dwMajorVersion == 5
-
             && OSVersionInfo.dwMinorVersion >= 2) )
-
 		{
-
 		    strcpy( host.os_name, "Windows .NET Server" );
-
 		}
-
 		else if (OSVersionInfo.dwMajorVersion == 5
-
 			&& OSVersionInfo.dwMinorVersion == 1)
-
 		{
-
 		    strcpy( host.os_name, "Windows XP" );
-
 		}
-
 		else if (OSVersionInfo.dwMajorVersion == 5
-
 			&& OSVersionInfo.dwMinorVersion == 0)
-
 		{
-
 		    strcpy( host.os_name, "Windows 2000" );
-
 		}
-
 		else if (OSVersionInfo.dwMajorVersion == 4
-
 			&& OSVersionInfo.dwMinorVersion == 0)
-
 		{
-
 		    strcpy( host.os_name, "Windows NT 4.0" );
-
 		}
-
 		else if (OSVersionInfo.dwMajorVersion == 3
-
 			&& OSVersionInfo.dwMinorVersion == 51)
-
 		{
-
 		    strcpy( host.os_name, "Windows NT 3.51" );
-
 		}
-
 		else
-
 		{
-
             strcpy( host.os_name, "Windows NT" );
-
         }
-
         break;
 
-
-
     default:
-
         sprintf( host.os_name, "Unknown Win32 (%ld)", OSVersionInfo.dwPlatformId );
-
         break;
-
     }
 
-
-
     char Version[ 25 ];
-
     Version[ 0 ] = NULL;
-
     sprintf(
-
 	Version, ": %lu.%lu", OSVersionInfo.dwMajorVersion,
-
         OSVersionInfo.dwMinorVersion
-
     );
-
     strcat( host.os_name, Version );
 
-
-
     SYSTEM_INFO SystemInfo;
-
     memset( &SystemInfo, NULL, sizeof( SystemInfo ) );
-
     ::GetSystemInfo( &SystemInfo );
 
-
-
     host.p_ncpus = SystemInfo.dwNumberOfProcessors;
 
-
-
     switch ( SystemInfo.wProcessorArchitecture ) {
-
         case PROCESSOR_ARCHITECTURE_INTEL:
-
         switch ( SystemInfo.dwProcessorType ) {
-
             case PROCESSOR_INTEL_386:
-
                 strcpy( host.p_model, "Intel 80386" );
-
                 break;
-
             case PROCESSOR_INTEL_486:
-
                 strcpy( host.p_model, "Intel 80486" );
-
                 break;
-
             case PROCESSOR_INTEL_PENTIUM:
-
                 strcpy( host.p_model, "Intel Pentium" );
-
                 break;
-
             default:
-
                 strcpy( host.p_model, "Intel x86" );
-
                 break;
-
             }
-
         break;
 
-
-
         case PROCESSOR_ARCHITECTURE_MIPS:
-
             strcpy( host.p_model, "MIPS" );
-
             break;
 
-
-
         case PROCESSOR_ARCHITECTURE_ALPHA:
-
             strcpy( host.p_model, "Alpha" );
-
             break;
 
-
-
         case PROCESSOR_ARCHITECTURE_PPC:
-
             strcpy( host.p_model, "Power PC" );
-
             break;
 
-
-
         case PROCESSOR_ARCHITECTURE_UNKNOWN:
-
         default:
-
             strcpy( host.p_model, "Unknown" );
-
             break;
-
     }
-
         
-
     memset(&host, 0, sizeof(host));
-
       
-
     get_local_domain_name(host.domain_name);
-
     get_local_ip_addr_str(host.ip_addr);
 
-
-
     return 0;
-
 }
 

client/win/win_main.cpp

@@ -1,93 +1,47 @@
 // The contents of this file are subject to the Mozilla Public License
-
 // Version 1.0 (the "License"); you may not use this file except in
-
 // compliance with the License. You may obtain a copy of the License at
-
 // http://www.mozilla.org/MPL/ 
-
 // 
-
 // Software distributed under the License is distributed on an "AS IS"
-
 // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-
 // License for the specific language governing rights and limitations
-
 // under the License. 
-
 // 
-
 // The Original Code is the Berkeley Open Infrastructure for Network Computing. 
-
 // 
-
 // The Initial Developer of the Original Code is the SETI@home project.
-
 // Portions created by the SETI@home project are Copyright (C) 2002
-
 // University of California at Berkeley. All Rights Reserved. 
-
 // 
-
 // Contributor(s):
-
 //
 
-
-
 #include <afxwin.h>
 
-
-
 #include "win_net.h"
 
-
-
 #ifdef WIN_CLI
-
 extern int main(int argc, char** argv);
 
-
-
 int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMode )
-
 {
-
 	LPWSTR command_line;
-
 	LPWSTR *args;
-
 	char* argv[100];
-
 	int i, argc;
 
-
-
 	NetOpen();
-
 	command_line = GetCommandLineW();
-
 	args = CommandLineToArgvW(command_line, &argc);
 
-
-
 	// uh, why did MS have to "improve" on char*?
 
-
-
 	for (i=0; i<argc; i++) {
-
 		argv[i] = (char*)args[i];
-
 	}
-
 	main(argc, argv);
 
-
-
 	return 0;
-
 }
-
+#endif
-#endif