From patchwork Wed May 30 07:46:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Meyering X-Patchwork-Id: 161906 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9E11EB702A for ; Wed, 30 May 2012 19:25:18 +1000 (EST) Received: from localhost ([::1]:59793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZdeG-0002JO-3M for incoming@patchwork.ozlabs.org; Wed, 30 May 2012 03:48:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZddD-0000ys-DW for qemu-devel@nongnu.org; Wed, 30 May 2012 03:47:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZdd6-0001kI-Tk for qemu-devel@nongnu.org; Wed, 30 May 2012 03:47:46 -0400 Received: from mx.meyering.net ([88.168.87.75]:49326 helo=hx.meyering.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZdd6-0001jg-Fi for qemu-devel@nongnu.org; Wed, 30 May 2012 03:47:40 -0400 Received: from hx.meyering.net (hx.meyering.net [127.0.0.1]) by hx.meyering.net (8.14.5/8.14.5) with ESMTP id q4U7lcf6014025; Wed, 30 May 2012 09:47:38 +0200 Received: (from meyering@localhost) by hx.meyering.net (8.14.5/8.14.5/Submit) id q4U7lblg014024; Wed, 30 May 2012 09:47:37 +0200 From: Jim Meyering To: qemu-devel@nongnu.org Date: Wed, 30 May 2012 09:46:34 +0200 Message-Id: <1338364001-13892-16-git-send-email-jim@meyering.net> X-Mailer: git-send-email 1.7.10.2.605.gbefc5ed In-Reply-To: <1338364001-13892-1-git-send-email-jim@meyering.net> References: <1338364001-13892-1-git-send-email-jim@meyering.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 88.168.87.75 Cc: Jim Meyering Subject: [Qemu-devel] [PATCHv2 15/22] target-i386: use pstrcpy, not strncpy X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jim Meyering Use pstrcpy rather than strncpy in one more case (in cpudef_setfield). This makes our handling of ->model_id consistent with another pstrcpy-vs-model_id use below. Signed-off-by: Jim Meyering --- target-i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 388bc5c..722e597 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1275,7 +1275,7 @@ static int cpudef_setfield(const char *name, const char *str, void *opaque) g_free((void *)def->name); def->name = g_strdup(str); } else if (!strcmp(name, "model_id")) { - strncpy(def->model_id, str, sizeof (def->model_id)); + pstrcpy(def->model_id, sizeof(def->model_id), str); } else if (!strcmp(name, "level")) { setscalar(&def->level, str, &err) } else if (!strcmp(name, "vendor")) {