From owner-svn-src-head@FreeBSD.ORG  Sat Jul  9 18:47:52 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B93A1065746;
	Sat,  9 Jul 2011 18:47:52 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B7B08FC1E;
	Sat,  9 Jul 2011 18:47:52 +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 p69IlqF2012112;
	Sat, 9 Jul 2011 18:47:52 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p69Ilq5Z012110;
	Sat, 9 Jul 2011 18:47:52 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201107091847.p69Ilq5Z012110@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 9 Jul 2011 18:47:52 +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: r223893 - head/sys/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 09 Jul 2011 18:47:52 -0000

Author: marius
Date: Sat Jul  9 18:47:51 2011
New Revision: 223893
URL: http://svn.freebsd.org/changeset/base/223893

Log:
  Fix the definition for PCPU_NAME_LEN, which is intended to fit
  ("CPU %d", cpuid) where cpuid <= MAXCPU.
  
  1. sizeof(__XSTRING(MAXCPU) + 1) is a typo: typeof(__XSTRING(...) + 1)
     is 'char *', so sizeof() will return the size of the pointer, not
     the size of the string contents. The proper expression should be
     'sizeof(__XSTRING(MAXCPU)) + 1'.
  
  2. One should not add one, but substract it: sizeof() accounts for the
     trailing '\0' and we have two sizeof's, so the size of one '\0'
     should be substracted -- this will give the maximal string buffer
     length for CPU with its number, no less, no more.
  
  Submitted by:	rea

Modified:
  head/sys/sys/pcpu.h

Modified: head/sys/sys/pcpu.h
==============================================================================
--- head/sys/sys/pcpu.h	Sat Jul  9 18:09:57 2011	(r223892)
+++ head/sys/sys/pcpu.h	Sat Jul  9 18:47:51 2011	(r223893)
@@ -146,7 +146,7 @@ struct rm_queue {
 	struct rm_queue* volatile rmq_prev;
 };
 
-#define	PCPU_NAME_LEN (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU) + 1))
+#define	PCPU_NAME_LEN (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU)) - 1)
 
 /*
  * This structure maps out the global data that needs to be kept on a