From 39be4f89f500d489df5a6d8b2162f6e271e1b05e Mon Sep 17 00:00:00 2001 From: X512 Date: Sun, 22 Mar 2020 11:41:26 +0900 Subject: [PATCH] Fix clang warning string-plus-int Clang message: error: adding 'size_t' (aka 'unsigned long') to a string does not append to the string Change-Id: Ice854f584e92917aca6821d5ec2352fc4e38f2f0 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2395 Reviewed-by: waddlesplash --- .../file_systems/packagefs/volume/PackageSettings.cpp | 6 +++--- .../loader/file_systems/packagefs/PackageSettingsItem.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/file_systems/packagefs/volume/PackageSettings.cpp b/src/add-ons/kernel/file_systems/packagefs/volume/PackageSettings.cpp index 54b2984887..8fcf2d1114 100644 --- a/src/add-ons/kernel/file_systems/packagefs/volume/PackageSettings.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/volume/PackageSettings.cpp @@ -193,9 +193,9 @@ PackageSettings::Load(dev_t mountPointDeviceID, ino_t mountPointNodeID, // get the mount point relative settings file path const char* settingsFilePath = mountType == PACKAGE_FS_MOUNT_TYPE_HOME - ? kUserSettingsGlobalDirectory "/packages" - + strlen(kUserConfigDirectory) + 1 - : kSystemSettingsDirectory "/packages" + strlen(kSystemDirectory) + 1; + ? &(kUserSettingsGlobalDirectory "/packages") + [strlen(kUserConfigDirectory) + 1] + : &(kSystemSettingsDirectory "/packages")[strlen(kSystemDirectory) + 1]; // get an absolute path KPath path; diff --git a/src/system/boot/loader/file_systems/packagefs/PackageSettingsItem.cpp b/src/system/boot/loader/file_systems/packagefs/PackageSettingsItem.cpp index 23ea485378..c30b8822f5 100644 --- a/src/system/boot/loader/file_systems/packagefs/PackageSettingsItem.cpp +++ b/src/system/boot/loader/file_systems/packagefs/PackageSettingsItem.cpp @@ -43,7 +43,7 @@ PackageSettingsItem::Load(::Directory* systemDirectory, const char* name) { // open the driver settings file const char* settingsFilePath - = kSystemSettingsDirectory "/packages" + strlen(kSystemDirectory) + 1; + = &(kSystemSettingsDirectory "/packages")[strlen(kSystemDirectory) + 1]; int fd = open_from(systemDirectory, settingsFilePath, B_READ_ONLY, 0); if (fd < 0)