Systematizing the formatting

Also simplified the AIX loader so that it's failure-mode code wasn't scattered
all over quite so much.

1 files changed, 62 insertions, 51 deletions

diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index 308c55d..c27a4e2 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -1,8 +1,8 @@
-/* 
+/*
  * tclLoadOSF.c --
  *
- *	This procedure provides a version of the TclLoadFile that works
- *	under OSF/1 1.0/1.1/1.2 and related systems, utilizing the old OSF/1
+ *	This procedure provides a version of the TclLoadFile that works under
+ *	OSF/1 1.0/1.1/1.2 and related systems, utilizing the old OSF/1
  *	/sbin/loader and /usr/include/loader.h.  OSF/1 versions from 1.3 and
  *	on use ELF, rtld, and dlopen()[/usr/include/ldfcn.h].
  *
@@ -13,25 +13,25 @@
  *		HP OSF/1 1.0 ("Acorn") using COFF
  *
  *	This is likely to be useful for:
- *		Paragon OSF/1 (from Intel) 
- *		HI-OSF/1 (from Hitachi) 
+ *		Paragon OSF/1 (from Intel)
+ *		HI-OSF/1 (from Hitachi)
  *
  *	This is NOT to be used on:
  *		Digitial Alpha OSF/1 systems
  *		OSF/1 1.3 or later (from OSF) using ELF
  *			includes: MK6, MK7, AD2, AD3 (from OSF RI)
  *
- *	This approach to things was utter @&^#; thankfully,
- * 	OSF/1 eventually supported dlopen().
+ *	This approach to things was utter @&^#; thankfully, OSF/1 eventually
+ *	supported dlopen().
  *
  *	John Robert LoVerso <loverso@freebsd.osf.org>
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLoadOSF.c,v 1.11 2002/10/10 12:25:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadOSF.c,v 1.12 2005/07/19 13:37:19 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -43,12 +43,12 @@
  *
  * TclpDlopen --
  *
- *	Dynamically loads a binary code file into memory and returns
- *	a handle to the new code.
+ *	Dynamically loads a binary code file into memory and returns a handle
+ *	to the new code.
  *
  * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.
+ *	A standard Tcl completion code.  If an error occurs, an error message
+ *	is left in the interp's result.
  *
  * Side effects:
  *	New code suddenly appears in memory.
@@ -62,54 +62,58 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
     Tcl_Obj *pathPtr;		/* Name of the file containing the desired
 				 * code (UTF-8). */
     Tcl_LoadHandle *loadHandle;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
+				 * file which will be passed back to
 				 * (*unloadProcPtr)() to unload the file. */
-    Tcl_FSUnloadFileProc **unloadProcPtr;	
+    Tcl_FSUnloadFileProc **unloadProcPtr;
 				/* Filled with address of Tcl_FSUnloadFileProc
-				 * function which should be used for
-				 * this file. */
+				 * function which should be used for this
+				 * file. */
 {
     ldr_module_t lm;
     char *pkg;
     char *fileName = Tcl_GetString(pathPtr);
     CONST char *native;
 
-    /* 
+    /*
      * First try the full path the user gave us.  This is particularly
-     * important if the cwd is inside a vfs, and we are trying to load
-     * using a relative path.
+     * important if the cwd is inside a vfs, and we are trying to load using a
+     * relative path.
      */
+
     native = Tcl_FSGetNativePath(pathPtr);
     lm = (Tcl_PackageInitProc *) load(native, LDR_NOFLAGS);
 
     if (lm == LDR_NULL_MODULE) {
-	/* 
-	 * Let the OS loader examine the binary search path for
-	 * whatever string the user gave us which hopefully refers
-	 * to a file on the binary path
+	/*
+	 * Let the OS loader examine the binary search path for whatever
+	 * string the user gave us which hopefully refers to a file on the
+	 * binary path
 	 */
+
 	Tcl_DString ds;
+
 	native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
 	lm = (Tcl_PackageInitProc *) load(native, LDR_NOFLAGS);
 	Tcl_DStringFree(&ds);
     }
-    
+
     if (lm == LDR_NULL_MODULE) {
-	Tcl_AppendResult(interp, "couldn't load file \"", fileName,
-	    "\": ", Tcl_PosixError (interp), (char *) NULL);
+	Tcl_AppendResult(interp, "couldn't load file \"", fileName, "\": ",
+		Tcl_PosixError (interp), (char *) NULL);
 	return TCL_ERROR;
     }
 
     *clientDataPtr = NULL;
-    
+
     /*
      * My convention is to use a [OSF loader] package name the same as shlib,
      * since the idiots never implemented ldr_lookup() and it is otherwise
      * impossible to get a package name given a module.
      *
-     * I build loadable modules with a makefile rule like 
+     * I build loadable modules with a makefile rule like
      *		ld ... -export $@: -o $@ $(OBJS)
      */
+
     if ((pkg = strrchr(fileName, '/')) == NULL) {
         pkg = fileName;
     } else {
@@ -125,18 +129,18 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
  *
  * TclpFindSymbol --
  *
- *	Looks up a symbol, by name, through a handle associated with
- *	a previously loaded piece of code (shared library).
+ *	Looks up a symbol, by name, through a handle associated with a
+ *	previously loaded piece of code (shared library).
  *
  * Results:
- *	Returns a pointer to the function associated with 'symbol' if
- *	it is found.  Otherwise returns NULL and may leave an error
- *	message in the interp's result.
+ *	Returns a pointer to the function associated with 'symbol' if it is
+ *	found.  Otherwise returns NULL and may leave an error message in the
+ *	interp's result.
  *
  *----------------------------------------------------------------------
  */
 Tcl_PackageInitProc*
-TclpFindSymbol(interp, loadHandle, symbol) 
+TclpFindSymbol(interp, loadHandle, symbol)
     Tcl_Interp *interp;
     Tcl_LoadHandle loadHandle;
     CONST char *symbol;
@@ -149,9 +153,9 @@ TclpFindSymbol(interp, loadHandle, symbol)
  *
  * TclpUnloadFile --
  *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
+ *	Unloads a dynamically loaded binary code file from memory.  Code
+ *	pointers in the formerly loaded file are no longer valid after calling
+ *	this function.
  *
  * Results:
  *	None.
@@ -164,10 +168,9 @@ TclpFindSymbol(interp, loadHandle, symbol)
 
 void
 TclpUnloadFile(loadHandle)
-    Tcl_LoadHandle loadHandle;	/* loadHandle returned by a previous call
-				 * to TclpDlopen().  The loadHandle is 
-				 * a token that represents the loaded 
-				 * file. */
+    Tcl_LoadHandle loadHandle;	/* loadHandle returned by a previous call to
+				 * TclpDlopen().  The loadHandle is a token
+				 * that represents the loaded file. */
 {
 }
 
@@ -176,14 +179,14 @@ TclpUnloadFile(loadHandle)
  *
  * TclGuessPackageName --
  *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
+ *	If the "load" command is invoked without providing a package name,
+ *	this procedure is invoked to try to figure it out.
  *
  * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
+ *	Always returns 0 to indicate that we couldn't figure out a package
+ *	name; generic code will then try to guess the package from the file
+ *	name.  A return value of 1 would have meant that we figured out the
+ *	package name and put it in bufPtr.
  *
  * Side effects:
  *	None.
@@ -195,8 +198,16 @@ int
 TclGuessPackageName(fileName, bufPtr)
     CONST char *fileName;	/* Name of file containing package (already
 				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
+    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append package
+				 * name to this if possible. */
 {
     return 0;
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */