diff options
| author | Yaniv Kaul <ykaul@redhat.com> | 2018-08-21 19:18:17 +0300 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-08-29 06:09:10 +0000 |
| commit | 8d171374cbbbdd88c8714198903b317bd132e1e2 (patch) | |
| tree | b10e6fd5ba8b79d41e79c2d22757a5d3e82576a4 /libglusterfs/src/glusterfs-acl.h | |
| parent | 60ef38482cc8d61711ecc48159cf6c036b1522a8 (diff) | |
multiple files: move from strlen() to sizeof()
{glusterfsd|glusterfsd-mgmt|quota-common-utils|xlator|tier|stripe}.c
tools/setgfid2path/src/main.c
xlators/cluster/afr/src/afr-inode-read.c
{glusterfs-acl|glusterfs}.h
For const strings, just do compile time size calc instead of runtime.
Compile-tested only!
Change-Id: I303684b1ff29b05c10126fb1057f507e404ced07
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'libglusterfs/src/glusterfs-acl.h')
| -rw-r--r-- | libglusterfs/src/glusterfs-acl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libglusterfs/src/glusterfs-acl.h b/libglusterfs/src/glusterfs-acl.h index 2a1661686bc..6194f320ab0 100644 --- a/libglusterfs/src/glusterfs-acl.h +++ b/libglusterfs/src/glusterfs-acl.h @@ -120,8 +120,8 @@ struct posix_acl_conf { #define GF_POSIX_ACL_ACCESS "glusterfs.posix.acl" #define GF_POSIX_ACL_DEFAULT "glusterfs.posix.default_acl" #define GF_POSIX_ACL_REQUEST(key) \ - (!strncmp(key, GF_POSIX_ACL_ACCESS, strlen(GF_POSIX_ACL_ACCESS)) || \ - !strncmp(key, GF_POSIX_ACL_DEFAULT, strlen(GF_POSIX_ACL_DEFAULT))) + (!strncmp(key, GF_POSIX_ACL_ACCESS, SLEN (GF_POSIX_ACL_ACCESS)) || \ + !strncmp(key, GF_POSIX_ACL_DEFAULT, SLEN (GF_POSIX_ACL_DEFAULT))) #ifdef HAVE_SYS_ACL_H /* only NetBSD does not support POSIX ACLs */ @@ -151,10 +151,10 @@ gf_posix_acl_get_type (const char *key) { acl_type_t type = 0; - if (!strncmp (key, GF_POSIX_ACL_ACCESS, strlen (GF_POSIX_ACL_ACCESS))) + if (!strncmp (key, GF_POSIX_ACL_ACCESS, SLEN (GF_POSIX_ACL_ACCESS))) type = ACL_TYPE_ACCESS; else if (!strncmp (key, GF_POSIX_ACL_DEFAULT, - strlen (GF_POSIX_ACL_DEFAULT))) + SLEN (GF_POSIX_ACL_DEFAULT))) type = ACL_TYPE_DEFAULT; else errno = EINVAL; |