From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DI-0004ro-02 for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sx8DB-00068j-Qu for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sx8DB-00067e-IO for qemu-devel@nongnu.org; Thu, 02 Aug 2012 23:06:01 -0400 From: Eduardo Habkost Date: Thu, 2 Aug 2012 23:59:12 -0300 Message-Id: <1343962766-22024-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> References: <1343962766-22024-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 05/19] cpu_x86_build_from_name: use strtok_r() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index be04e4b..154a01f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1083,8 +1083,9 @@ static int cpu_x86_build_from_name(x86_def_t *x86_cpu_def, unsigned int i; x86_def_t *def; + char *last; char *s = g_strdup(cpu_model); - char *featurestr, *name = strtok(s, ","); + char *featurestr, *name = strtok_r(s, ",", &last); /* Features to be added*/ uint32_t plus_features = 0, plus_ext_features = 0; uint32_t plus_ext2_features = 0, plus_ext3_features = 0; @@ -1115,7 +1116,7 @@ static int cpu_x86_build_from_name(x86_def_t *x86_cpu_def, &plus_ext_features, &plus_ext2_features, &plus_ext3_features, &plus_kvm_features, &plus_svm_features); - featurestr = strtok(NULL, ","); + featurestr = strtok_r(NULL, ",", &last); while (featurestr) { char *val; @@ -1226,7 +1227,7 @@ static int cpu_x86_build_from_name(x86_def_t *x86_cpu_def, fprintf(stderr, "feature string `%s' not in format (+feature|-feature|feature=xyz)\n", featurestr); goto error; } - featurestr = strtok(NULL, ","); + featurestr = strtok_r(NULL, ",", &last); } x86_cpu_def->features |= plus_features; x86_cpu_def->ext_features |= plus_ext_features; -- 1.7.11.2