From X512 <danger_mail@xxxxxxx>:
X512 has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/2395 ;)
Change subject: Fix clang warning string-plus-int
......................................................................
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
---
M src/add-ons/kernel/file_systems/packagefs/volume/PackageSettings.cpp
M src/system/boot/loader/file_systems/packagefs/PackageSettingsItem.cpp
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/95/2395/1
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 54b2984..8fcf2d1 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 @@
// 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 23ea485..c30b882 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 @@
{
// 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)
--
To view, visit https://review.haiku-os.org/c/haiku/+/2395
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Ice854f584e92917aca6821d5ec2352fc4e38f2f0
Gerrit-Change-Number: 2395
Gerrit-PatchSet: 1
Gerrit-Owner: X512 <danger_mail@xxxxxxx>
Gerrit-MessageType: newchange
