From owner-svn-src-head@FreeBSD.ORG  Thu Mar  7 22:43:51 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 708A7927;
 Thu,  7 Mar 2013 22:43:51 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 58ECD8AF;
 Thu,  7 Mar 2013 22:43:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27Mhov4039450;
 Thu, 7 Mar 2013 22:43:50 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27Mhopv039449;
 Thu, 7 Mar 2013 22:43:50 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201303072243.r27Mhopv039449@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 7 Mar 2013 22:43:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247962 - head/cddl/contrib/opensolaris/tools/ctf/cvt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Mar 2013 22:43:51 -0000

Author: dim
Date: Thu Mar  7 22:43:50 2013
New Revision: 247962
URL: http://svnweb.freebsd.org/changeset/base/247962

Log:
  Fix error in r247960: actually assign the basename to match.iim_file.
  
  Pointed out by:	avg
  Pointy hat to:	dim
  MFC after:	1 week
  X-MFC-With:	r247960

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Thu Mar  7 22:32:41 2013	(r247961)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Thu Mar  7 22:43:50 2013	(r247962)
@@ -379,8 +379,7 @@ sort_iidescs(Elf *elf, const char *file,
 		switch (GELF_ST_TYPE(sym.st_info)) {
 		case STT_FILE:
 			bname = strrchr(match.iim_name, '/');
-			bname = bname == NULL ? match.iim_name : bname + 1;
-			match.iim_file = match.iim_name;
+			match.iim_file = bname == NULL ? match.iim_name : bname + 1;
 			continue;
 		case STT_OBJECT:
 			tolist = iiburst->iib_objts;