From patchwork Wed Sep 19 14:31:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 185063 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 63F912C0080 for ; Thu, 20 Sep 2012 00:40:43 +1000 (EST) Received: from localhost ([::1]:34060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELKY-0001LA-Ga for incoming@patchwork.ozlabs.org; Wed, 19 Sep 2012 10:32:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELJv-0008VB-Kf for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TELJm-0005Jl-7w for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:07 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:38427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELJm-0005Fw-1O for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:31:58 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so31777pad.4 for ; Wed, 19 Sep 2012 07:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=YmEInFcnFweNHAq0QdOCNoUkMadoNrmV57IPt2wsJKw=; b=Zgfc4OwCHYaup7Q7tMm1aPkRoajvJdzZCwxM5uO4n5cOVpVxvjwW2BDBR/40zLbrgt 083Ma4T2s//gRuxAJOXzJKFFuya7UWklAdh/Xc2gUdPTNFnvWeQlyfLlE7HGsTzP6FXy 6BcpItiA+dT74Q6lmvWflil0zIm/MCG6JLA47yovY6IOJOLxDJsRSFK/L5r3gES/Wrs/ I4fA+tUhxjfpdu/rWDjLRZioycTKrzSqBZE7w69xC8+WWlca465F3dvTKKjoTrluL0st fxByaphF8ZvOMVkAmY5if4wVtyf2QORu08B4Cb2oLKx6bZ4lCgz6iz/hKS0hyxKg7iFZ bfZA== Received: by 10.68.202.168 with SMTP id kj8mr8053270pbc.8.1348065117697; Wed, 19 Sep 2012 07:31:57 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id it5sm1939572pbc.10.2012.09.19.07.31.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 07:31:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 19 Sep 2012 16:31:07 +0200 Message-Id: <1348065078-5139-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> References: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 04/12] qapi: add "unix" to the set of reserved words 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 It is #defined to 1. Signed-off-by: Paolo Bonzini --- scripts/qapi.py | 4 +++- 1 file modificato, 3 inserzioni(+). 1 rimozione(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 057332e..afc5f32 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -156,7 +156,9 @@ def c_var(name, protect=True): # GCC http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/C-Extensions.html # excluding _.* gcc_words = set(['asm', 'typeof']) - if protect and (name in c89_words | c99_words | c11_words | gcc_words): + # namespace pollution: + polluted_words = set(['unix']) + if protect and (name in c89_words | c99_words | c11_words | gcc_words | polluted_words): return "q_" + name return name.replace('-', '_').lstrip("*")