[{"id":232,"web_url":"https://patchwork.libcamera.org/comment/232/","msgid":"<1597939.10xkH5NzAb@avalon>","date":"2019-01-07T19:32:54","subject":"Re: [libcamera-devel] [PATCH] libcamera: media_object: Rename\n\tmajor/minor functions","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Monday, 7 January 2019 19:09:02 EET Kieran Bingham wrote:\n> The system libraries define macro's for major/minor through\n> on some versions of GCC/GLibc.\n> \n> To prevent namespace collisions with these macros, rename our major and\n> minor device node accessors.\n> \n> Signed-off-by: Kieran Bingham \n> ---\n> src/libcamera/device_enumerator.cpp | 4 ++--\n> src/libcamera/include/media_object.h | 4 ++--\n\nNo documentation update ? Apart from that,\n\nReviewed-by: Laurent Pinchart \n\n> 2 files changed, 4 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/device_enumerator.cpp\n> b/src/libcamera/device_enumerator.cpp index 7ad1c501ff3d..c088f3e5d243\n> 100644\n> --- a/src/libcamera/device_enumerator.cpp\n> +++ b/src/libcamera/device_enumerator.cpp\n> @@ -208,10 +208,10 @@ int DeviceEnumerator::addDevice(const std::string\n> &devnode)\n> \n> \t/* Associate entities to device node paths. */\n> \tfor (MediaEntity *entity : media->entities()) {\n> -\t\tif (entity->major() == 0 && entity->minor() == 0)\n> +\t\tif (entity->deviceMajor() == 0 && entity->deviceMinor() == 0)\n> \t\t\tcontinue;\n> \n> -\t\tstd::string devnode = lookupDevnode(entity->major(), entity->minor());\n> +\t\tstd::string devnode = lookupDevnode(entity->deviceMajor(),\n> entity->deviceMinor());\n> \t\tif (devnode.empty())\n> \t\t\treturn -EINVAL;\n> \n> diff --git a/src/libcamera/include/media_object.h\n> b/src/libcamera/include/media_object.h index 950a33286690..04b9a8909465\n> 100644\n> --- a/src/libcamera/include/media_object.h\n> +++ b/src/libcamera/include/media_object.h\n> @@ -80,8 +80,8 @@ class MediaEntity : public MediaObject\n> {\n> public:\n> \tconst std::string &name() const { return name_; }\n> -\tunsigned int major() const { return major_; }\n> -\tunsigned int minor() const { return minor_; }\n> +\tunsigned int deviceMajor() const { return major_; }\n> +\tunsigned int deviceMinor() const { return minor_; }\n> \n> \tconst std::vector &pads() const { return pads_; }","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2CB5B600CC\n\tfor ;\n\tMon, 7 Jan 2019 20:32:24 +0100 (CET)","from avalon.localnet (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4839FE22;\n\tMon, 7 Jan 2019 20:32:23 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1546889543;\n\tbh=eopaxYe/aKZY2PmjWm2+MI9DnrLD+AtyWPgKjkh2Rmg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rOysMZO+sFurHQ4jjbezyBgPGbZaHCB0q0qm3Cu7CbKUzs4PHrRUS+ZCDcoZUq8rJ\n\tODxK/3qS6SGJDiCS+TKeoJijsXZB5zJd7mVaPug4b3lTZHxDltK5UERfJFExdw05AM\n\tjuuLxYzvkwTFC7rhwZuk5+ohI9F/w1aoyo+KEHA0=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 07 Jan 2019 21:32:54 +0200","Message-ID":"<1597939.10xkH5NzAb@avalon>","Organization":"Ideas on Board Oy","In-Reply-To":"<20190107170902.13618-1-kieran.bingham@ideasonboard.com>","References":"<20190107170902.13618-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"7Bit","Content-Type":"text/plain; charset=\"us-ascii\"","Subject":"Re: [libcamera-devel] [PATCH] libcamera: media_object: Rename\n\tmajor/minor functions","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 07 Jan 2019 19:32:24 -0000"}},{"id":247,"web_url":"https://patchwork.libcamera.org/comment/247/","msgid":"<17a24606-d8ef-5e7d-9450-bd3bdc45affe@ideasonboard.com>","date":"2019-01-08T10:53:55","subject":"Re: [libcamera-devel] [PATCH] libcamera: media_object: Rename\n\tmajor/minor functions","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 07/01/2019 19:32, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Monday, 7 January 2019 19:09:02 EET Kieran Bingham wrote:\n>> The system libraries define macro's for major/minor through\n>> on some versions of GCC/GLibc.\n>>\n>> To prevent namespace collisions with these macros, rename our major and\n>> minor device node accessors.\n>>\n>> Signed-off-by: Kieran Bingham \n>> ---\n>> src/libcamera/device_enumerator.cpp | 4 ++--\n>> src/libcamera/include/media_object.h | 4 ++--\n> \n> No documentation update ? Apart from that,\n> \n\nUgh ... that's what happens when the documentation is away from the code :-(\n\nI'll respin a v2 (/3?)\n\n> Reviewed-by: Laurent Pinchart \n> \n>> 2 files changed, 4 insertions(+), 4 deletions(-)\n>>\n>> diff --git a/src/libcamera/device_enumerator.cpp\n>> b/src/libcamera/device_enumerator.cpp index 7ad1c501ff3d..c088f3e5d243\n>> 100644\n>> --- a/src/libcamera/device_enumerator.cpp\n>> +++ b/src/libcamera/device_enumerator.cpp\n>> @@ -208,10 +208,10 @@ int DeviceEnumerator::addDevice(const std::string\n>> &devnode)\n>>\n>> \t/* Associate entities to device node paths. */\n>> \tfor (MediaEntity *entity : media->entities()) {\n>> -\t\tif (entity->major() == 0 && entity->minor() == 0)\n>> +\t\tif (entity->deviceMajor() == 0 && entity->deviceMinor() == 0)\n>> \t\t\tcontinue;\n>>\n>> -\t\tstd::string devnode = lookupDevnode(entity->major(), entity->minor());\n>> +\t\tstd::string devnode = lookupDevnode(entity->deviceMajor(),\n>> entity->deviceMinor());\n>> \t\tif (devnode.empty())\n>> \t\t\treturn -EINVAL;\n>>\n>> diff --git a/src/libcamera/include/media_object.h\n>> b/src/libcamera/include/media_object.h index 950a33286690..04b9a8909465\n>> 100644\n>> --- a/src/libcamera/include/media_object.h\n>> +++ b/src/libcamera/include/media_object.h\n>> @@ -80,8 +80,8 @@ class MediaEntity : public MediaObject\n>> {\n>> public:\n>> \tconst std::string &name() const { return name_; }\n>> -\tunsigned int major() const { return major_; }\n>> -\tunsigned int minor() const { return minor_; }\n>> +\tunsigned int deviceMajor() const { return major_; }\n>> +\tunsigned int deviceMinor() const { return minor_; }\n>>\n>> \tconst std::vector &pads() const { return pads_; }\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 22F2260B2D\n\tfor ;\n\tTue, 8 Jan 2019 11:53:58 +0100 (CET)","from [192.168.0.21]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A481D586;\n\tTue, 8 Jan 2019 11:53:57 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1546944837;\n\tbh=rbM7xA//E1P5hxDR92F3DpefyaKbxYFeZsW6dblVta8=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=ZrICL841xl/lNYtUDb5gK9XRDvHsG2y6W2kROt38CLYnwmN2yrX2SclwH0Nndql5y\n\tTHhHg134tJGIXcZUEolVdu8GKrVU6F9in3jjIXft8Hmj2pIzVRsJv3w0KKZW5iBLYF\n\tG0k30qMVzZqgrNc/eaFizoDWt0Mlp3iz+bkVgdIk=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20190107170902.13618-1-kieran.bingham@ideasonboard.com>\n\t<1597939.10xkH5NzAb@avalon>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<17a24606-d8ef-5e7d-9450-bd3bdc45affe@ideasonboard.com>","Date":"Tue, 8 Jan 2019 10:53:55 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.2.1","MIME-Version":"1.0","In-Reply-To":"<1597939.10xkH5NzAb@avalon>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH] libcamera: media_object: Rename\n\tmajor/minor functions","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 08 Jan 2019 10:53:58 -0000"}}]