From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1S3wx3-0004Pb-N2 for mharc-grub-devel@gnu.org; Sat, 03 Mar 2012 16:57:17 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3wx0-0004OO-Ft for grub-devel@gnu.org; Sat, 03 Mar 2012 16:57:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S3wwy-0005VU-KX for grub-devel@gnu.org; Sat, 03 Mar 2012 16:57:14 -0500 Received: from wp191.webpack.hosteurope.de ([80.237.132.198]:33501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S3wwy-0005Ur-8d for grub-devel@gnu.org; Sat, 03 Mar 2012 16:57:12 -0500 Received: from p54ba694b.dip.t-dialin.net ([84.186.105.75] helo=neptun.omega.ssw.de); authenticated by wp191.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) id 1S3wwv-0002dU-Uj; Sat, 03 Mar 2012 22:57:10 +0100 Received: from localhost (localhost [127.0.0.1]) by neptun.omega.ssw.de (Postfix) with ESMTP id 2602BE180A8; Sat, 3 Mar 2012 22:57:09 +0100 (CET) X-Virus-Scanned: amavisd-new at omega.ssw.de Received: from neptun.omega.ssw.de ([127.0.0.1]) by localhost (neptun.omega.ssw.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uROH93vBKQxb; Sat, 3 Mar 2012 22:56:58 +0100 (CET) Received: from [192.168.3.102] (ANVOIT-2.fritz.box [192.168.2.21]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by neptun.omega.ssw.de (Postfix) with ESMTP id 6B43BE180A7; Sat, 3 Mar 2012 22:56:58 +0100 (CET) Message-ID: <4F5293A4.6030402@anvo-it.de> Date: Sat, 03 Mar 2012 22:56:52 +0100 From: Andreas Vogel User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] Using enum symbols as indices into menuentry options References: <4F528409.2010901@anvo-it.de> <4F528713.2000506@gmail.com> <4F528960.7040308@anvo-it.de> <4F528C11.7060409@gmail.com> In-Reply-To: <4F528C11.7060409@gmail.com> Content-Type: multipart/mixed; boundary="------------020004080906040207010205" X-bounce-key: webpack.hosteurope.de; andreas.vogel@anvo-it.de; 1330811832; a7eb0e22; X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.237.132.198 Cc: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Mar 2012 21:57:15 -0000 This is a multi-part message in MIME format. --------------020004080906040207010205 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit > Keep list CC'ed. > On 03.03.2012 22:13, Andreas Vogel wrote: >>> On 03.03.2012 21:50, Andreas Vogel wrote: >>>> +enum options >>>> + { >>> Please don't define a type here, especially that a type "options" can >>> easily conflict with something else. >>> >> I reused that idea from commands/search_wrap.c and basically i liked >> that idea. > Just use an anonymous enum. > Please find attached the corrected patch using an anonymous enum. --------------020004080906040207010205 Content-Type: text/plain; name="02-menuentry_options_enum.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="02-menuentry_options_enum.patch" PT09IG1vZGlmaWVkIGZpbGUgJ2dydWItY29yZS9jb21tYW5kcy9tZW51ZW50cnkuYycKLS0t IGdydWItY29yZS9jb21tYW5kcy9tZW51ZW50cnkuYwkyMDEyLTAzLTAxIDIxOjM4OjMyICsw MDAwCisrKyBncnViLWNvcmUvY29tbWFuZHMvbWVudWVudHJ5LmMJMjAxMi0wMy0wMiAyMTo0 Njo1NSArMDAwMApAQCAtMjUsNiArMjUsMTQgQEAKICNpbmNsdWRlIDxncnViL2kxOG4uaD4K ICNpbmNsdWRlIDxncnViL25vcm1hbC5oPgogCitlbnVtCisgIHsKKyAgICBPX0NMQVNTID0g MCwKKyAgICBPX1VTRVJTLAorICAgIE9fSE9US0VZLAorICAgIE9fU09VUkNFLAorIH07CisK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZ3J1Yl9hcmdfb3B0aW9uIG9wdGlvbnNbXSA9CiAgIHsK ICAgICB7ImNsYXNzIiwgMSwgR1JVQl9BUkdfT1BUSU9OX1JFUEVBVEFCTEUsCkBAIC0zMjQs MTggKzMzMiwxOCBAQAogICBpZiAoISBhcmdjKQogICAgIHJldHVybiBncnViX2Vycm9yIChH UlVCX0VSUl9CQURfQVJHVU1FTlQsICJtaXNzaW5nIGFyZ3VtZW50cyIpOwogCi0gIGlmIChj dHh0LT5zdGF0ZVszXS5zZXQgJiYgY3R4dC0+c2NyaXB0KQorICBpZiAoY3R4dC0+c3RhdGVb T19TT1VSQ0VdLnNldCAmJiBjdHh0LT5zY3JpcHQpCiAgICAgcmV0dXJuIGdydWJfZXJyb3Ig KEdSVUJfRVJSX0JBRF9BUkdVTUVOVCwgIm11bHRpcGxlIG1lbnVlbnRyeSBkZWZpbml0aW9u cyIpOwogCi0gIGlmICghIGN0eHQtPnN0YXRlWzNdLnNldCAmJiAhIGN0eHQtPnNjcmlwdCkK KyAgaWYgKCEgY3R4dC0+c3RhdGVbT19TT1VSQ0VdLnNldCAmJiAhIGN0eHQtPnNjcmlwdCkK ICAgICByZXR1cm4gZ3J1Yl9lcnJvciAoR1JVQl9FUlJfQkFEX0FSR1VNRU5ULCAibm8gbWVu dWVudHJ5IGRlZmluaXRpb24iKTsKIAogICBpZiAoISBjdHh0LT5zY3JpcHQpCiAgICAgcmV0 dXJuIGdydWJfbm9ybWFsX2FkZF9tZW51X2VudHJ5IChhcmdjLCAoY29uc3QgY2hhciAqKikg YXJncywKLQkJCQkgICAgICAgKGN0eHQtPnN0YXRlWzBdLnNldCA/IGN0eHQtPnN0YXRlWzBd LmFyZ3MKLQkJCQkJOiBOVUxMKSwgY3R4dC0+c3RhdGVbMV0uYXJnLAotCQkJCSAgICAgICBj dHh0LT5zdGF0ZVsyXS5hcmcsIDAsCi0JCQkJICAgICAgIGN0eHQtPnN0YXRlWzNdLmFyZywK KwkJCQkgICAgICAgKGN0eHQtPnN0YXRlW09fQ0xBU1NdLnNldCA/IGN0eHQtPnN0YXRlW09f Q0xBU1NdLmFyZ3MKKwkJCQkJOiBOVUxMKSwgY3R4dC0+c3RhdGVbT19VU0VSU10uYXJnLAor CQkJCSAgICAgICBjdHh0LT5zdGF0ZVtPX0hPVEtFWV0uYXJnLCAwLAorCQkJCSAgICAgICBj dHh0LT5zdGF0ZVtPX1NPVVJDRV0uYXJnLAogCQkJCSAgICAgICBjdHh0LT5leHRjbWQtPmNt ZC0+bmFtZVswXSA9PSAncycpOwogCiAgIHNyYyA9IGFyZ3NbYXJnYyAtIDFdOwpAQCAtMzUw LDggKzM1OCw4IEBACiAgICAgcmV0dXJuIGdydWJfZXJybm87CiAKICAgciA9IGdydWJfbm9y bWFsX2FkZF9tZW51X2VudHJ5IChhcmdjIC0gMSwgKGNvbnN0IGNoYXIgKiopIGFyZ3MsCi0J CQkJICBjdHh0LT5zdGF0ZVswXS5hcmdzLCBjdHh0LT5zdGF0ZVsxXS5hcmcsCi0JCQkJICBj dHh0LT5zdGF0ZVsyXS5hcmcsIHByZWZpeCwgc3JjICsgMSwKKwkJCQkgIGN0eHQtPnN0YXRl W09fQ0xBU1NdLmFyZ3MsIGN0eHQtPnN0YXRlW09fVVNFUlNdLmFyZywKKwkJCQkgIGN0eHQt PnN0YXRlW09fSE9US0VZXS5hcmcsIHByZWZpeCwgc3JjICsgMSwKIAkJCQkgIGN0eHQtPmV4 dGNtZC0+Y21kLT5uYW1lWzBdID09ICdzJyk7CiAKICAgc3JjW2xlbiAtIDFdID0gY2g7Cgo= --------------020004080906040207010205--