summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-12-21 08:40:22 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-12-21 08:40:22 -0600
commit0100c9267eb26192be1596b402b700a3cdc6849f (patch)
tree114e4b4a8c8ff44a1133867b5e176986595f77c5 /include
parentb0b2b79cb4a402baea9d47909e69f88bd426dbed (diff)
parent1b80ffa495160c8b4ded31fa0597ec578f908d97 (diff)
Merge "Fix Common Typo's."
Diffstat (limited to 'include')
-rw-r--r--include/asterisk.h2
-rw-r--r--include/asterisk/ast_version.h2
-rw-r--r--include/asterisk/astobj2.h6
-rw-r--r--include/asterisk/bridge_after.h2
-rw-r--r--include/asterisk/bridge_features.h2
-rw-r--r--include/asterisk/callerid.h2
-rw-r--r--include/asterisk/http.h2
-rw-r--r--include/asterisk/parking.h4
-rw-r--r--include/asterisk/pbx.h2
-rw-r--r--include/asterisk/strings.h2
10 files changed, 13 insertions, 13 deletions
diff --git a/include/asterisk.h b/include/asterisk.h
index 9122e3a5e..371860278 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -223,7 +223,7 @@ struct ast_json;
#elif defined(AST_MODULE_SELF_SYM)
-/*! Retreive the 'struct ast_module *' for the current module. */
+/*! Retrieve the 'struct ast_module *' for the current module. */
#define AST_MODULE_SELF AST_MODULE_SELF_SYM()
struct ast_module;
diff --git a/include/asterisk/ast_version.h b/include/asterisk/ast_version.h
index 1ceac30fe..ff9c42f74 100644
--- a/include/asterisk/ast_version.h
+++ b/include/asterisk/ast_version.h
@@ -41,7 +41,7 @@ const char *ast_get_version(void);
*/
const char *ast_get_version_num(void);
-/*! Retreive the Asterisk build options */
+/*! Retrieve the Asterisk build options */
const char *ast_get_build_opts(void);
#endif /* __AST_VERSION_H */
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index a18f099c0..1b7f38735 100644
--- a/include/asterisk/astobj2.h
+++ b/include/asterisk/astobj2.h
@@ -145,7 +145,7 @@ An interface to help debug refcounting is provided
in this package. It is dependent on the refdebug being enabled in
asterisk.conf.
-Each of the reference manipulations will generate one line of output in in the refs
+Each of the reference manipulations will generate one line of output in the refs
log file. These lines look like this:
...
0x8756f00,+1,1234,chan_sip.c,22240,load_module,**constructor**,allocate users
@@ -682,7 +682,7 @@ int ao2_weakproxy_unsubscribe(void *weakproxy, ao2_weakproxy_notification_cb cb,
* \since 14.0.0
* \brief Get the weakproxy attached to obj
*
- * \param obj The object to retreive a weakproxy from
+ * \param obj The object to retrieve a weakproxy from
*
* \return The weakproxy object
*/
@@ -1057,7 +1057,7 @@ enum search_flags {
OBJ_NODATA = (1 << 1),
/*!
* Don't stop at the first match in ao2_callback() unless the
- * result of of the callback function has the CMP_STOP bit set.
+ * result of the callback function has the CMP_STOP bit set.
*/
OBJ_MULTIPLE = (1 << 2),
/*!
diff --git a/include/asterisk/bridge_after.h b/include/asterisk/bridge_after.h
index 045168571..d4fcbeaf6 100644
--- a/include/asterisk/bridge_after.h
+++ b/include/asterisk/bridge_after.h
@@ -33,7 +33,7 @@
extern "C" {
#endif
-/*! Reason the the after bridge callback will not be called. */
+/*! Reason the after bridge callback will not be called. */
enum ast_bridge_after_cb_reason {
/*! The datastore is being destroyed. Likely due to hangup. (Enum value must be zero.) */
AST_BRIDGE_AFTER_CB_REASON_DESTROY,
diff --git a/include/asterisk/bridge_features.h b/include/asterisk/bridge_features.h
index 7fcb85bd2..f9af8fbfd 100644
--- a/include/asterisk/bridge_features.h
+++ b/include/asterisk/bridge_features.h
@@ -721,7 +721,7 @@ int ast_bridge_features_limits_construct(struct ast_bridge_features_limits *limi
* \param limits pointer to an ast_bridge_features_limits struct that needs to be destroyed
*
* This function does not free memory allocated to the ast_bridge_features_limits struct, it only frees elements within the struct.
- * You must still call ast_free on the the struct if you allocated it with malloc.
+ * You must still call ast_free on the struct if you allocated it with malloc.
*/
void ast_bridge_features_limits_destroy(struct ast_bridge_features_limits *limits);
diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h
index f7d7719d2..143ffae23 100644
--- a/include/asterisk/callerid.h
+++ b/include/asterisk/callerid.h
@@ -240,7 +240,7 @@ void ast_shrink_phone_number(char *n);
int ast_isphonenumber(const char *n);
/*!
- * \brief Check if a string consists only of digits and and + \# ( ) - .
+ * \brief Check if a string consists only of digits and + \# ( ) - .
* (meaning it can be cleaned with ast_shrink_phone_number)
* \param exten The extension (or URI) to be checked.
* \retval 1 if string is valid AST shrinkable phone number
diff --git a/include/asterisk/http.h b/include/asterisk/http.h
index d5f54cc65..63fb223bf 100644
--- a/include/asterisk/http.h
+++ b/include/asterisk/http.h
@@ -316,7 +316,7 @@ int ast_http_response_status_line(const char *buf, const char *version, int code
* \param name out parameter pointing to the header name
* \param value out parameter pointing to header value
* \return -1 if buf is empty
- * \return 0 if buf could be separated into into name and value
+ * \return 0 if buf could be separated into name and value
* \return 1 if name or value portion don't exist
* \since 13
*/
diff --git a/include/asterisk/parking.h b/include/asterisk/parking.h
index 53dfe9320..554c8d523 100644
--- a/include/asterisk/parking.h
+++ b/include/asterisk/parking.h
@@ -164,7 +164,7 @@ struct ast_parking_bridge_feature_fn_table {
* \param parker The \ref bridge_channel object that is initiating the parking
* \param context The context to blind transfer to
* \param exten The extension to blind transfer to
- * \param parked_channel_cb Execute the following function on the the channel that gets parked
+ * \param parked_channel_cb Execute the following function on the channel that gets parked
* \param parked_channel_data Data for the parked_channel_cb
*
* \note If the bridge \ref parker is in has more than one other occupant, the entire
@@ -236,7 +236,7 @@ int ast_parking_park_call(struct ast_bridge_channel *parker, char *exten, size_t
* \param context The context to blind transfer to
* \param exten The extension to blind transfer to
* \param exten The extension to blind transfer to
- * \param parked_channel_cb Execute the following function on the the channel that gets parked
+ * \param parked_channel_cb Execute the following function on the channel that gets parked
* \param parked_channel_data Data for the parked_channel_cb
*
* \note If the bridge \ref parker is in has more than one other occupant, the entire
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index 008cfd3cb..4ff8e7623 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -1108,7 +1108,7 @@ int ast_rdlock_context(struct ast_context *con);
int ast_unlock_context(struct ast_context *con);
/*!
- * \brief locks the macrolock in the given given context
+ * \brief locks the macrolock in the given context
*
* \param macrocontext name of the macro-context to lock
*
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 963519dc7..d93630af3 100644
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -256,7 +256,7 @@ enum ast_strsep_flags {
/*!
\brief Act like strsep but ignore separators inside quotes.
- \param s Pointer to address of the the string to be processed.
+ \param s Pointer to address of the string to be processed.
Will be modified and can't be constant.
\param sep A single character delimiter.
\param flags Controls post-processing of the result.