[Shadowirc-commits] CVS: shadowirc/src AEvents.c,1.8,1.9 ApplBase.c,1.84,1.85 CMenus.c,1.17,1.18 Events.c,1.40,1.41 InputLine.c,1.31,1.32 InputLine.h,1.10,1.11 MenuCommands.c,1.56,1.57 MsgWindows.c,1.45,1.46 ServerCommands.c,1.15,1.16 Shortcuts.c,1.15,1.16 filesMan.c,1.32,1.33 utils.c,1.19,1.20 utils.h,1.8,1.9

[John B. <ds...@us...>]

Update of /cvsroot/shadowirc/shadowirc/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5855

Modified Files:
	AEvents.c ApplBase.c CMenus.c Events.c InputLine.c InputLine.h 
	MenuCommands.c MsgWindows.c ServerCommands.c Shortcuts.c 
	filesMan.c utils.c utils.h 
Log Message:
Squelch a lot of compiler warnings.

Index: AEvents.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/AEvents.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- AEvents.c	19 Dec 2003 22:24:15 -0000	1.8
+++ AEvents.c	20 Dec 2003 03:41:21 -0000	1.9
@@ -147,6 +147,7 @@
 
 static OSErr OpenURLString(LongString *url)
 {
+#pragma unused(url)
 	return paramErr;
 }
 

Index: ApplBase.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/ApplBase.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ApplBase.c	19 Dec 2003 22:24:15 -0000	1.84
+++ ApplBase.c	20 Dec 2003 03:41:21 -0000	1.85
@@ -60,6 +60,9 @@
 static void AsyncSoundCleanup(EventLoopTimerRef timer, void* data);
 static void AsyncSoundCallback(SndChannelPtr theSoundChannel, SndCommand *infoRecord);
 
