From owner-svn-src-all@FreeBSD.ORG Sun Jan 1 19:11:48 2012 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 7CA8B106566B; Sun, 1 Jan 2012 19:11:48 +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 4C5D98FC14; Sun, 1 Jan 2012 19:11:48 +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 q01JBmuZ026519; Sun, 1 Jan 2012 19:11:48 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q01JBm11026516; Sun, 1 Jan 2012 19:11:48 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201201011911.q01JBm11026516@svn.freebsd.org> From: Dimitry Andric Date: Sun, 1 Jan 2012 19:11:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229190 - stable/9/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: Sun, 01 Jan 2012 19:11:48 -0000 Author: dim Date: Sun Jan 1 19:11:47 2012 New Revision: 229190 URL: http://svn.freebsd.org/changeset/base/229190 Log: MFC r228628: In usr.bin/gprof/aout.c, use the correct printf length modifier for a uint32_t. MFC r228629: More fixes for correct printf length modifiers usr.bin/gprof. Modified: stable/9/usr.bin/gprof/aout.c stable/9/usr.bin/gprof/arcs.c Directory Properties: stable/9/usr.bin/gprof/ (props changed) Modified: stable/9/usr.bin/gprof/aout.c ============================================================================== --- stable/9/usr.bin/gprof/aout.c Sun Jan 1 19:08:56 2012 (r229189) +++ stable/9/usr.bin/gprof/aout.c Sun Jan 1 19:11:47 2012 (r229190) @@ -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 */ @@ -175,7 +175,7 @@ gettextspace(FILE *nfile) textspace = (u_char *) malloc( xbuf.a_text ); if ( textspace == 0 ) { - warnx("no room for %lu bytes of text space: can't do -c" , + warnx("no room for %u bytes of text space: can't do -c" , xbuf.a_text ); return; } Modified: stable/9/usr.bin/gprof/arcs.c ============================================================================== --- stable/9/usr.bin/gprof/arcs.c Sun Jan 1 19:08:56 2012 (r229189) +++ stable/9/usr.bin/gprof/arcs.c Sun Jan 1 19:11:47 2012 (r229190) @@ -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 ); }