i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clang warning string-plus-int

Browse Source 
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 <[email protected]>
This commit is contained in:
X512
2020-03-23 01:30:23 +00:00
committed by waddlesplash
parent f17d2fbb4e
commit 39be4f89f5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/packagefs/volume/PackageSettings.cpp
+3 -3
View File
@@ -193,9 +193,9 @@ PackageSettings::Load(dev_t mountPointDeviceID, ino_t mountPointNodeID,
// get the mount point relative settings file path // get the mount point relative settings file path
const char* settingsFilePath = mountType == PACKAGE_FS_MOUNT_TYPE_HOME const char* settingsFilePath = mountType == PACKAGE_FS_MOUNT_TYPE_HOME
? kUserSettingsGlobalDirectory "/packages" ? &(kUserSettingsGlobalDirectory "/packages")
+ strlen(kUserConfigDirectory) + 1 [strlen(kUserConfigDirectory) + 1]
: kSystemSettingsDirectory "/packages" + strlen(kSystemDirectory) + 1; : &(kSystemSettingsDirectory "/packages")[strlen(kSystemDirectory) + 1];
// get an absolute path // get an absolute path
KPath path; KPath path;
src/system/boot/loader/file_systems/packagefs/PackageSettingsItem.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ PackageSettingsItem::Load(::Directory* systemDirectory, const char* name)
{ {
// open the driver settings file // open the driver settings file
const char* settingsFilePath const char* settingsFilePath
= kSystemSettingsDirectory "/packages" + strlen(kSystemDirectory) + 1; = &(kSystemSettingsDirectory "/packages")[strlen(kSystemDirectory) + 1];
int fd = open_from(systemDirectory, settingsFilePath, B_READ_ONLY, 0); int fd = open_from(systemDirectory, settingsFilePath, B_READ_ONLY, 0);
if (fd < 0) if (fd < 0)