From 4072f63ab60c4cac7a6474ad2acf0d91efe5c48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Wed, 20 Jul 2022 03:15:54 +0200 Subject: [PATCH] spa: libcamera: make `cameraLoc()` return a static string There is no compelling reason to use `std::string`. --- spa/plugins/libcamera/libcamera-device.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spa/plugins/libcamera/libcamera-device.cpp b/spa/plugins/libcamera/libcamera-device.cpp index f670b81dd..d2679d219 100644 --- a/spa/plugins/libcamera/libcamera-device.cpp +++ b/spa/plugins/libcamera/libcamera-device.cpp @@ -88,7 +88,7 @@ static std::string cameraModel(const Camera *camera) return camera->id(); } -static std::string cameraLoc(const Camera *camera) +static const char *cameraLoc(const Camera *camera) { const ControlList &props = camera->properties(); @@ -103,7 +103,7 @@ static std::string cameraLoc(const Camera *camera) } } - return {}; + return ""; } static int emit_info(struct impl *impl, bool full) @@ -125,7 +125,7 @@ static int emit_info(struct impl *impl, bool full) ADD_ITEM(SPA_KEY_DEVICE_API, "libcamera"); ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Video/Device"); ADD_ITEM(SPA_KEY_API_LIBCAMERA_PATH, (char *)impl->props.device); - snprintf(location, sizeof(location), "%s", cameraLoc(impl->camera.get()).c_str()); + snprintf(location, sizeof(location), "%s", cameraLoc(impl->camera.get())); ADD_ITEM(SPA_KEY_API_LIBCAMERA_LOCATION, location); snprintf(model, sizeof(model), "%s", cameraModel(impl->camera.get()).c_str()); ADD_ITEM(SPA_KEY_DEVICE_PRODUCT_NAME, model);