summaryrefslogtreecommitdiff
path: root/include/asterisk/strings.h
diff options
context:
space:
mode:
authorDavid M. Lee <dlee@digium.com>2013-01-09 20:12:00 +0000
committerDavid M. Lee <dlee@digium.com>2013-01-09 20:12:00 +0000
commit2f25e4b83e9805beb1d5314c14fe5a0d59a240f3 (patch)
tree71778ec20198f0415700b9c1f5f5c031441c8279 /include/asterisk/strings.h
parent4f4d6da941073fa3e6c86c54c603bea83cdc5573 (diff)
Move declaration of ast_regex_string_to_regex_pattern futher down strings.h.
The prior location is before the declaration of struct ast_str, which causes compiler warnings. (closes issue ASTERISK-20852) Reported by: Pavel Troller Patches: strings.diff uploaded by Pavel Troller (license 6302) ........ Merged revisions 378747 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/strings.h')
-rw-r--r--include/asterisk/strings.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 84261cdcb..afbda7816 100644
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -253,21 +253,6 @@ int ast_build_string(char **buffer, size_t *space, const char *fmt, ...) __attri
int ast_build_string_va(char **buffer, size_t *space, const char *fmt, va_list ap) __attribute__((format(printf, 3, 0)));
/*!
- * \brief Given a string regex_string in the form of "/regex/", convert it into the form of "regex"
- *
- * This function will trim one leading / and one trailing / from a given input string
- * ast_str regex_pattern must be preallocated before calling this function
- *
- * \return 0 on success, non-zero on failure.
- * \return 1 if we only stripped a leading /
- * \return 2 if we only stripped a trailing /
- * \return 3 if we did not strip any / characters
- * \param regex_string the string containing /regex/
- * \param regex_pattern the destination ast_str which will contain "regex" after execution
- */
-int ast_regex_string_to_regex_pattern(const char *regex_string, struct ast_str **regex_pattern);
-
-/*!
* \brief Make sure something is true.
* Determine if a string containing a boolean value is "true".
* This function checks to see whether a string passed to it is an indication of an "true" value.
@@ -387,6 +372,21 @@ struct ast_str {
};
/*!
+ * \brief Given a string regex_string in the form of "/regex/", convert it into the form of "regex"
+ *
+ * This function will trim one leading / and one trailing / from a given input string
+ * ast_str regex_pattern must be preallocated before calling this function
+ *
+ * \return 0 on success, non-zero on failure.
+ * \return 1 if we only stripped a leading /
+ * \return 2 if we only stripped a trailing /
+ * \return 3 if we did not strip any / characters
+ * \param regex_string the string containing /regex/
+ * \param regex_pattern the destination ast_str which will contain "regex" after execution
+ */
+int ast_regex_string_to_regex_pattern(const char *regex_string, struct ast_str **regex_pattern);
+
+/*!
* \brief Create a malloc'ed dynamic length string
*
* \param init_len This is the initial length of the string buffer