From owner-p4-projects@FreeBSD.ORG Fri Jan 21 02:19:01 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 129A916A4D0; Fri, 21 Jan 2005 02:19:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1C0C16A4CE for ; Fri, 21 Jan 2005 02:19:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A618C43D5A for ; Fri, 21 Jan 2005 02:19:00 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0L2J0YL011470 for ; Fri, 21 Jan 2005 02:19:00 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0L2J02g011467 for perforce@freebsd.org; Fri, 21 Jan 2005 02:19:00 GMT (envelope-from peter@freebsd.org) Date: Fri, 21 Jan 2005 02:19:00 GMT Message-Id: <200501210219.j0L2J02g011467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 69415 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2005 02:19:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=69415 Change 69415 by peter@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 @@ -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) ====