+inline void checkConnections(void);
+inline void ProcessUserHosts(linkPtr link);
+
 typedef struct aspData {
 	long refcon;
 	SndListHandle sound;
@@ -78,6 +81,7 @@
 
 static void AsyncSoundCleanup(EventLoopTimerRef timer, void* data)
 {
+#pragma unused(data)
 	aspDataPtr asp = aspList;
 	aspDataPtr next;
 	
@@ -187,6 +191,7 @@
 
 static OSStatus ConfirmQuitEventHandler(EventHandlerCallRef myHandler, EventRef event, void *userData)
 {
+#pragma unused(myHandler)
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
 	WindowRef aboutWindow;
@@ -405,12 +410,14 @@
 
 static void MinuteTimer(EventLoopTimerRef timer, void* data)
 {
+#pragma unused(timer, data)
 	MBIdle();
 	RunNotify();
 }
 
 static void Timer20(EventLoopTimerRef timer, void* data)
 {
+#pragma unused(timer, data)
 	linkPtr curLink;
 	
 	linkfor(curLink, firstLink)
@@ -420,17 +427,20 @@
 
 static void Timer5(EventLoopTimerRef timer, void* data)
 {
+#pragma unused(timer, data)
 	checkConnections();
 	UpdateStatusLine();
 }
 
 static void Timer1(EventLoopTimerRef timer, void* data)
 {
+#pragma unused(timer, data)
 	GetDateTime(&now);
 }
 
 static void TimerTick(EventLoopTimerRef timer, void* data)
 {
+#pragma unused(timer, data)
 	RetryConnections();
 }
 
@@ -438,6 +448,7 @@
 
 static void NetworkProcess(EventLoopTimerRef timer, void* data)
 {
+#pragma unused(timer, data)
 	connectionEventRecord connEvt;
 	int x = -8;
 	
@@ -482,6 +493,7 @@
 
 static OSStatus EventHandler(EventHandlerCallRef handlerCallRef, EventRef event, void *data)
 {
+#pragma unused(handlerCallRef, data)
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
 	
@@ -547,6 +559,7 @@
 
 static OSStatus DoModifierKeysChangedEvent(EventHandlerCallRef handlerCallRef, EventRef event, void *data)
 {
+#pragma unused(handlerCallRef, data)
 	UInt32 modifiers;
 	OSStatus result = eventNotHandledErr;
 	static UInt32 oldModifiers = 0;
@@ -567,6 +580,7 @@
 
 static OSStatus DoResumeEvent(EventHandlerCallRef handlerCallRef, EventRef event, void *data)
 {
+#pragma unused(handlerCallRef, event, data)
 	pContextSwitchDataRec p;
 	
 	inBackground=0;
@@ -585,6 +599,7 @@
 
 static OSStatus DoSuspendEvent(EventHandlerCallRef handlerCallRef, EventRef event, void *data)
 {
+#pragma unused(handlerCallRef, event, data)
 	pContextSwitchDataRec p;
 	
 	inBackground=1;

Index: CMenus.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/CMenus.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CMenus.c	19 Dec 2003 22:24:15 -0000	1.17
+++ CMenus.c	20 Dec 2003 03:41:22 -0000	1.18
@@ -1,6 +1,6 @@
 /*
 	ShadowIRC - A Mac OS IRC Client
-	Copyright (C) 1996-2002 John Bafford
+	Copyright (C) 1996-2003 John Bafford
 	ds...@sh...
 	http://www.shadowirc.com
 
@@ -37,6 +37,8 @@
 #include "Floaters.h"
 #include "MenuCommands.h"
 
+inline char IsWS(char c);
+
 static void _CMILAdd(cmmwData *d, ConstStr255Param item, menuCommand cmd, long key, short *id, MenuHandle *m);
 static void CMILAdd(cmmwData *d, ConstStr255Param item, menuCommand cmd, long key);
 inline void CMILDelete(cmmwData *d, short item);
@@ -326,7 +328,6 @@
 	{
 		Handle text = WEGetText(mw->we);
 		Ptr p = *text;
-		int x;
 		
 		d->oneWord = true;
 		for(x = d->s0; x<d->s1; x++)
@@ -386,7 +387,7 @@
 
 	if(d->pane->creator == kApplicationSignature)
 	{
-		ConstStringPtr s;
+		ConstStringPtr sp;
 		
 		if(!d->oneWord)
 			CMILAdd(d, "\p-", mcNull, 0);
@@ -394,9 +395,9 @@
 		if(d->noSelection)
 		{
 			if(mw->logRefNum)
-				s = GetIntStringPtr(spCM, sStopLogging);
+				sp = GetIntStringPtr(spCM, sStopLogging);
 			else
-				s = GetIntStringPtr(spCM, sStartLogging);
+				sp = GetIntStringPtr(spCM, sStartLogging);
 			
 			CMILAdd(d, s, mcLog, 0);
 		}
@@ -404,10 +405,10 @@
 		if(!d->oneWord)
 		{
 			if(d->noSelection)
-				s = GetIntStringPtr(spCM, sSaveWindowTextToFile);
+				sp = GetIntStringPtr(spCM, sSaveWindowTextToFile);
 			else
-				s = GetIntStringPtr(spCM, sSaveSelectionToFile);
-			CMILAdd(d, s, mcSaveText, 0);
+				sp = GetIntStringPtr(spCM, sSaveSelectionToFile);
+			CMILAdd(d, sp, mcSaveText, 0);
 		}
 	}
 	

Index: Events.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/Events.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Events.c	19 Dec 2003 18:20:55 -0000	1.40
+++ Events.c	20 Dec 2003 03:41:22 -0000	1.41
@@ -64,6 +64,7 @@
 
 static OSStatus MWDoMouseWheelEvent(EventHandlerCallRef nextHandler, EventRef theEvent, void *userData)
 {
+#pragma unused(nextHandler)
 	OSStatus myErr = eventNotHandledErr;
 	Point mouseLoc;
 	EventMouseWheelAxis wheelAxis;
@@ -199,6 +200,7 @@
 
 static OSStatus MWUICommandHandler(EventHandlerCallRef nextHandler, EventRef theEvent, void *userData)
 {
+#pragma unused(nextHandler)
 	OSStatus result = eventNotHandledErr;
 	HICommand hiCommand;
 	UInt32 eventClass, eventKind;
@@ -300,6 +302,7 @@
 
 static OSStatus MWConsoleEventHandler(EventHandlerCallRef handlerCallRef, EventRef event, void *userData)
 {
+#pragma unused(handlerCallRef, userData)
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
 	
@@ -326,6 +329,7 @@
 
 static OSStatus MWEventHandler(EventHandlerCallRef handlerCallRef, EventRef event, void *userData)
 {
+#pragma unused(handlerCallRef)
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
 	MWPtr mw = (MWPtr)userData;
@@ -485,6 +489,7 @@
 
 static OSStatus AboutWindowEventHandler(EventHandlerCallRef myHandler, EventRef event, void *userData)
  {
+#pragma unused(myHandler)
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
 	WindowRef aboutWindow;
@@ -754,6 +759,7 @@
 
 static OSStatus DoCommandEvent(EventHandlerCallRef nextHandler, EventRef theEvent, void *userData)
 {
+#pragma unused(nextHandler, userData)
 	OSStatus myErr = eventNotHandledErr;
 	HICommand hiCommand;
 	

Index: InputLine.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/InputLine.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- InputLine.c	19 Dec 2003 23:39:45 -0000	1.31
+++ InputLine.c	20 Dec 2003 03:41:22 -0000	1.32
@@ -287,6 +287,7 @@
 
 static OSStatus InputLineWindowEventHandler(EventHandlerCallRef handlerCallRef, EventRef event, void *userData)
 {
+#pragma unused(handlerCallRef, userData)
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
 	HICommand hiCommand;
@@ -392,7 +393,7 @@
 
 static OSErr IWDragTrackingHandler(DragTrackingMessage message, WindowPtr window, void* refCon, DragReference drag)
 {
-#pragma unused(refCon)
+#pragma unused(window, refCon)
 	OSErr ret = dragNotAcceptedErr;
 	
 	if(!inputLocked)
@@ -403,7 +404,7 @@
 
 static OSErr IWDragReceiveHandler(WindowPtr window, void* refCon, DragReference drag)
 {
-#pragma unused(refCon)
+#pragma unused(window, refCon)
 	OSErr err = dragNotAcceptedErr;
 	
 	if(!inputLocked)
@@ -791,7 +792,7 @@
 
 #pragma mark -
 
-pascal void ILAddHistory(MWPtr mw, LongString *line)
+void ILAddHistory(MWPtr mw, LongString *line)
 {
 	int i;
 	inputAreaDataPtr iad = ILGetInputDataFromMW(mw);
@@ -970,7 +971,7 @@
 
 #pragma mark -
 
-pascal void IWLock()
+void IWLock(void)
 {
 	if(!noFloatingInput && !inputLine.lock)
 	{
@@ -982,7 +983,7 @@
 	}
 }
 
-pascal void IWUnlock()
+void IWUnlock(void)
 {
 	if(!noFloatingInput && inputLine.lock)
 	{

Index: InputLine.h
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/InputLine.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- InputLine.h	19 Dec 2003 22:24:15 -0000	1.10
+++ InputLine.h	20 Dec 2003 03:41:22 -0000	1.11
@@ -115,7 +115,7 @@
 
 
 #ifdef _MsgWindows_
-pascal void ILAddHistory(MWPtr mw, LongString *line);
+void ILAddHistory(MWPtr mw, LongString *line);
 
 inputAreaDataPtr ILGetInputDataFromMW(MWPtr mw);
 #endif
@@ -135,8 +135,8 @@
 void RecallLineDown(inputAreaDataPtr iad);
 
 
-pascal void IWLock();
-pascal void IWUnlock();
+void IWLock(void);
+void IWUnlock(void);
 
 pascal iwWidgetPtr IWNewWidget(long type, short align, short width);
 pascal void IWRecalculateRects(void);

Index: MenuCommands.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/MenuCommands.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- MenuCommands.c	19 Dec 2003 22:24:15 -0000	1.56
+++ MenuCommands.c	20 Dec 2003 03:41:22 -0000	1.57
@@ -192,6 +192,7 @@
 
 static OSStatus FindWindowEventHandler(EventHandlerCallRef myHandler, EventRef event, void *userData)
 {
+#pragma unused(myHandler)
 	WindowPtr findWin = (WindowPtr)userData;
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
@@ -469,6 +470,7 @@
 
 static OSStatus FontSizeEventHandler(EventHandlerCallRef myHandler, EventRef event, void *userData)
 {
+#pragma unused(myHandler)
 	OSStatus result = eventNotHandledErr;
 	UInt32 eventClass, eventKind;
 	WindowRef aboutWindow;
@@ -658,6 +660,7 @@
 
 static OSStatus DoShowFontsMenu(EventHandlerCallRef handlerCallRef, EventRef event, void *userData)
 {
+#pragma unused(handlerCallRef, userData)
 	static int previousFontCheck = 0;
 	static int previousSizeCheck = 0;
 	Str255 s, s2;

Index: MsgWindows.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/MsgWindows.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- MsgWindows.c	19 Dec 2003 22:24:15 -0000	1.45
+++ MsgWindows.c	20 Dec 2003 03:41:22 -0000	1.46
@@ -631,7 +631,6 @@
 {
 	OSStatus err = noErr;
 	FSRef linkRef, ref;
-	FSCatalogInfo catalogInfo;
 	HFSUniStr255 forkName;
 	CFStringRef string;
 	LongString ls;
@@ -640,19 +639,19 @@
 	UniCharCount nameBufLen = 0;
 	SInt16 position = 0;
 	
-	catalogInfo.textEncodingHint = kTextEncodingUnicodeDefault;
-	
 	if(!mw->logRefNum) //if we're already logging, then don't do anything.
 	{
 		if(FSRefValid(&logFolderRef))
 		{
-			FSCatalogInfo catalogInfo;
-			
 			linkRef = logFolderRef;
 			link = mw->link;
 			
 			if(link)
 			{
+				FSCatalogInfo catalogInfo;
+				
+				catalogInfo.textEncodingHint = kTextEncodingUnicodeDefault;
+				
 				string = CFStringCreateWithPascalString(NULL, link->linkPrefs->linkName, CFStringGetSystemEncoding());
 			
 				err = UseDirFSRef(&logFolderRef, string, TRUE, &linkRef);

Index: ServerCommands.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/ServerCommands.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ServerCommands.c	27 Oct 2002 15:54:50 -0000	1.15
+++ ServerCommands.c	20 Dec 2003 03:41:22 -0000	1.16
@@ -552,6 +552,7 @@
 
 static OSStatus KillWindowEventHandler(EventHandlerCallRef myHandler, EventRef event, void *userData)
 {
+#pragma unused(myHandler)
 	OSStatus result = eventNotHandledErr;
 	WindowRef killWin = (WindowRef)userData;
 	UInt32 eventClass, eventKind;

Index: Shortcuts.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/Shortcuts.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Shortcuts.c	19 Dec 2003 22:24:15 -0000	1.15
+++ Shortcuts.c	20 Dec 2003 03:41:22 -0000	1.16
@@ -35,6 +35,7 @@
 #include "Shortcuts.h"
 #include "IRCCFPrefs.h"
 
+inline void RepeatMunger(Handle text, long offset, const void* ptr1, long len1, const void* ptr2, long len2);
 inline void PluginShortcutText(Handle lh);
 static void ParseShortcutText(ConstStr255Param s);
 
@@ -137,6 +138,7 @@
 
 static OSStatus ShortcutsEditorEventHandler(EventHandlerCallRef myHandler, EventRef event, void *userData)
 {
+#pragma unused(myHandler)
 	OSStatus result = eventNotHandledErr;
 	WindowRef shortcutsWin = (WindowRef)userData;
 	UInt32 eventClass, eventKind;

Index: filesMan.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/filesMan.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- filesMan.c	5 May 2003 05:37:44 -0000	1.32
+++ filesMan.c	20 Dec 2003 03:41:22 -0000	1.33
@@ -258,7 +258,6 @@
 	{
 		case kNavCBStart:
 		{
-			OSStatus err = noErr;
 			AEDesc theLocation = {typeNull, NULL};
 			FSRef localRef;
 			

Index: utils.c
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/utils.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- utils.c	19 Dec 2003 22:15:25 -0000	1.19
+++ utils.c	20 Dec 2003 03:41:22 -0000	1.20
@@ -30,6 +30,7 @@
 
 #define USE_SHADOWIRC_ASSEMBLY 0
 
+inline char inupc(char c);
 static char matchFrom(ConstStr255Param s, ConstStr255Param mask, int i,  int j);
 
 
@@ -692,10 +693,10 @@
 	HSL2RGB(&hsl, rgb);
 }
 
-pascal void SetupModalDialog(DialogPtr d, short ok, short cancel)
+void SetupModalDialog(DialogPtr d, short okItem, short cancelItem)
 {
-	SetDialogDefaultItem(d, ok);
-	SetDialogCancelItem(d, cancel);
+	SetDialogDefaultItem(d, okItem);
+	SetDialogCancelItem(d, cancelItem);
 	SetDialogTracksCursor(d, true);
 	if(!IsWindowVisible(GetDialogWindow(d)))
 		ShowWindow(GetDialogWindow(d));

Index: utils.h
===================================================================
RCS file: /cvsroot/shadowirc/shadowirc/src/utils.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- utils.h	22 Oct 2002 02:55:12 -0000	1.8
+++ utils.h	20 Dec 2003 03:41:22 -0000	1.9
@@ -1,6 +1,6 @@
 /*
 	ShadowIRC - A Mac OS IRC Client
-	Copyright (C) 1996-2002 John Bafford
+	Copyright (C) 1996-2003 John Bafford
 	ds...@sh...
 	http://www.shadowirc.com
 
@@ -72,7 +72,7 @@
 
 pascal void DeleteResourceType(short resFile, ResType type);
 
-pascal void SetupModalDialog(DialogPtr d, short ok, short cancel);
+void SetupModalDialog(DialogPtr d, short okItem, short cancelItem);
 pascal void FinishModalDialog(void);
 
 pascal void pstrcpyucase(ConstStr255Param src, Str255 dest);