[NeoStats-Devel] NeoStats [Commits] r3056 - in /trunk/src: exclude.c misc.c modes.c win32/winmain.c

Author: Mark
Date: Thu Dec 21 07:46:39 2006
New Revision: 3056

URL: http://svn.neostats.net/cgi-bin/viewvc.cgi?rev=3056&root=NeoStats&view=rev
Log:
win32 compile fixes and nonboolean test fixes

Modified:
    trunk/src/exclude.c
    trunk/src/misc.c
    trunk/src/modes.c
    trunk/src/win32/winmain.c

Modified: trunk/src/exclude.c
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/src/exclude.c?rev=3056&root=NeoStats&r1=3055&r2=3056&view=diff
==============================================================================
--- trunk/src/exclude.c (original)
+++ trunk/src/exclude.c Thu Dec 21 07:46:39 2006
@@ -44,7 +44,7 @@
 	NS_EXCLUDE_SERVER,
 	NS_EXCLUDE_CHANNEL,
 	NS_EXCLUDE_USERHOST,
-	NS_EXCLUDE_LIMIT,
+	NS_EXCLUDE_LIMIT
 	/* NS_EXCLUDE_MAX = ( NS_EXCLUDE_LIMIT - 1 ) */
 } NS_EXCLUDE;
 

Modified: trunk/src/misc.c
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/src/misc.c?rev=3056&root=NeoStats&r1=3055&r2=3056&view=diff
==============================================================================
--- trunk/src/misc.c (original)
+++ trunk/src/misc.c Thu Dec 21 07:46:39 2006
@@ -95,9 +95,9 @@
 {
 	char *c = line;
 
-	if( ( c = strchr( line, '\n' ) ) )
+	if( ( c = strchr( line, '\n' ) ) != NULL )
 		*c = '\0';
-	if( ( c = strchr( line, '\r' ) ) )
+	if( ( c = strchr( line, '\r' ) ) != NULL )
 		*c = '\0';
 }
 
@@ -137,7 +137,7 @@
 	t = s;
 	while( *t != '\0' )
 	{
-		*t = tolower( *t );
+		*t = ( char ) tolower( *t );
 		t++;
 	}
 	return s;
@@ -418,7 +418,7 @@
 	char *s, *c;
 
 	s = ctime( &stuff );
-	if( ( c = strchr( s, '\n' ) ) )
+	if( ( c = strchr( s, '\n' ) ) != NULL )
 		*c = '\0';
 
 	return s;

Modified: trunk/src/modes.c
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/src/modes.c?rev=3056&root=NeoStats&r1=3055&r2=3056&view=diff
==============================================================================
--- trunk/src/modes.c (original)
+++ trunk/src/modes.c Thu Dec 21 07:46:39 2006
@@ -158,8 +158,8 @@
 {
     int bitcount = 0;
 	
-	while( ( mask >>= 1 ) )
-		bitcount ++;
+	while( ( mask >>= 1 ) != 0 )
+		bitcount++;
 	if( bitcount < 31 )
 		mode_char_map[bitcount] = mode;
 }
@@ -249,7 +249,7 @@
  *  @return string of modes represented by mask
  */
 
-static char *ModeMaskToString( const mode_data *mode_table, const unsigned int mask ) 
+static char *ModeMaskToString( const mode_data *mode_table, unsigned int mask ) 
 {
 	int i, j;
 
@@ -487,7 +487,7 @@
 {
     int bitcount = 0;
 	
-	while( ( mask >>= 1 ) ) 
+	while( ( mask >>= 1 ) != 0 ) 
 		bitcount++;
     return mode_char_map[bitcount];
 }
@@ -618,7 +618,7 @@
  *  @return string describing mode
  */
 
-static const char *get_mode_desc( ModeDesc *desc, unsigned int mask )
+static const char *get_mode_desc( const ModeDesc *desc, unsigned int mask )
 {
 	while( desc->mask != 0 )
 	{

Modified: trunk/src/win32/winmain.c
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/src/win32/winmain.c?rev=3056&root=NeoStats&r1=3055&r2=3056&view=diff
==============================================================================
--- trunk/src/win32/winmain.c (original)
+++ trunk/src/win32/winmain.c Thu Dec 21 07:46:39 2006
@@ -23,18 +23,16 @@
 
 #include <winsock2.h>
 #include <windows.h>
-#include <windowsx.h>
 #include <process.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
-#include <shlwapi.h>
 
 #include "resource.h"
 
-#define	WM_USER_SHELLICON WM_USER + 1 
-
-extern int neostats();
+#define	WM_USER_SHELLICON ( WM_USER + 1 )
+
+extern int neostats( void );
 extern void read_loop();
 extern void do_exit( int exitcode, char *quitmsg );
 
@@ -76,13 +74,14 @@
 }
 #endif
 
-static void ErrorMessageBox( char* error )
+static void ErrorMessageBox( const char *error )
 {
 	MessageBox( NULL, error, szNeoStatsErrorTitle, MB_ICONEXCLAMATION | MB_OK );
 }
 
 static INT_PTR CALLBACK AboutDialogProc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {
+	(void)lparam; //argsused
 	switch (msg)
 	{
 		case WM_INITDIALOG:
@@ -94,10 +93,14 @@
 				case IDOK:
 					EndDialog(hwndDlg, TRUE);
 					return TRUE;
-			}
-			break;
-
-			case WM_DESTROY:
+				default:
+					break;
+			}
+			break;
+
+		case WM_DESTROY:
+			break;
+		default:
 			break;
 	}
 
@@ -106,6 +109,7 @@
 
 static INT_PTR CALLBACK DialogProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
 {
+	(void)lParam; //argsused
     switch( message )
     {
 		case WM_INITDIALOG:
@@ -137,6 +141,8 @@
 					TrackPopupMenu( hTrayPopMenu, TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_BOTTOMALIGN, TrayPoint.x, TrayPoint.y, 0, hDialog, NULL);
 					SendMessage( hDialog, WM_NULL, 0, 0 );			
 					return TRUE; 
+				default:
+					break;
 			} 
 			break; 
 
@@ -168,6 +174,8 @@
 					Shell_NotifyIcon( NIM_DELETE, &nsNotifyIconData );
 					DestroyWindow( hwnd );
 					break;
+				default:
+					break;
 			}
 
 			return TRUE;
@@ -197,16 +205,21 @@
 				return TRUE; 
 			}
 			break;
+		default:
+			break;
     }
     return FALSE;
 }
 
-int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, char * cmdParam, int cmdShow )
+int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmdShow )
 {
     DWORD dwThreadId, dwThrdParam = 1; 
     char szMsg[80];
 	WSADATA WSAData;
     MSG msg;
+	(void)cmdParam; //argsused
+	(void)cmdShow; //argsused
+	(void)hPrevInst; //argsused
 	
 	//_fmode = _O_BINARY;
 	hInstance = hInst;