Whitespace fixes.

5 files changed, 55 insertions, 51 deletions

diff --git a/apps/mozilla/jri.h b/apps/mozilla/jri.h
index 4a622bd2..1eb8b74e 100644
--- a/apps/mozilla/jri.h
+++ b/apps/mozilla/jri.h
@@ -3,3 +3,4 @@
 #define JRIEnv void
 #define JRIGlobalRef void*
 #define JRI_NewGlobalRef(e,c) 0
+
diff --git a/apps/mozilla/npapi.h b/apps/mozilla/npapi.h
index 5cd11c83..0ccef715 100644
--- a/apps/mozilla/npapi.h
+++ b/apps/mozilla/npapi.h
@@ -34,11 +34,11 @@
   #include <Quickdraw.h>
   #include <Events.h>
 #endif
-              
+
 #ifdef XP_UNIX
   #include <X11/Xlib.h>
   #include <X11/Xutil.h>
-#endif          
+#endif
 
 
 /*----------------------------------------------------------------------*/
@@ -467,3 +467,4 @@ void    NPN_ForceRedraw(NPP instance);
 #endif
 
 #endif /* _NPAPI_H_ */
+
diff --git a/apps/mozilla/npunix.c b/apps/mozilla/npunix.c
index 1c742d6d..f705a5f1 100644
--- a/apps/mozilla/npunix.c
+++ b/apps/mozilla/npunix.c
@@ -163,7 +163,7 @@ jref NPN_GetJavaPeer(NPP instance)
  * Wrapper functions : Netscape Navigator -> plugin
  *
  * These functions let the plugin developer just create the APIs
- * as documented and defined in npapi.h, without needing to 
+ * as documented and defined in npapi.h, without needing to
  * install those functions in the function table or worry about
  * setting up globals for 68K plugins.
  *
@@ -176,7 +176,7 @@ Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
 	NPError ret;
 	PLUGINDEBUGSTR("New");
 	ret = NPP_New(pluginType, instance, mode, argc, argn, argv, saved);
-	return ret;	
+	return ret;
 }
 
 NPError
@@ -260,7 +260,7 @@ Private_GetJavaClass(void)
     return NULL;
 }
 
-/*********************************************************************** 
+/***********************************************************************
  *
  * These functions are located automagically by netscape.
  *
@@ -313,12 +313,12 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 	NPError err = NPERR_NO_ERROR;
 
 	PLUGINDEBUGSTR("NP_Initialize");
-	
+
 	/* validate input parameters */
 
 	if ((nsTable == NULL) || (pluginFuncs == NULL))
 		err = NPERR_INVALID_FUNCTABLE_ERROR;
