From owner-svn-src-all@FreeBSD.ORG Wed Jun 10 14:52:35 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7491F1065670; Wed, 10 Jun 2009 14:52:35 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 47C028FC14; Wed, 10 Jun 2009 14:52:35 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AEqZSj017008; Wed, 10 Jun 2009 14:52:35 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AEqZwV017005; Wed, 10 Jun 2009 14:52:35 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200906101452.n5AEqZwV017005@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Wed, 10 Jun 2009 14:52:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193928 - stable/7/lib/libutil X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 14:52:36 -0000 Author: des Date: Wed Jun 10 14:52:34 2009 New Revision: 193928 URL: http://svn.freebsd.org/changeset/base/193928 Log: merge r173719: constify expand_number(3). Modified: stable/7/lib/libutil/ (props changed) stable/7/lib/libutil/expand_number.3 stable/7/lib/libutil/expand_number.c stable/7/lib/libutil/libutil.h Modified: stable/7/lib/libutil/expand_number.3 ============================================================================== --- stable/7/lib/libutil/expand_number.3 Wed Jun 10 14:38:39 2009 (r193927) +++ stable/7/lib/libutil/expand_number.3 Wed Jun 10 14:52:34 2009 (r193928) @@ -37,7 +37,7 @@ .In libutil.h .Ft int .Fo expand_number -.Fa "char *buf" "int64_t *num" +.Fa "const char *buf" "int64_t *num" .Fc .Sh DESCRIPTION The Modified: stable/7/lib/libutil/expand_number.c ============================================================================== --- stable/7/lib/libutil/expand_number.c Wed Jun 10 14:38:39 2009 (r193927) +++ stable/7/lib/libutil/expand_number.c Wed Jun 10 14:52:34 2009 (r193928) @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); * 8) A positive decimal number followed by a 'e' or 'E' (mult by 1 << 60). */ int -expand_number(char *buf, int64_t *num) +expand_number(const char *buf, int64_t *num) { static const char unit[] = "bkmgtpe"; char *endptr, s; Modified: stable/7/lib/libutil/libutil.h ============================================================================== --- stable/7/lib/libutil/libutil.h Wed Jun 10 14:38:39 2009 (r193927) +++ stable/7/lib/libutil/libutil.h Wed Jun 10 14:52:34 2009 (r193928) @@ -84,7 +84,7 @@ int forkpty(int *_amaster, char *_name, struct termios *_termp, struct winsize *_winp); int humanize_number(char *_buf, size_t _len, int64_t _number, const char *_suffix, int _scale, int _flags); -int expand_number(char *_buf, int64_t *_num); +int expand_number(const char *_buf, int64_t *_num); const char *uu_lockerr(int _uu_lockresult); int uu_lock(const char *_ttyname); int uu_unlock(const char *_ttyname);