openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-10-07 14:13:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

init: fix bugs

Browse Source 
Signed-off-by: sun_fan <sun_fan1@hoperun.com>
This commit is contained in:
sun_fan 2021-10-15 21:26:38 +08:00
parent 8d948a8b02
commit ec13868647
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
interfaces/innerkits/fs_manager/fstab.c
View File

@ -342,11 +342,11 @@ static unsigned long ParseDefaultMountFlag(const char *str)
return flags;
}
unsigned long GetMountFlags(char *flags, char *fsSpecificData, size_t fsSpecificDataSize)
unsigned long GetMountFlags(char *mountFlag, char *fsSpecificData, size_t fsSpecificDataSize)
{
unsigned long flags = 0;
if (flags == NULL || fsSpecificData == NULL) {
if (mountFlag == NULL || fsSpecificData == NULL) {
return 0;
}
@ -358,7 +358,7 @@ unsigned long GetMountFlags(char *flags, char *fsSpecificData, size_t fsSpecific
// If the item configured in fstab contains flag over than 15,
// @SplitStringExt can handle it and parse them all. but the parse function will drop it.
const int maxCount = 15;
char **flagsVector = SplitStringExt(flags, ",", &flagCount, maxCount);
char **flagsVector = SplitStringExt(mountFlag, ",", &flagCount, maxCount);
if (flagsVector == NULL || flagCount == 0) {
// No flags or something wrong in SplitStringExt，just return.

2
interfaces/innerkits/include/fs_manager/fs_manager.h
View File

@ -66,7 +66,7 @@ int MountOneItem(FstabItem *item);
MountStatus GetMountStatusForMountPoint(const char *mp);
int MountAllWithFstabFile(const char *file, bool required);
int UmountAllWithFstabFile(const char *file);
unsigned long GetMountFlags(char *flags, char *fsSpecificFlags, size_t fsSpecificFlagSize);
unsigned long GetMountFlags(char *mountFlag, char *fsSpecificFlags, size_t fsSpecificFlagSize);
#ifdef __cplusplus
#if __cplusplus
}