From owner-p4-projects@FreeBSD.ORG Fri Nov 30 08:57:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE64B16A41A; Fri, 30 Nov 2007 08:57:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8528E16A417 for ; Fri, 30 Nov 2007 08:57:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E1E013C45B for ; Fri, 30 Nov 2007 08:57:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAU8vvHr013373 for ; Fri, 30 Nov 2007 08:57:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAU8vvtA013370 for perforce@freebsd.org; Fri, 30 Nov 2007 08:57:57 GMT (envelope-from jb@freebsd.org) Date: Fri, 30 Nov 2007 08:57:57 GMT Message-Id: <200711300857.lAU8vvtA013370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2007 08:57:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=129818 Change 129818 by jb@jb_freebsd1 on 2007/11/30 08:57:38 Make this compile cleanly. No vendor branch here. Nyuk Nyuk Nyuk. Affected files ... .. //depot/projects/binutils/src/contrib/binutils/intl/l10nflist.c#3 edit Differences ... ==== //depot/projects/binutils/src/contrib/binutils/intl/l10nflist.c#3 (text+ko) ==== @@ -139,12 +139,12 @@ #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ #if !defined _LIBC && !defined HAVE___ARGZ_NEXT -static char *argz_next__ PARAMS ((char *argz, size_t argz_len, +static const char *argz_next__ PARAMS ((const char *argz, size_t argz_len, const char *entry)); -static char * +static const char * argz_next__ (argz, argz_len, entry) - char *argz; + const char *argz; size_t argz_len; const char *entry; { @@ -366,9 +366,9 @@ if (dirlist_count > 1) { /* Iterate over all elements of the DIRLIST. */ - char *dir = NULL; + const char *dir = NULL; - while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) + while ((dir = __argz_next (dirlist, dirlist_len, dir)) != NULL) retval->successor[entries++] = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,