[svn-commits] rmudgett: branch rmudgett/subaddr r224926 - in /team/rmudgett/subaddr: includ...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Oct 20 18:51:30 CDT 2009
Author: rmudgett
Date: Tue Oct 20 18:51:26 2009
New Revision: 224926
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224926
Log:
Made all ast_party_subaddress manipulation functions public.
Modified:
team/rmudgett/subaddr/include/asterisk/channel.h
team/rmudgett/subaddr/main/channel.c
Modified: team/rmudgett/subaddr/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/subaddr/include/asterisk/channel.h?view=diff&rev=224926&r1=224925&r2=224926
==============================================================================
--- team/rmudgett/subaddr/include/asterisk/channel.h (original)
+++ team/rmudgett/subaddr/include/asterisk/channel.h Tue Oct 20 18:51:26 2009
@@ -2392,50 +2392,29 @@
/*!
* \since 1.6.3
- * \brief Initialize the given caller structure.
- *
- * \param init Caller structure to initialize.
+ * \brief Initialize the given subaddress structure.
+ *
+ * \param init Subaddress structure to initialize.
*
* \return Nothing
*/
-void ast_party_caller_init(struct ast_party_caller *init);
-
-/*!
- * \since 1.6.3
- * \brief Copy the source caller information to the destination caller.
- *
- * \param dest Destination caller
- * \param src Source caller
+void ast_party_subaddress_init(struct ast_party_subaddress *init);
+
+/*!
+ * \since 1.6.3
+ * \brief Copy the source party subaddress information to the destination party subaddress.
+ *
+ * \param dest Destination party subaddress
+ * \param src Source party subaddress
*
* \return Nothing
*/
-void ast_party_caller_copy(struct ast_callerid *dest, const struct ast_callerid *src);
-
-/*!
- * \since 1.6.3
- * \brief Initialize the given connected line structure.
- *
- * \param init Connected line structure to initialize.
- *
- * \return Nothing
- */
-void ast_party_connected_line_init(struct ast_party_connected_line *init);
-
-/*!
- * \since 1.6.3
- * \brief Copy the source connected line information to the destination connected line.
- *
- * \param dest Destination connected line
- * \param src Source connected line
- *
- * \return Nothing
- */
-void ast_party_connected_line_copy(struct ast_party_connected_line *dest, const struct ast_party_connected_line *src);
-
-/*!
- * \since 1.6.3
- * \brief Initialize the given connected line structure using the given
- * guide for a set update operation.
+void ast_party_subaddress_copy(struct ast_party_subaddress *dest, const struct ast_party_subaddress *src);
+
+/*!
+ * \since 1.6.3
+ * \brief Initialize the given party subadress structure using the given guide
+ * for a set update operation.
*
* \details
* The initialization is needed to allow a set operation to know if a
@@ -2444,67 +2423,80 @@
* String values are simply set to NULL pointers if they are not going
* to be updated.
*
+ * \param init Party Subaddress structure to initialize.
+ * \param guide Source party subaddress to use as a guide in initializing.
+ *
+ * \return Nothing
+ */
+void ast_party_subaddress_set_init(struct ast_party_subaddress *init, const struct ast_party_subaddress *guide);
+
+/*!
+ * \since 1.6.3
+ * \brief Set the source party subaddress information into the destination party subaddress.
+ *
+ * \param dest Destination party subaddress
+ * \param src Source party subaddress
+ *
+ * \return Nothing
+ */
+void ast_party_subaddress_set(struct ast_party_subaddress *dest, const struct ast_party_subaddress *src);
+
+/*!
+ * \since 1.6.3
+ * \brief Destroy the party subaddress contents
+ *
+ * \param doomed The party subaddress to destroy.
+ *
+ * \return Nothing
+ */
+void ast_party_subaddress_free(struct ast_party_subaddress *doomed);
+
+/*!
+ * \since 1.6.3
+ * \brief Initialize the given caller structure.
+ *
+ * \param init Caller structure to initialize.
+ *
+ * \return Nothing
+ */
+void ast_party_caller_init(struct ast_party_caller *init);
+
+/*!
+ * \since 1.6.3
+ * \brief Copy the source caller information to the destination caller.
+ *
+ * \param dest Destination caller
+ * \param src Source caller
+ *
+ * \return Nothing
+ */
+void ast_party_caller_copy(struct ast_callerid *dest, const struct ast_callerid *src);
+
+/*!
+ * \since 1.6.3
+ * \brief Initialize the given connected line structure.
+ *
* \param init Connected line structure to initialize.
- * \param guide Source connected line to use as a guide in initializing.
*
* \return Nothing
*/
-void ast_party_connected_line_set_init(struct ast_party_connected_line *init, const struct ast_party_connected_line *guide);
-
-/*!
- * \since 1.6.3
- * \brief Set the connected line information based on another connected line source
- *
- * This is similar to ast_party_connected_line_copy, except that NULL values for
- * strings in the src parameter indicate not to update the corresponding dest values.
- *
- * \param src The source connected line to use as a guide to set the dest
- * \param dest The connected line one wishes to update
- *
- * \return Nada
- */
-void ast_party_connected_line_set(struct ast_party_connected_line *dest, const struct ast_party_connected_line *src);
-
-/*!
- * \since 1.6.3
- * \brief Collect the caller party information into a connected line structure.
- *
- * \param connected Collected caller information for the connected line
- * \param cid Caller information.
+void ast_party_connected_line_init(struct ast_party_connected_line *init);
+
+/*!
+ * \since 1.6.3
+ * \brief Copy the source connected line information to the destination connected line.
+ *
+ * \param dest Destination connected line
+ * \param src Source connected line
*
* \return Nothing
- *
- * \warning This is a shallow copy.
- * \warning DO NOT call ast_party_connected_line_free() on the filled in
- * connected line structure!
- */
-void ast_party_connected_line_collect_caller(struct ast_party_connected_line *connected, struct ast_callerid *cid);
-
-/*!
- * \since 1.6.3
- * \brief Destroy the connected line information contents
- *
- * \param doomed The connected line information to destroy.
- *
- * \return Nothing
- */
-void ast_party_connected_line_free(struct ast_party_connected_line *doomed);
-
-/*!
- * \since 1.6.3
- * \brief Copy the source redirecting information to the destination redirecting.
- *
- * \param dest Destination redirecting
- * \param src Source redirecting
- *
- * \return Nothing
- */
-void ast_party_redirecting_copy(struct ast_party_redirecting *dest, const struct ast_party_redirecting *src);
-
-/*!
- * \since 1.6.3
- * \brief Initialize the given redirecting id structure using the given guide
- * for a set update operation.
+ */
+void ast_party_connected_line_copy(struct ast_party_connected_line *dest, const struct ast_party_connected_line *src);
+
+/*!
+ * \since 1.6.3
+ * \brief Initialize the given connected line structure using the given
+ * guide for a set update operation.
*
* \details
* The initialization is needed to allow a set operation to know if a
@@ -2513,6 +2505,75 @@
* String values are simply set to NULL pointers if they are not going
* to be updated.
*
+ * \param init Connected line structure to initialize.
+ * \param guide Source connected line to use as a guide in initializing.
+ *
+ * \return Nothing
+ */
+void ast_party_connected_line_set_init(struct ast_party_connected_line *init, const struct ast_party_connected_line *guide);
+
+/*!
+ * \since 1.6.3
+ * \brief Set the connected line information based on another connected line source
+ *
+ * This is similar to ast_party_connected_line_copy, except that NULL values for
+ * strings in the src parameter indicate not to update the corresponding dest values.
+ *
+ * \param src The source connected line to use as a guide to set the dest
+ * \param dest The connected line one wishes to update
+ *
+ * \return Nada
+ */
+void ast_party_connected_line_set(struct ast_party_connected_line *dest, const struct ast_party_connected_line *src);
+
+/*!
+ * \since 1.6.3
+ * \brief Collect the caller party information into a connected line structure.
+ *
+ * \param connected Collected caller information for the connected line
+ * \param cid Caller information.
+ *
+ * \return Nothing
+ *
+ * \warning This is a shallow copy.
+ * \warning DO NOT call ast_party_connected_line_free() on the filled in
+ * connected line structure!
+ */
+void ast_party_connected_line_collect_caller(struct ast_party_connected_line *connected, struct ast_callerid *cid);
+
+/*!
+ * \since 1.6.3
+ * \brief Destroy the connected line information contents
+ *
+ * \param doomed The connected line information to destroy.
+ *
+ * \return Nothing
+ */
+void ast_party_connected_line_free(struct ast_party_connected_line *doomed);
+
+/*!
+ * \since 1.6.3
+ * \brief Copy the source redirecting information to the destination redirecting.
+ *
+ * \param dest Destination redirecting
+ * \param src Source redirecting
+ *
+ * \return Nothing
+ */
+void ast_party_redirecting_copy(struct ast_party_redirecting *dest, const struct ast_party_redirecting *src);
+
+/*!
+ * \since 1.6.3
+ * \brief Initialize the given redirecting id structure using the given guide
+ * for a set update operation.
+ *
+ * \details
+ * The initialization is needed to allow a set operation to know if a
+ * value needs to be updated. Simple integers need the guide's original
+ * value in case the set operation is not trying to set a new value.
+ * String values are simply set to NULL pointers if they are not going
+ * to be updated.
+ *
* \param init Redirecting id structure to initialize.
* \param guide Source redirecting id to use as a guide in initializing.
*
@@ -2666,16 +2727,6 @@
* ast_party_redirecting_free() when it is no longer needed.
*/
int ast_redirecting_parse_data(const unsigned char *data, size_t datalen, struct ast_party_redirecting *redirecting);
-
-/*!
- * \since 1.6.3
- * \brief Initialize the given subaddress structure.
- *
- * \param init Subaddress structure to initialize.
- *
- * \return Nothing
- */
-void ast_party_subaddress_init(struct ast_party_subaddress *init);
/*!
* \since 1.6.3
Modified: team/rmudgett/subaddr/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/subaddr/main/channel.c?view=diff&rev=224926&r1=224925&r2=224926
==============================================================================
--- team/rmudgett/subaddr/main/channel.c (original)
+++ team/rmudgett/subaddr/main/channel.c Tue Oct 20 18:51:26 2009
@@ -210,8 +210,6 @@
return var;
}
-static void ast_party_subaddress_free(struct ast_party_subaddress *doomed);
-
/*! \brief Show channel types - CLI command */
static char *handle_cli_core_show_channeltypes(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
@@ -1516,15 +1514,6 @@
return ast_channel_unref(chan);
}
-/*!
- * \internal
- * \brief Initialize the given subaddress structure.
- * \since 1.6.3
- *
- * \param init Subaddress structure to initialize.
- *
- * \return Nothing
- */
void ast_party_subaddress_init(struct ast_party_subaddress *init)
{
init->str = NULL;
@@ -1533,17 +1522,7 @@
init->valid = 0;
}
-/*!
- * \internal
- * \brief Copy the source party subaddress information to the destination party subaddress.
- * \since 1.6.3
- *
- * \param dest Destination party subaddress
- * \param src Source party subaddress
- *
- * \return Nothing
- */
-static void ast_party_subaddress_copy(struct ast_party_subaddress *dest, const struct ast_party_subaddress *src)
+void ast_party_subaddress_copy(struct ast_party_subaddress *dest, const struct ast_party_subaddress *src)
{
if (dest == src) {
/* Don't copy to self */
@@ -1559,25 +1538,7 @@
dest->valid = src->valid;
}
-/*!
- * \internal
- * \brief Initialize the given party subadress structure using the given guide
- * for a set update operation.
- * \since 1.6.3
- *
- * \details
- * The initialization is needed to allow a set operation to know if a
- * value needs to be updated. Simple integers need the guide's original
- * value in case the set operation is not trying to set a new value.
- * String values are simply set to NULL pointers if they are not going
- * to be updated.
- *
- * \param init Party Subaddress structure to initialize.
- * \param guide Source party subaddress to use as a guide in initializing.
- *
- * \return Nothing
- */
-static void ast_party_subaddress_set_init(struct ast_party_subaddress *init, const struct ast_party_subaddress *guide)
+void ast_party_subaddress_set_init(struct ast_party_subaddress *init, const struct ast_party_subaddress *guide)
{
init->str = NULL;
init->type = guide->type;
@@ -1585,17 +1546,7 @@
init->valid = guide->valid;
}
-/*!
- * \internal
- * \brief Set the source party subaddress information into the destination party subaddress.
- * \since 1.6.3
- *
- * \param dest Destination party subaddress
- * \param src Source party subaddress
- *
- * \return Nothing
- */
-static void ast_party_subaddress_set(struct ast_party_subaddress *dest, const struct ast_party_subaddress *src)
+void ast_party_subaddress_set(struct ast_party_subaddress *dest, const struct ast_party_subaddress *src)
{
if (dest == src) {
/* Don't set to self */
@@ -1614,16 +1565,7 @@
dest->valid = src->valid;
}
-/*!
- * \internal
- * \brief Destroy the party subaddress contents
- * \since 1.6.3
- *
- * \param doomed The party subaddress to destroy.
- *
- * \return Nothing
- */
-static void ast_party_subaddress_free(struct ast_party_subaddress *doomed)
+void ast_party_subaddress_free(struct ast_party_subaddress *doomed)
{
if (doomed->str) {
ast_free(doomed->str);
More information about the svn-commits
mailing list