-	
+
 	/*
 	 * Check the major version passed in Netscape's function table.
 	 * We won't load if the major version is newer than what we expect.
@@ -333,11 +333,11 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 			err = NPERR_INCOMPATIBLE_VERSION_ERROR;
 		if (nsTable->size < sizeof(NPNetscapeFuncs))
 			err = NPERR_INVALID_FUNCTABLE_ERROR;
-		if (pluginFuncs->size < sizeof(NPPluginFuncs))		
+		if (pluginFuncs->size < sizeof(NPPluginFuncs))
 			err = NPERR_INVALID_FUNCTABLE_ERROR;
 	}
-		
-	
+
+
 	if (err == NPERR_NO_ERROR) {
 		/*
 		 * Copy all the fields of Netscape function table into our
@@ -386,7 +386,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 
 		err = NPP_Initialize();
 	}
-	
+
 	return err;
 }
 
@@ -400,7 +400,8 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 NPError
 NP_Shutdown(void)
 {
- 	PLUGINDEBUGSTR("NP_Shutdown");
+	PLUGINDEBUGSTR("NP_Shutdown");
 	NPP_Shutdown();
 	return NPERR_NO_ERROR;
 }
+
diff --git a/apps/mozilla/npupp.h b/apps/mozilla/npupp.h
index 2a816474..30066065 100644
--- a/apps/mozilla/npupp.h
+++ b/apps/mozilla/npupp.h
@@ -35,7 +35,7 @@ typedef UniversalProcPtr NPP_InitializeUPP;
 
 enum {
   uppNPP_InitializeProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))    
+    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
     | RESULT_SIZE(SIZE_CODE(0))
 };
 
@@ -43,7 +43,7 @@ enum {
     (NPP_InitializeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_InitializeProcInfo, GetCurrentArchitecture())
 #define CallNPP_InitializeProc(FUNC)    \
     (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_InitializeProcInfo)
-    
+
 #else
 
 typedef void (*NPP_InitializeUPP)(void);
@@ -62,7 +62,7 @@ typedef UniversalProcPtr NPP_ShutdownUPP;
 
 enum {
   uppNPP_ShutdownProcInfo = kThinkCStackBased
-    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))    
+    | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
     | RESULT_SIZE(SIZE_CODE(0))
 };
 
@@ -70,7 +70,7 @@ enum {
     (NPP_ShutdownUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_ShutdownProcInfo, GetCurrentArchitecture())
 #define CallNPP_ShutdownProc(FUNC)    \
     (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_ShutdownProcInfo)
-    
+
 #else
 
 typedef void (*NPP_ShutdownUPP)(void);
@@ -657,7 +657,7 @@ enum {
 #define NewNPN_NewStreamProc(FUNC)    \
     (NPN_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_NewStreamProcInfo, GetCurrentArchitecture())
 #define CallNPN_NewStreamProc(FUNC, npp, type, window, stream)    \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_NewStreamProcInfo, (npp), (type), (window), (stream)) 
+    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_NewStreamProcInfo, (npp), (type), (window), (stream))
 
 #else
 
@@ -686,7 +686,7 @@ enum {
 #define NewNPN_WriteProc(FUNC)    \
     (NPN_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_WriteProcInfo, GetCurrentArchitecture())
 #define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)   \
-    (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_WriteProcInfo, (npp), (stream), (len), (buffer))  
+    (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_WriteProcInfo, (npp), (stream), (len), (buffer))
 
 #else
 
@@ -714,7 +714,7 @@ enum {
 #define NewNPN_DestroyStreamProc(FUNC)    \
     (NPN_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, GetCurrentArchitecture())
 #define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)    \
-    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, (npp), (stream), (reason)) 
+    (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, (npp), (stream), (reason))
 
 #else
 
@@ -741,7 +741,7 @@ enum {
 #define NewNPN_StatusProc(FUNC)   \
     (NPN_StatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_StatusProcInfo, GetCurrentArchitecture())
 #define CallNPN_StatusProc(FUNC, npp, msg)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))  
+    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))
 
 #else
 
@@ -749,7 +749,7 @@ typedef void (*NPN_StatusUPP)(NPP instance, const char* message);
 #define NewNPN_StatusProc(FUNC)   \
     ((NPN_StatusUPP) (FUNC))
 #define CallNPN_StatusProc(FUNC, npp, msg)    \
-    (*(FUNC))((npp), (msg)) 
+    (*(FUNC))((npp), (msg))
 
 #endif
 
@@ -793,7 +793,7 @@ enum {
 #define NewNPN_MemAllocProc(FUNC)   \
     (NPN_MemAllocUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemAllocProcInfo, GetCurrentArchitecture())
 #define CallNPN_MemAllocProc(FUNC, ARG1)    \
-    (void*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemAllocProcInfo, (ARG1)) 
+    (void*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemAllocProcInfo, (ARG1))
 
 #else
 
@@ -801,7 +801,7 @@ typedef void* (*NPN_MemAllocUPP)(uint32 size);
 #define NewNPN_MemAllocProc(FUNC)   \
     ((NPN_MemAllocUPP) (FUNC))
 #define CallNPN_MemAllocProc(FUNC, ARG1)    \
-    (*(FUNC))((ARG1)) 
+    (*(FUNC))((ARG1))
 
 #endif
 
@@ -827,7 +827,7 @@ typedef void (*NPN_MemFreeUPP)(void* ptr);
 #define NewNPN_MemFreeProc(FUNC)    \
     ((NPN_MemFreeUPP) (FUNC))
 #define CallNPN_MemFreeProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1)) 
+    (*(FUNC))((ARG1))
 
 #endif
 
@@ -846,7 +846,7 @@ enum {
 #define NewNPN_MemFlushProc(FUNC)   \
     (NPN_MemFlushUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFlushProcInfo, GetCurrentArchitecture())
 #define CallNPN_MemFlushProc(FUNC, ARG1)    \
-    (uint32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFlushProcInfo, (ARG1))  
+    (uint32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFlushProcInfo, (ARG1))
 
 #else
 
@@ -854,7 +854,7 @@ typedef uint32 (*NPN_MemFlushUPP)(uint32 size);
 #define NewNPN_MemFlushProc(FUNC)   \
     ((NPN_MemFlushUPP) (FUNC))
 #define CallNPN_MemFlushProc(FUNC, ARG1)    \
-    (*(FUNC))((ARG1)) 
+    (*(FUNC))((ARG1))
 
 #endif
 
@@ -874,7 +874,7 @@ enum {
 #define NewNPN_ReloadPluginsProc(FUNC)    \
     (NPN_ReloadPluginsUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, GetCurrentArchitecture())
 #define CallNPN_ReloadPluginsProc(FUNC, ARG1)   \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, (ARG1)) 
+    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, (ARG1))
 
 #else
 
@@ -882,7 +882,7 @@ typedef void (*NPN_ReloadPluginsUPP)(NPBool reloadPages);
 #define NewNPN_ReloadPluginsProc(FUNC)    \
     ((NPN_ReloadPluginsUPP) (FUNC))
 #define CallNPN_ReloadPluginsProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1)) 
+    (*(FUNC))((ARG1))
 
 #endif
 
@@ -900,7 +900,7 @@ enum {
 #define NewNPN_GetJavaEnvProc(FUNC)   \
     (NPN_GetJavaEnvUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo, GetCurrentArchitecture())
 #define CallNPN_GetJavaEnvProc(FUNC)    \
-    (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo) 
+    (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo)
 
 #else
 
@@ -908,7 +908,7 @@ typedef JRIEnv* (*NPN_GetJavaEnvUPP)(void);
 #define NewNPN_GetJavaEnvProc(FUNC)   \
     ((NPN_GetJavaEnvUPP) (FUNC))
 #define CallNPN_GetJavaEnvProc(FUNC)    \
-    (*(FUNC))() 
+    (*(FUNC))()
 
 #endif
 
@@ -927,7 +927,7 @@ enum {
 #define NewNPN_GetJavaPeerProc(FUNC)    \
     (NPN_GetJavaPeerUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, GetCurrentArchitecture())
 #define CallNPN_GetJavaPeerProc(FUNC, ARG1)   \
-    (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, (ARG1)) 
+    (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, (ARG1))
 
 #else
 
@@ -935,7 +935,7 @@ typedef jref (*NPN_GetJavaPeerUPP)(NPP instance);
 #define NewNPN_GetJavaPeerProc(FUNC)    \
     ((NPN_GetJavaPeerUPP) (FUNC))
 #define CallNPN_GetJavaPeerProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1)) 
+    (*(FUNC))((ARG1))
 
 #endif
 
@@ -955,7 +955,7 @@ enum {
 #define NewNPN_InvalidateRectProc(FUNC)   \
     (NPN_InvalidateRectUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, GetCurrentArchitecture())
 #define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, (ARG1), (ARG2))  
+    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, (ARG1), (ARG2))
 
 #else
 
@@ -963,7 +963,7 @@ typedef void (*NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
 #define NewNPN_InvalidateRectProc(FUNC)   \
     ((NPN_InvalidateRectUPP) (FUNC))
 #define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)    \
-    (*(FUNC))((ARG1), (ARG2)) 
+    (*(FUNC))((ARG1), (ARG2))
 
 #endif
 
@@ -983,7 +983,7 @@ enum {
 #define NewNPN_InvalidateRegionProc(FUNC)   \
     (NPN_InvalidateRegionUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, GetCurrentArchitecture())
 #define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)    \
-    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, (ARG1), (ARG2))  
+    (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, (ARG1), (ARG2))
 
 #else
 
@@ -991,7 +991,7 @@ typedef void (*NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
 #define NewNPN_InvalidateRegionProc(FUNC)   \
     ((NPN_InvalidateRegionUPP) (FUNC))
 #define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)    \
-    (*(FUNC))((ARG1), (ARG2)) 
+    (*(FUNC))((ARG1), (ARG2))
 
 #endif
 
@@ -1009,7 +1009,7 @@ enum {
 #define NewNPN_ForceRedrawProc(FUNC)    \
     (NPN_ForceRedrawUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, GetCurrentArchitecture())
 #define CallNPN_ForceRedrawProc(FUNC, ARG1)   \
-    (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, (ARG1)) 
+    (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, (ARG1))
 
 #else
 
@@ -1017,7 +1017,7 @@ typedef void (*NPN_ForceRedrawUPP)(NPP instance);
 #define NewNPN_ForceRedrawProc(FUNC)    \
     ((NPN_ForceRedrawUPP) (FUNC))
 #define CallNPN_ForceRedrawProc(FUNC, ARG1)   \
-    (*(FUNC))((ARG1)) 
+    (*(FUNC))((ARG1))
 
 #endif
 
@@ -1158,3 +1158,4 @@ NPError NP_Shutdown(void);
 #endif /* XP_UNIX */
 
 #endif /* _NPUPP_H_ */
