RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libselinux: update string_to_mode() 

Drop parameter NULL check since the only caller does a NULL check on the
argument.

Avoid strlen(3) call by comparing by hand.

Drop unreachable return statement.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
Christian Göttsche 2023-08-09 19:55:42 +02:00 committed by James Carter
parent e28f6a8a15
commit 0b93e30c93
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libselinux/src/label_file.h
View File

@ -97,15 +97,10 @@ struct saved_data {
struct selabel_sub *subs;
};
static inline mode_t string_to_mode(char *mode)
static inline mode_t string_to_mode(const char *mode)
{
size_t len;
if (!mode)
return 0;
len = strlen(mode);
if (mode[0] != '-' || len != 2)
return -1;
if (mode[0] != '-' || mode[1] == '\0' || mode[2] != '\0')
return (mode_t)-1;
switch (mode[1]) {
case 'b':
return S_IFBLK;
@ -122,10 +117,8 @@ static inline mode_t string_to_mode(char *mode)
case '-':
return S_IFREG;
default:
return -1;
return (mode_t)-1;
}
/* impossible to get here */
return 0;
}
static inline int grow_specs(struct saved_data *data)