From 2ba33b4c3a9a38f0379e29f17e3ac538d524ea9d Mon Sep 17 00:00:00 2001
From: Automerge script <automerge@asterisk.org>
Date: Wed, 9 Jan 2013 20:21:33 +0000
Subject: [PATCH] Merged revisions 378735,378748 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r378735 | dlee | 2013-01-09 13:38:53 -0600 (Wed, 09 Jan 2013) | 13 lines
Replace errant tabs with spaces in causes.h.
(closes issue ASTERISK-20826)
Reported by: snuffy
Patches:
notabs.dif uploaded by snuffy (license 5024)
........
Merged revisions 378733 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378734 from http://svn.asterisk.org/svn/asterisk/branches/11
................
r378748 | dlee | 2013-01-09 14:12:00 -0600 (Wed, 09 Jan 2013) | 13 lines
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/team/mmichelson/threadpool@378759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
include/asterisk/causes.h | 10 +++++-----
include/asterisk/strings.h | 30 +++++++++++++++---------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/asterisk/causes.h b/include/asterisk/causes.h
index b792b0a00b..490ae9ed3e 100644
--- a/include/asterisk/causes.h
+++ b/include/asterisk/causes.h
@@ -72,7 +72,7 @@ specification:
- AST_CAUSE_CHAN_NOT_IMPLEMENTED 66
- AST_CAUSE_FACILITY_NOT_IMPLEMENTED 69
- AST_CAUSE_INVALID_CALL_REFERENCE 81
- - AST_CAUSE_INCOMPATIBLE_DESTINATION 88
+ - AST_CAUSE_INCOMPATIBLE_DESTINATION 88
- AST_CAUSE_INVALID_MSG_UNSPECIFIED 95
- AST_CAUSE_MANDATORY_IE_MISSING 96
- AST_CAUSE_MESSAGE_TYPE_NONEXIST 97
@@ -111,8 +111,8 @@ For more information:
#define AST_CAUSE_NUMBER_CHANGED 22
#define AST_CAUSE_REDIRECTED_TO_NEW_DESTINATION 23
#define AST_CAUSE_ANSWERED_ELSEWHERE 26
-#define AST_CAUSE_DESTINATION_OUT_OF_ORDER 27
-#define AST_CAUSE_INVALID_NUMBER_FORMAT 28
+#define AST_CAUSE_DESTINATION_OUT_OF_ORDER 27
+#define AST_CAUSE_INVALID_NUMBER_FORMAT 28
#define AST_CAUSE_FACILITY_REJECTED 29
#define AST_CAUSE_RESPONSE_TO_STATUS_ENQUIRY 30
#define AST_CAUSE_NORMAL_UNSPECIFIED 31
@@ -133,8 +133,8 @@ For more information:
#define AST_CAUSE_INVALID_CALL_REFERENCE 81
#define AST_CAUSE_INCOMPATIBLE_DESTINATION 88
#define AST_CAUSE_INVALID_MSG_UNSPECIFIED 95
-#define AST_CAUSE_MANDATORY_IE_MISSING 96
-#define AST_CAUSE_MESSAGE_TYPE_NONEXIST 97
+#define AST_CAUSE_MANDATORY_IE_MISSING 96
+#define AST_CAUSE_MESSAGE_TYPE_NONEXIST 97
#define AST_CAUSE_WRONG_MESSAGE 98
#define AST_CAUSE_IE_NONEXIST 99
#define AST_CAUSE_INVALID_IE_CONTENTS 100
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 84261cdcb2..afbda78167 100644
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -252,21 +252,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".
@@ -386,6 +371,21 @@ struct ast_str {
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
*
--
GitLab