diff options
author | Gluster Ant <bugzilla-bot@gluster.org> | 2018-09-12 17:52:45 +0530 |
---|---|---|
committer | Nigel Babu <nigelb@redhat.com> | 2018-09-12 17:52:45 +0530 |
commit | e16868dede6455cab644805af6fe1ac312775e13 (patch) | |
tree | 15aebdb4fff2d87cf8a72f836816b3aa634da58d /libglusterfs/src/parse-utils.c | |
parent | 45a71c0548b6fd2c757aa2e7b7671a1411948894 (diff) |
Land part 2 of clang-format changes
Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4
Signed-off-by: Nigel Babu <nigelb@redhat.com>
Diffstat (limited to 'libglusterfs/src/parse-utils.c')
-rw-r--r-- | libglusterfs/src/parse-utils.c | 135 |
1 files changed, 67 insertions, 68 deletions
diff --git a/libglusterfs/src/parse-utils.c b/libglusterfs/src/parse-utils.c index 304232f6b56..d3fd0963507 100644 --- a/libglusterfs/src/parse-utils.c +++ b/libglusterfs/src/parse-utils.c @@ -36,33 +36,33 @@ * : failure: NULL (on failure to compile regex or allocate memory) */ struct parser * -parser_init (const char *regex) +parser_init(const char *regex) { - int rc = 0; - struct parser *parser = NULL; - - parser = GF_MALLOC (sizeof(*parser), gf_common_mt_parser_t); - if (!parser) - goto out; - - parser->regex = gf_strdup (regex); - if (!parser->regex) { - GF_FREE (parser); - parser = NULL; - goto out; - } - - rc = regcomp (&parser->preg, parser->regex, REG_EXTENDED); - if (rc != 0) { - gf_msg (GF_PARSE, GF_LOG_INFO, 0, LG_MSG_REGEX_OP_FAILED, - "Failed to compile regex pattern."); - parser_deinit (parser); - parser = NULL; - goto out; - } - parser->complete_str = NULL; + int rc = 0; + struct parser *parser = NULL; + + parser = GF_MALLOC(sizeof(*parser), gf_common_mt_parser_t); + if (!parser) + goto out; + + parser->regex = gf_strdup(regex); + if (!parser->regex) { + GF_FREE(parser); + parser = NULL; + goto out; + } + + rc = regcomp(&parser->preg, parser->regex, REG_EXTENDED); + if (rc != 0) { + gf_msg(GF_PARSE, GF_LOG_INFO, 0, LG_MSG_REGEX_OP_FAILED, + "Failed to compile regex pattern."); + parser_deinit(parser); + parser = NULL; + goto out; + } + parser->complete_str = NULL; out: - return parser; + return parser; } /** @@ -78,22 +78,22 @@ out: * failure: -EINVAL for NULL args, -ENOMEM for allocation errors */ int -parser_set_string (struct parser *parser, const char *complete_str) +parser_set_string(struct parser *parser, const char *complete_str) { - int ret = -EINVAL; + int ret = -EINVAL; - GF_VALIDATE_OR_GOTO (GF_PARSE, parser, out); - GF_VALIDATE_OR_GOTO (GF_PARSE, complete_str, out); + GF_VALIDATE_OR_GOTO(GF_PARSE, parser, out); + GF_VALIDATE_OR_GOTO(GF_PARSE, complete_str, out); - parser->complete_str = gf_strdup (complete_str); - GF_CHECK_ALLOC_AND_LOG (GF_PARSE, parser, ret, - "Failed to duplicate string!", out); + parser->complete_str = gf_strdup(complete_str); + GF_CHECK_ALLOC_AND_LOG(GF_PARSE, parser, ret, "Failed to duplicate string!", + out); - /* Point the temp internal string to what we just dup'ed */ - parser->_rstr = (char *)parser->complete_str; - ret = 0; + /* Point the temp internal string to what we just dup'ed */ + parser->_rstr = (char *)parser->complete_str; + ret = 0; out: - return ret; + return ret; } /** @@ -107,17 +107,17 @@ out: * : failure: -EINVAL on NULL args */ int -parser_unset_string (struct parser *parser) +parser_unset_string(struct parser *parser) { - int ret = -EINVAL; + int ret = -EINVAL; - GF_VALIDATE_OR_GOTO (GF_PARSE, parser, out); + GF_VALIDATE_OR_GOTO(GF_PARSE, parser, out); - GF_FREE (parser->complete_str); - parser->complete_str = NULL; /* Avoid double frees in parser_deinit */ - ret = 0; + GF_FREE(parser->complete_str); + parser->complete_str = NULL; /* Avoid double frees in parser_deinit */ + ret = 0; out: - return ret; + return ret; } /** @@ -128,15 +128,15 @@ out: * @return : nothing */ void -parser_deinit (struct parser *ptr) +parser_deinit(struct parser *ptr) { - if (!ptr) - return; + if (!ptr) + return; - regfree (&ptr->preg); - GF_FREE (ptr->complete_str); - GF_FREE (ptr->regex); - GF_FREE (ptr); + regfree(&ptr->preg); + GF_FREE(ptr->complete_str); + GF_FREE(ptr->regex); + GF_FREE(ptr); } /** @@ -149,29 +149,28 @@ parser_deinit (struct parser *ptr) * : failure: NULL */ char * -parser_get_next_match (struct parser *parser) +parser_get_next_match(struct parser *parser) { - int rc = -EINVAL; - size_t copy_len = 0; - char *match = NULL; + int rc = -EINVAL; + size_t copy_len = 0; + char *match = NULL; - GF_VALIDATE_OR_GOTO (GF_PARSE, parser, out); + GF_VALIDATE_OR_GOTO(GF_PARSE, parser, out); - rc = regexec (&parser->preg, parser->_rstr, 1, parser->pmatch, 0); - if (rc != 0) { - gf_msg_debug (GF_PARSE, 0, - "Could not match %s with regex %s", - parser->_rstr, parser->regex); - goto out; - } + rc = regexec(&parser->preg, parser->_rstr, 1, parser->pmatch, 0); + if (rc != 0) { + gf_msg_debug(GF_PARSE, 0, "Could not match %s with regex %s", + parser->_rstr, parser->regex); + goto out; + } - copy_len = parser->pmatch[0].rm_eo - parser->pmatch[0].rm_so; + copy_len = parser->pmatch[0].rm_eo - parser->pmatch[0].rm_so; - match = gf_strndup (parser->_rstr + parser->pmatch[0].rm_so, copy_len); - GF_CHECK_ALLOC_AND_LOG (GF_PARSE, match, rc, - "Duplicating match failed!", out); + match = gf_strndup(parser->_rstr + parser->pmatch[0].rm_so, copy_len); + GF_CHECK_ALLOC_AND_LOG(GF_PARSE, match, rc, "Duplicating match failed!", + out); - parser->_rstr = &parser->_rstr[parser->pmatch[0].rm_eo]; + parser->_rstr = &parser->_rstr[parser->pmatch[0].rm_eo]; out: - return match; + return match; } |