{"id":829,"url":"https://patchwork.libcamera.org/api/1.1/patches/829/?format=json","web_url":"https://patchwork.libcamera.org/patch/829/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190401110315.4148-4-kieran.bingham@ideasonboard.com>","date":"2019-04-01T11:03:14","name":"[libcamera-devel,v2,3/4] libcamera: utils: Use internal basename implementation.","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2dbf1dd9b8cc2236527148acd51e8f1cdd34413e","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/829/mbox/","series":[{"id":226,"url":"https://patchwork.libcamera.org/api/1.1/series/226/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=226","date":"2019-04-01T11:03:11","name":"Cleanup and non-GNU C library support","version":2,"mbox":"https://patchwork.libcamera.org/series/226/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/829/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/829/checks/","tags":{},"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 935C0600F9\n\tfor ;\n\tMon, 1 Apr 2019 13:03:34 +0200 (CEST)","from Q.imgcgcw.net (unknown [147.50.13.10])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C556B2F9;\n\tMon, 1 Apr 2019 13:03:32 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1554116614;\n\tbh=P+5u+cN+N6Iug8x+WF+BL3CxFyt0XXfDTT1OZHUhKHc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=pQTScA6ro526z0x/3ipXVh0U2VNO8NKdPnMWdO5IxTFeRuZ8H0V4Nnb9cQ9J0ED4v\n\t8oyjGy+kh/hSmouyX/3CTCCP6+mFsHeI3fX6/WMLo22tkPc88lLOXZXgh7Ic8/OSuw\n\tHWnBJjXk90+G+ULMQiHP5JL8xndwktqEjGWiS9Jg=","From":"Kieran Bingham ","To":"LibCamera Devel ","Date":"Mon, 1 Apr 2019 18:03:14 +0700","Message-Id":"<20190401110315.4148-4-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.19.1","In-Reply-To":"<20190401110315.4148-1-kieran.bingham@ideasonboard.com>","References":"<20190401110315.4148-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 3/4] libcamera: utils: Use internal\n\tbasename implementation.","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, 01 Apr 2019 11:03:34 -0000"},"content":"Differing implementations of basename() exist, some of which may modify\nthe content of the string passed as an argument.\n\nThe implementation of basename() is trivial, thus to support different\ntoolchains, provide our own version which accepts and returns a const\nchar*.\n\nUpdate the call sites to use the new implementation.\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/include/utils.h | 2 ++\n src/libcamera/log.cpp | 2 +-\n src/libcamera/meson.build | 1 +\n src/libcamera/utils.cpp | 46 +++++++++++++++++++++++++++++++++++\n 4 files changed, 50 insertions(+), 1 deletion(-)\n create mode 100644 src/libcamera/utils.cpp","diff":"diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\nindex 73fa2e69b029..1b2a62c0fda7 100644\n--- a/src/libcamera/include/utils.h\n+++ b/src/libcamera/include/utils.h\n@@ -15,6 +15,8 @@ namespace libcamera {\n \n namespace utils {\n \n+const char *basename(const char *path);\n+\n /* C++11 doesn't provide std::make_unique */\n template\n std::unique_ptr make_unique(Args&&... args)\ndiff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp\nindex 26ebf410a7a9..eb444c31857d 100644\n--- a/src/libcamera/log.cpp\n+++ b/src/libcamera/log.cpp\n@@ -438,7 +438,7 @@ void LogMessage::init(const char *fileName, unsigned int line)\n \n \tmsgStream_ << \" \" << log_severity_name(severity_);\n \tmsgStream_ << \" \" << category_.name();\n-\tmsgStream_ << \" \" << basename(fileName) << \":\" << line << \" \";\n+\tmsgStream_ << \" \" << utils::basename(fileName) << \":\" << line << \" \";\n }\n \n LogMessage::~LogMessage()\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 8384cd0af451..863cb60d4b90 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -16,6 +16,7 @@ libcamera_sources = files([\n 'signal.cpp',\n 'stream.cpp',\n 'timer.cpp',\n+ 'utils.cpp',\n 'v4l2_device.cpp',\n 'v4l2_subdevice.cpp',\n ])\ndiff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\nnew file mode 100644\nindex 000000000000..70936e36c5d5\n--- /dev/null\n+++ b/src/libcamera/utils.cpp\n@@ -0,0 +1,46 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * utils.cpp - Miscellaneous utility functions\n+ */\n+\n+#include \n+\n+#include \"utils.h\"\n+\n+/**\n+ * \\file utils.h\n+ * \\brief Miscellaneous utility functions\n+ */\n+\n+namespace libcamera {\n+\n+namespace utils {\n+\n+/**\n+ * \\def ARRAY_SIZE(array)\n+ * \\brief Determine the number of elemnents in the static array.\n+ */\n+\n+/**\n+ * \\brief Strip the directory prefix from the path\n+ *\n+ * basename is implemented differently across different toolchains.\n+ * Ensure consistency by providing our own implementation.\n+ */\n+const char *basename(const char *path)\n+{\n+ const char *base = strrchr(path, '/');\n+ return base ? base + 1 : path;\n+}\n+\n+\n+/**\n+ * \\fn libcamera::utils::make_unique(Args &&... args)\n+ * \\brief Construct an object and return a std::unique ptr to it\n+ */\n+\n+} /* namespace utils */\n+\n+} /* namespace libcamera */\n","prefixes":["libcamera-devel","v2","3/4"]}