andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multiple files: move from strlen() to sizeof()

Browse Source 
{ec-heal|ec-combine|ec-helpers|ec-inode-read}.c

For const strings, just do compile time size calc instead of runtime.

Compile-tested only!

Change-Id: If92ba0a7a20f64b898d01c6e3b6708190ca93e04
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
This commit is contained in:
Yaniv Kaul 2018-08-21 18:56:24 +03:00 committed by Amar Tumballi
parent 7e229cf1d5
commit 14ee864f8b
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libglusterfs/src/glusterfs.h
View File

@ -90,6 +90,9 @@
#define GLUSTERD_MAX_SNAP_NAME 255
#define GLUSTERFS_SOCKET_LISTEN_BACKLOG 10
#define SLEN(str) (sizeof(str) - 1)
#define ZR_MOUNTPOINT_OPT "mountpoint"
#define ZR_ATTR_TIMEOUT_OPT "attribute-timeout"
#define ZR_ENTRY_TIMEOUT_OPT "entry-timeout"

10
xlators/cluster/ec/src/ec-combine.c
View File

@ -251,9 +251,9 @@ ec_value_ignore (char *key)
(strcmp(key, GLUSTERFS_INODELK_COUNT) == 0) ||
(strcmp(key, GLUSTERFS_ENTRYLK_COUNT) == 0) ||
(strncmp(key, GF_XATTR_CLRLK_CMD,
strlen (GF_XATTR_CLRLK_CMD)) == 0) ||
SLEN (GF_XATTR_CLRLK_CMD)) == 0) ||
(strcmp(key, DHT_IATT_IN_XDATA_KEY) == 0) ||
(strncmp(key, EC_QUOTA_PREFIX, strlen(EC_QUOTA_PREFIX)) == 0) ||
(strncmp(key, EC_QUOTA_PREFIX, SLEN (EC_QUOTA_PREFIX)) == 0) ||
(fnmatch(MARKER_XATTR_PREFIX ".*." XTIME, key, 0) == 0) ||
(fnmatch(GF_XATTR_MARKER_KEY ".*", key, 0) == 0) ||
(XATTR_IS_NODE_UUID(key))) {
@ -742,14 +742,14 @@ int32_t ec_dict_data_combine(dict_t * dict, char * key, data_t * value,
data->cbk->fop->xl->name);
}
if (strncmp(key, GF_XATTR_CLRLK_CMD, strlen(GF_XATTR_CLRLK_CMD)) == 0)
if (strncmp(key, GF_XATTR_CLRLK_CMD, SLEN (GF_XATTR_CLRLK_CMD)) == 0)
{
return ec_dict_data_concat("{\n}", data->cbk, data->which, key, NULL,
NULL, _gf_false);
}
if (strncmp(key, GF_XATTR_LOCKINFO_KEY,
strlen(GF_XATTR_LOCKINFO_KEY)) == 0)
SLEN (GF_XATTR_LOCKINFO_KEY)) == 0)
{
return ec_dict_data_merge(data->cbk, data->which, key);
}
@ -771,7 +771,7 @@ int32_t ec_dict_data_combine(dict_t * dict, char * key, data_t * value,
return ec_dict_data_quota(data->cbk, data->which, key);
}
/* Ignore all other quota attributes */
if (strncmp(key, EC_QUOTA_PREFIX, strlen(EC_QUOTA_PREFIX)) == 0) {
if (strncmp(key, EC_QUOTA_PREFIX, SLEN (EC_QUOTA_PREFIX)) == 0) {
return 0;
}

2
xlators/cluster/ec/src/ec-heal.c
View File

@ -66,7 +66,7 @@ ec_ignorable_key_match (dict_t *dict, char *key, data_t *val, void *mdata)
if (!key)
goto out;
if (strncmp (key, EC_XATTR_PREFIX, strlen (EC_XATTR_PREFIX)) == 0)
if (strncmp (key, EC_XATTR_PREFIX, SLEN (EC_XATTR_PREFIX)) == 0)
return _gf_true;
for (i = 0; ec_ignore_xattrs[i]; i++) {

2
xlators/cluster/ec/src/ec-helpers.c
View File

@ -821,7 +821,7 @@ gf_boolean_t
ec_is_internal_xattr (dict_t *dict, char *key, data_t *value, void *data)
{
if (key &&
(strncmp (key, EC_XATTR_PREFIX, strlen (EC_XATTR_PREFIX)) == 0))
(strncmp (key, EC_XATTR_PREFIX, SLEN (EC_XATTR_PREFIX)) == 0))
return _gf_true;
return _gf_false;

2
xlators/cluster/ec/src/ec-inode-read.c
View File

@ -310,7 +310,7 @@ int32_t ec_manager_getxattr(ec_fop_data_t * fop, int32_t state)
to avoid interferences. */
if ((fop->str[0] == NULL) ||
(strncmp(fop->str[0], GF_XATTR_CLRLK_CMD,
strlen(GF_XATTR_CLRLK_CMD)) != 0)) {
SLEN (GF_XATTR_CLRLK_CMD)) != 0)) {
if (fop->fd == NULL) {
ec_lock_prepare_inode(fop, &fop->loc[0], EC_QUERY_INFO,
0, LLONG_MAX);