* lib/remote.exp: Tidy.

	* lib/targetdb.exp: Likewise.
	* lib/target.exp (prune_warnings): Improve comments.
	* lib/dejagnu.exp: Likewise.
	* lib/utils.exp: Likewise.

5 files changed, 18 insertions, 33 deletions

diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp
index 759c1df..6809f0e 100755
--- a/lib/dejagnu.exp
+++ b/lib/dejagnu.exp
@@ -17,9 +17,9 @@
 # along with DejaGnu; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# This file was written by Rob Savoye. (rob@welcomehome.org)
+# This file was written by Rob Savoye (rob@welcomehome.org).
 
-# a hairy pattern to recognize text
+# A hairy pattern to recognize text.
 set text "\[- A-Za-z0-9\.\;\"\_\:\'\`\(\)\!\#\=\+\?\&\*]"
 
 set SIZE size
@@ -27,7 +27,7 @@ if { [which $SIZE] == 0 } {
     perror "Can't find $SIZE."
 }
 
-# Get the size of the various section in an object file
+# Get the size of the various section in OBJECT.
 proc exe_size {object} {
     global SIZE
 
@@ -69,6 +69,7 @@ proc exe_size {object} {
 #    Returns:
 #	A "" (empty) string if everything worked, or the
 #       output if there was a problem.
+#
 proc host_compile {compline} {
     global INCLUDES
     global LIBS
diff --git a/lib/remote.exp b/lib/remote.exp
index d2bd948..6665703 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -28,7 +28,6 @@ load_lib "tip.exp"
 load_lib "rsh.exp"
 load_lib "ftp.exp"
 
-#
 # Open a connection to a remote host or target. This requires the target_info
 # array be filled in with the proper info to work.
 #
@@ -333,7 +332,6 @@ proc standard_close { host } {
     return 0
 }
 
-#
 # Set the connection into "binary" mode, a.k.a. no processing of input
 # characters.
 #
@@ -501,12 +499,10 @@ proc standard_upload { dest srcfile destfile } {
     return [rsh_upload $dest $srcfile $destfile]
 }
 
-#
 # A standard procedure to call the appropriate function. It first looks
 # for a board-specific version, then a version specific to the protocol,
 # and then finally it will call standard_$proc.
 #
-
 proc call_remote { type proc dest args } {
     if [board_info $dest exists name] {
 	set dest [board_info $dest name]
@@ -583,7 +579,6 @@ proc call_remote { type proc dest args } {
     return -1
 }
 
-#
 # Send FILE through the existing session established to DEST.
 #
 proc remote_transmit { dest file } {
@@ -594,7 +589,6 @@ proc remote_raw_transmit { dest file } {
     return [call_remote raw transmit "$dest" "$file"]
 }
 
-#
 # The default transmit procedure if no other exists. This feeds the
 # supplied file directly into the connection.
 #
@@ -674,10 +668,8 @@ proc remote_raw_file { dest args } {
     return [eval call_remote raw file \"$dest\" $args]
 }
 
-#
 # Perform the specified file op on a remote Unix board.
 #
-
 proc standard_file { dest op args } {
     set file [lindex $args 0]
     verbose "dest in proc standard_file is $dest" 3
@@ -745,7 +737,6 @@ proc standard_file { dest op args } {
     }
 }
 
-#
 # Return an absolute version of the filename in $file, with . and ..
 # removed.
 #
diff --git a/lib/target.exp b/lib/target.exp
index 866f6e5..2fc1c31 100644
--- a/lib/target.exp
+++ b/lib/target.exp
@@ -122,7 +122,10 @@ proc pop_host { } {
 }
 
 #
-# Remove extraneous warnings we don't care about
+# Remove extraneous warnings from TEXT.
+#
+# An example is:
+# ld.so: warning: /usr/lib/libc.so.1.8.1 has older revision than expected 9
 #
 proc prune_warnings { text } {
     global host_triplet
diff --git a/lib/targetdb.exp b/lib/targetdb.exp
index 12cc0c8..3a72434 100644
--- a/lib/targetdb.exp
+++ b/lib/targetdb.exp
@@ -17,7 +17,6 @@
 # along with DejaGnu; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-#
 # Searches in the appropriate place (the board_info array) for the specified
 # information.
 #
@@ -64,7 +63,6 @@ proc host_info { op args } {
     return [eval "board_info host \"$op\" $args"]
 }
 
-#
 # Fill in ENTRY with VALUE for the current board being defined.
 #
 proc set_board_info { entry value } {
@@ -75,7 +73,6 @@ proc set_board_info { entry value } {
     }
 }
 
-#
 # Fill in ENTRY with VALUE for the current target.
 #
 proc set_currtarget_info { entry value } {
@@ -88,7 +85,6 @@ proc set_currtarget_info { entry value } {
     }
 }
 
-#
 # Unset ENTRY for the current board being defined.
 #
 proc unset_board_info { entry } {
@@ -99,7 +95,6 @@ proc unset_board_info { entry } {
     }
 }
 
-#
 # Unset ENTRY for the current board being defined.
 #
 proc unset_currtarget_info { entry } {
diff --git a/lib/utils.exp b/lib/utils.exp
index 9fe009e..70a4081 100644
--- a/lib/utils.exp
+++ b/lib/utils.exp
@@ -1,5 +1,5 @@
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-# 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 #
 # This file is part of DejaGnu.
 #
@@ -19,12 +19,10 @@
 
 # This file was written by Rob Savoye. (rob@welcomehome.org)
 
-#
-# Most of the procedures found here mimic their unix counter-part.
-# This file is sourced by runtest.exp, so they are usable by any test case.
-#
+# Most of the procedures found here mimic their UNIX counterpart.
+# This file is sourced by runtest.exp, so they are usable by any test
+# script.
 
-#
 # Gets the directories in a directory, or in a directory tree.
 #     args: the first is the dir to look in, the next
 #         is the pattern to match. It
@@ -86,7 +84,6 @@ proc getdirs { args } {
     }
 }
 
-#
 # Finds paths of all non-directory files, recursively, whose names match
 # a pattern.  Certain directory name are not searched (see proc getdirs).
 #     rootdir - search in this directory and its subdirectories, recursively.
@@ -116,12 +113,11 @@ proc find { rootdir pattern } {
     return $files
 }
 
-#
-# Search the path for a file. This is basically a version
-# of the BSD-unix which utility. This procedure depends on
-# the shell environment variable $PATH. It returns 0 if $PATH
-# does not exist or the binary is not in the path. If the
-# binary is in the path, it returns the full path to the binary.
+# Search the path for a file. This is basically a version of the BSD
+# Unix which(1) utility. This procedure depends on the shell
+# environment variable $PATH. It returns 0 if $PATH does not exist or
+# the binary is not in the path. If the binary is in the path, it
+# returns the full path to the binary.
 #
 proc which { file } {
     global env
@@ -154,8 +150,7 @@ proc which { file } {
     return 0
 }
 
-#
-# Looks for a string in a file.
+# Looks for occurrences of a string in a file.
 #     return:list of lines that matched or NULL if none match.
 #     args:  first arg is the filename,
 #            second is the pattern,