From owner-svn-src-all@FreeBSD.ORG  Tue Jun  9 12:39:18 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 0637F106566B;
	Tue,  9 Jun 2009 12:39:18 +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 E81C98FC14;
	Tue,  9 Jun 2009 12:39:17 +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 n59CdHok071384;
	Tue, 9 Jun 2009 12:39:17 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59CdHwj071383;
	Tue, 9 Jun 2009 12:39:17 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906091239.n59CdHwj071383@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Tue, 9 Jun 2009 12:39:17 +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: r193827 - stable/7/lib/libthread_db
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 12:39:18 -0000

Author: des
Date: Tue Jun  9 12:39:17 2009
New Revision: 193827
URL: http://svn.freebsd.org/changeset/base/193827

Log:
  merge r181651, r193826: avoid writing an int to a char *.

Modified:
  stable/7/lib/libthread_db/   (props changed)
  stable/7/lib/libthread_db/libthr_db.c

Modified: stable/7/lib/libthread_db/libthr_db.c
==============================================================================
--- stable/7/lib/libthread_db/libthr_db.c	Tue Jun  9 12:32:10 2009	(r193826)
+++ stable/7/lib/libthread_db/libthr_db.c	Tue Jun  9 12:39:17 2009	(r193827)
@@ -457,6 +457,7 @@ pt_thr_get_info(const td_thrhandle_t *th
 {
 	const td_thragent_t *ta = th->th_ta;
 	struct ptrace_lwpinfo linfo;
+	int traceme;
 	int state;
 	int ret;
 
@@ -470,7 +471,8 @@ pt_thr_get_info(const td_thrhandle_t *th
 	if (ret != 0)
 		return (TD_ERR);
 	ret = thr_pread_int(ta, th->th_thread + ta->thread_off_report_events,
-	    &info->ti_traceme);
+	    &traceme);
+	info->ti_traceme = traceme;
 	if (ret != 0)
 		return (TD_ERR);
 	ret = ps_pread(ta->ph, th->th_thread + ta->thread_off_event_mask,