From owner-svn-src-all@FreeBSD.ORG Sat Dec 17 14:51:25 2011 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 95F1D106564A; Sat, 17 Dec 2011 14:51:25 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A9168FC16; Sat, 17 Dec 2011 14:51:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBHEpP06063605; Sat, 17 Dec 2011 14:51:25 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBHEpPtM063602; Sat, 17 Dec 2011 14:51:25 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201112171451.pBHEpPtM063602@svn.freebsd.org> From: Dimitry Andric Date: Sat, 17 Dec 2011 14:51:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228629 - head/usr.bin/gprof 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: Sat, 17 Dec 2011 14:51:25 -0000 Author: dim Date: Sat Dec 17 14:51:24 2011 New Revision: 228629 URL: http://svn.freebsd.org/changeset/base/228629 Log: More fixes for correct printf length modifiers usr.bin/gprof. MFC after: 1 week Modified: head/usr.bin/gprof/aout.c head/usr.bin/gprof/arcs.c Modified: head/usr.bin/gprof/aout.c ============================================================================== --- head/usr.bin/gprof/aout.c Sat Dec 17 14:37:41 2011 (r228628) +++ head/usr.bin/gprof/aout.c Sat Dec 17 14:51:24 2011 (r228629) @@ -134,7 +134,7 @@ getsymtab(FILE *nfile, const char *filen askfor = nname + 1; nl = (nltype *) calloc( askfor , sizeof(nltype) ); if (nl == 0) - errx( 1 , "no room for %d bytes of symbol table" , + errx( 1 , "no room for %zu bytes of symbol table" , askfor * sizeof(nltype) ); /* pass2 - read symbols */ Modified: head/usr.bin/gprof/arcs.c ============================================================================== --- head/usr.bin/gprof/arcs.c Sat Dec 17 14:37:41 2011 (r228628) +++ head/usr.bin/gprof/arcs.c Sat Dec 17 14:51:24 2011 (r228629) @@ -378,7 +378,7 @@ cyclelink() */ cyclenl = (nltype *) calloc( ncycle + 1 , sizeof( nltype ) ); if ( cyclenl == 0 ) - errx( 1 , "no room for %d bytes of cycle headers" , + errx( 1 , "no room for %zu bytes of cycle headers" , ( ncycle + 1 ) * sizeof( nltype ) ); /* * now link cycles to true cycleheads, @@ -481,7 +481,7 @@ cycleanalyze() done = FALSE; cyclestack = (arctype **) calloc( size + 1 , sizeof( arctype *) ); if ( cyclestack == 0 ) - errx( 1, "no room for %d bytes of cycle stack" , + errx( 1, "no room for %zu bytes of cycle stack" , ( size + 1 ) * sizeof( arctype * ) ); # ifdef DEBUG if ( debug & BREAKCYCLE ) { @@ -599,7 +599,7 @@ addcycle( stkstart , stkend ) clp = (cltype *) calloc( 1 , sizeof ( cltype ) + ( size - 1 ) * sizeof( arctype * ) ); if ( clp == 0 ) { - warnx( "no room for %d bytes of subcycle storage" , + warnx( "no room for %zu bytes of subcycle storage" , sizeof ( cltype ) + ( size - 1 ) * sizeof( arctype * ) ); return( FALSE ); }