+
diff --git a/apps/mozilla/npwin.c b/apps/mozilla/npwin.c
index 5d60a893..718ded73 100644
--- a/apps/mozilla/npwin.c
+++ b/apps/mozilla/npwin.c
@@ -46,7 +46,7 @@ Private_GetJavaClass(void)
 
 //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
 ////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-//						PLUGIN DLL entry points   
+//						PLUGIN DLL entry points
 //
 // These are the Windows specific DLL entry points. They must be exoprted
 //
@@ -68,12 +68,12 @@ static NPPluginFuncs* g_pluginFuncs;
 NPError WINAPI NP_EXPORT
 NP_GetEntryPoints(NPPluginFuncs* pFuncs)
 {
-    // trap a NULL ptr 
+    // trap a NULL ptr
     if(pFuncs == NULL)
 	return NPERR_INVALID_FUNCTABLE_ERROR;
 
     // if the plugin's function table is smaller than the plugin expects,
-    // then they are incompatible, and should return an error 
+    // then they are incompatible, and should return an error
 
     pFuncs->version       = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
     pFuncs->newp          = NPP_New;
@@ -85,7 +85,7 @@ NP_GetEntryPoints(NPPluginFuncs* pFuncs)
     pFuncs->writeready    = NPP_WriteReady;
     pFuncs->write         = NPP_Write;
     pFuncs->print         = NPP_Print;
-    pFuncs->event         = 0;       /// reserved 
+    pFuncs->event         = 0;       /// reserved
 
     g_pluginFuncs		  = pFuncs;
 
@@ -98,17 +98,17 @@ NP_GetEntryPoints(NPPluginFuncs* pFuncs)
 //
 //	called immediately after the plugin DLL is loaded
 //
-NPError WINAPI NP_EXPORT 
+NPError WINAPI NP_EXPORT
 NP_Initialize(NPNetscapeFuncs* pFuncs)
 {
-    // trap a NULL ptr 
+    // trap a NULL ptr
     if(pFuncs == NULL)
 	return NPERR_INVALID_FUNCTABLE_ERROR;
 
-    g_pNavigatorFuncs = pFuncs; // save it for future reference 
+    g_pNavigatorFuncs = pFuncs; // save it for future reference
 
     // if the plugin's major ver level is lower than the Navigator's,
-    // then they are incompatible, and should return an error 
+    // then they are incompatible, and should return an error
     if(HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
 	return NPERR_INCOMPATIBLE_VERSION_ERROR;
 
@@ -137,9 +137,9 @@ NP_Initialize(NPNetscapeFuncs* pFuncs)
 //
 //	called immediately before the plugin DLL is unloaded.
 //	This functio shuold check for some ref count on the dll to see if it is
-//	unloadable or it needs to stay in memory. 
+//	unloadable or it needs to stay in memory.
 //
-NPError WINAPI NP_EXPORT 
+NPError WINAPI NP_EXPORT
 NP_Shutdown()
 {
     NPP_Shutdown();
@@ -147,7 +147,7 @@ NP_Shutdown()
     return NPERR_NO_ERROR;
 }
 
-//						END - PLUGIN DLL entry points   
+//						END - PLUGIN DLL entry points
 ////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
 //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
 
@@ -229,7 +229,7 @@ NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
 /* Creates a new stream of data from the plug-in to be interpreted
    by Netscape in the current window.
  */
-NPError NPN_NewStream(NPP instance, NPMIMEType type, 
+NPError NPN_NewStream(NPP instance, NPMIMEType type,
 	const char* target, NPStream** stream)
 {
     int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
@@ -260,7 +260,7 @@ int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer)
     return result;
 }
 
-/* Closes a stream object.  
+/* Closes a stream object.
 reason indicates why the stream was closed.
 */
 NPError NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)