PERFORCE change 69415 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=69415

Change 69415 by peter at peter_daintree on 2005/01/21 02:18:31

	IFC @69408 (mismerge)

Affected files ...

.. //depot/projects/hammer/libexec/rtld-aout/shlib.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-aout/shlib.h#2 integrate
.. //depot/projects/hammer/libexec/rtld-aout/support.c#2 integrate
.. //depot/projects/hammer/libexec/rtld-aout/support.h#2 integrate

Differences ...

==== //depot/projects/hammer/libexec/rtld-aout/shlib.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.23 2002/09/17 01:48:53 peter Exp $
+ * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.26 2005/01/14 12:22:57 delphij Exp $
  */
 
 #include <sys/param.h>
@@ -62,14 +62,13 @@
 char	 **search_dirs;
 int	n_search_dirs;
 
-char	*standard_search_dirs[] = {
+const char	*standard_search_dirs[] = {
 	STANDARD_SEARCH_DIRS
 };
 
 
 void
-add_search_dir(name)
-	char	*name;
+add_search_dir(const char *name)
 {
 	int n;
 
@@ -269,7 +268,7 @@
 	int		*minorp;
 	int		do_dot_a;
 {
-	int		namelen;
+	size_t		namelen;
 	DIR		*dd;
 	struct dirent	*dp;
 	int		best_dewey[MAXDEWEY];

==== //depot/projects/hammer/libexec/rtld-aout/shlib.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.5 1999/08/28 00:10:06 peter Exp $
+ * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.8 2005/01/14 12:22:57 delphij Exp $
  */
 
 /*
@@ -33,7 +33,7 @@
 extern char	**search_dirs;
 extern int	n_search_dirs;
 
-void	add_search_dir __P((char *));
+void	add_search_dir __P((const char *));
 void	add_search_path __P((char *));
 void	std_search_path __P((void));
 int	getdewey __P((int[], char *));

==== //depot/projects/hammer/libexec/rtld-aout/support.c#2 (text+ko) ====


==== //depot/projects/hammer/libexec/rtld-aout/support.h#2 (text+ko) ====