[asterisk-commits] dlee: trunk r378748 - in /trunk: ./ include/asterisk/strings.h

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed Jan  9 14:12:00 2013
New Revision: 378748

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378748
Log:
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

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/strings.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/include/asterisk/strings.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/strings.h?view=diff&rev=378748&r1=378747&r2=378748
==============================================================================
--- trunk/include/asterisk/strings.h (original)
+++ trunk/include/asterisk/strings.h Wed Jan  9 14:12:00 2013
@@ -253,21 +253,6 @@
 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.
@@ -385,6 +370,21 @@
 #define DS_STATIC	((struct ast_threadstorage *)3)	/* not supported yet */
 	char __AST_STR_STR[0];			/*!< The string buffer */
 };
+
+/*!
+ * \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