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 | |
| 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')
| -rw-r--r-- | libglusterfs/src/glusterfs-acl.h | 8 | ||||
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 8 | ||||
| -rw-r--r-- | libglusterfs/src/quota-common-utils.c | 4 | ||||
| -rw-r--r-- | libglusterfs/src/xlator.c | 2 |
4 files changed, 10 insertions, 12 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; diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 1fae5e7c1be..423804300a3 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -130,13 +130,13 @@ (strncmp (x, GF_XATTR_USER_PATHINFO_KEY, \ strlen (x)) == 0)) #define XATTR_IS_NODE_UUID(x) (strncmp (x, GF_XATTR_NODE_UUID_KEY, \ - strlen (GF_XATTR_NODE_UUID_KEY)) == 0) + SLEN (GF_XATTR_NODE_UUID_KEY)) == 0) #define XATTR_IS_NODE_UUID_LIST(x) (strncmp (x, GF_XATTR_LIST_NODE_UUIDS_KEY, \ - strlen (GF_XATTR_LIST_NODE_UUIDS_KEY)) == 0) + SLEN (GF_XATTR_LIST_NODE_UUIDS_KEY)) == 0) #define XATTR_IS_LOCKINFO(x) (strncmp (x, GF_XATTR_LOCKINFO_KEY, \ - strlen (GF_XATTR_LOCKINFO_KEY)) == 0) + SLEN (GF_XATTR_LOCKINFO_KEY)) == 0) -#define XATTR_IS_BD(x) (strncmp (x, BD_XATTR_KEY, strlen (BD_XATTR_KEY)) == 0) +#define XATTR_IS_BD(x) (strncmp (x, BD_XATTR_KEY, SLEN (BD_XATTR_KEY)) == 0) #define GF_XATTR_LINKINFO_KEY "trusted.distribute.linkinfo" #define GFID_XATTR_KEY "trusted.gfid" diff --git a/libglusterfs/src/quota-common-utils.c b/libglusterfs/src/quota-common-utils.c index 623248f2eb6..a0a7dd5aafe 100644 --- a/libglusterfs/src/quota-common-utils.c +++ b/libglusterfs/src/quota-common-utils.c @@ -140,10 +140,8 @@ out: int32_t quota_conf_read_header (int fd, char *buf) { - int header_len = 0; int ret = 0; - - header_len = strlen (QUOTA_CONF_HEADER); + const int header_len = SLEN (QUOTA_CONF_HEADER); ret = gf_nread (fd, buf, header_len); if (ret <= 0) { diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index b1a79a68bf5..cd71d5fe384 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -481,7 +481,7 @@ xlator_set_type (xlator_t *xl, const char *type) /* Handle 'global' translator differently */ if (!strncmp (GF_GLOBAL_XLATOR_NAME, type, - strlen (GF_GLOBAL_XLATOR_NAME))) { + SLEN (GF_GLOBAL_XLATOR_NAME))) { volume_opt_list_t *vol_opt = NULL; /* set the required values from Global xlator */ |