use string fields for some stuff in ast_channel

const-ify some more APIs
remove 'type' field from ast_channel, in favor of the one in the channel's tech structure
allow string field module users to specify the 'chunk size' for pool allocations
update chan_alsa to be compatible with recent const-ification patches


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9060 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 35 insertions, 35 deletions

diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index 6598b3806..5d2322c01 100644
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -96,29 +96,29 @@ struct ast_cdr {
 	struct ast_cdr *next;
 };
 
-extern void ast_cdr_getvar(struct ast_cdr *cdr, const char *name, char **ret, char *workspace, int workspacelen, int recur);
-extern int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int recur);
-extern int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, char delim, char sep, int recur);
-extern void ast_cdr_free_vars(struct ast_cdr *cdr, int recur);
-extern int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr);
+void ast_cdr_getvar(struct ast_cdr *cdr, const char *name, char **ret, char *workspace, int workspacelen, int recur);
+int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int recur);
+int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, char delim, char sep, int recur);
+void ast_cdr_free_vars(struct ast_cdr *cdr, int recur);
+int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr);
 
 typedef int (*ast_cdrbe)(struct ast_cdr *cdr);
 
 /*! \brief Allocate a CDR record 
  * Returns a malloc'd ast_cdr structure, returns NULL on error (malloc failure)
  */
-extern struct ast_cdr *ast_cdr_alloc(void);
+struct ast_cdr *ast_cdr_alloc(void);
 
 /*! \brief Duplicate a record 
  * Returns a malloc'd ast_cdr structure, returns NULL on error (malloc failure)
  */
-extern struct ast_cdr *ast_cdr_dup(struct ast_cdr *cdr);
+struct ast_cdr *ast_cdr_dup(struct ast_cdr *cdr);
 
 /*! \brief Free a CDR record 
  * \param cdr ast_cdr structure to free
  * Returns nothing important
  */
-extern void ast_cdr_free(struct ast_cdr *cdr);
+void ast_cdr_free(struct ast_cdr *cdr);
 
 /*! \brief Initialize based on a channel
  * \param cdr Call Detail Record to use for channel
@@ -126,7 +126,7 @@ extern void ast_cdr_free(struct ast_cdr *cdr);
  * Initializes a CDR and associates it with a particular channel
  * Return is negligible.  (returns 0 by default)
  */
-extern int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *chan);
+int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *chan);
 
 /*! Initialize based on a channel */
 /*! 
@@ -135,7 +135,7 @@ extern int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *chan);
  * Initializes a CDR and associates it with a particular channel
  * Return is negligible.  (returns 0 by default)
  */
-extern int ast_cdr_setcid(struct ast_cdr *cdr, struct ast_channel *chan);
+int ast_cdr_setcid(struct ast_cdr *cdr, struct ast_channel *chan);
 
 /*! Register a CDR handling engine */
 /*!
@@ -145,14 +145,14 @@ extern int ast_cdr_setcid(struct ast_cdr *cdr, struct ast_channel *chan);
  * Used to register a Call Detail Record handler.
  * Returns -1 on error, 0 on success.
  */
-extern int ast_cdr_register(char *name, char *desc, ast_cdrbe be);
+int ast_cdr_register(char *name, char *desc, ast_cdrbe be);
 
 /*! Unregister a CDR handling engine */
 /*!
  * \param name name of CDR handler to unregister
  * Unregisters a CDR by it's name
  */
-extern void ast_cdr_unregister(char *name);
+void ast_cdr_unregister(char *name);
 
 /*! Start a call */
 /*!
@@ -160,28 +160,28 @@ extern void ast_cdr_unregister(char *name);
  * Starts all CDR stuff necessary for monitoring a call
  * Returns nothing important
  */
-extern void ast_cdr_start(struct ast_cdr *cdr);
+void ast_cdr_start(struct ast_cdr *cdr);
 
 /*! Answer a call */
 /*!
  * \param cdr the cdr you wish to associate with the call
  * Starts all CDR stuff necessary for doing CDR when answering a call
  */
-extern void ast_cdr_answer(struct ast_cdr *cdr);
+void ast_cdr_answer(struct ast_cdr *cdr);
 
 /*! Busy a call */
 /*!
  * \param cdr the cdr you wish to associate with the call
  * Returns nothing important
  */
-extern void ast_cdr_busy(struct ast_cdr *cdr);
+void ast_cdr_busy(struct ast_cdr *cdr);
 
 /*! Fail a call */
 /*!
  * \param cdr the cdr you wish to associate with the call
  * Returns nothing important
  */
-extern void ast_cdr_failed(struct ast_cdr *cdr);
+void ast_cdr_failed(struct ast_cdr *cdr);
 
 /*! Save the result of the call based on the AST_CAUSE_* */
 /*!
@@ -189,7 +189,7 @@ extern void ast_cdr_failed(struct ast_cdr *cdr);
  * Returns nothing important
  * \param cause the AST_CAUSE_*
  */
-extern int ast_cdr_disposition(struct ast_cdr *cdr, int cause);
+int ast_cdr_disposition(struct ast_cdr *cdr, int cause);
 	
 /*! End a call */
 /*!
@@ -197,7 +197,7 @@ extern int ast_cdr_disposition(struct ast_cdr *cdr, int cause);
  * Registers the end of call time in the cdr structure.
  * Returns nothing important
  */
-extern void ast_cdr_end(struct ast_cdr *cdr);
+void ast_cdr_end(struct ast_cdr *cdr);
 
 /*! Detaches the detail record for posting (and freeing) either now or at a
  * later time in bulk with other records during batch mode operation */
@@ -206,7 +206,7 @@ extern void ast_cdr_end(struct ast_cdr *cdr);
  * Prevents the channel thread from blocking on the CDR handling
  * Returns nothing
  */
-extern void ast_cdr_detach(struct ast_cdr *cdr);
+void ast_cdr_detach(struct ast_cdr *cdr);
 
 /*! Spawns (possibly) a new thread to submit a batch of CDRs to the backend engines */
 /*!
@@ -214,7 +214,7 @@ extern void ast_cdr_detach(struct ast_cdr *cdr);
  * Blocks the asterisk shutdown procedures until the CDR data is submitted.
  * Returns nothing
  */
-extern void ast_cdr_submit_batch(int shutdown);
+void ast_cdr_submit_batch(int shutdown);
 
 /*! Set the destination channel, if there was one */
 /*!
@@ -223,7 +223,7 @@ extern void ast_cdr_submit_batch(int shutdown);
  * Sets the destination channel the CDR is applied to
  * Returns nothing
  */
-extern void ast_cdr_setdestchan(struct ast_cdr *cdr, char *chan);
+void ast_cdr_setdestchan(struct ast_cdr *cdr, const char *chan);
 
 /*! Set the last executed application */
 /*!
@@ -233,7 +233,7 @@ extern void ast_cdr_setdestchan(struct ast_cdr *cdr, char *chan);
  * Changes the value of the last executed app
  * Returns nothing
  */
-extern void ast_cdr_setapp(struct ast_cdr *cdr, char *app, char *data);
+void ast_cdr_setapp(struct ast_cdr *cdr, char *app, char *data);
 
 /*! Convert a string to a detail record AMA flag */
 /*!
@@ -241,7 +241,7 @@ extern void ast_cdr_setapp(struct ast_cdr *cdr, char *app, char *data);
  * Converts the string form of the flag to the binary form.
  * Returns the binary form of the flag
  */
-extern int ast_cdr_amaflags2int(const char *flag);
+int ast_cdr_amaflags2int(const char *flag);
 
 /*! Disposition to a string */
 /*!
@@ -249,7 +249,7 @@ extern int ast_cdr_amaflags2int(const char *flag);
  * Converts the binary form of a disposition to string form.
  * Returns a pointer to the string form
  */
-extern char *ast_cdr_disp2str(int disposition);
+char *ast_cdr_disp2str(int disposition);
 
 /*! Reset the detail record, optionally posting it first */
 /*!
@@ -257,7 +257,7 @@ extern char *ast_cdr_disp2str(int disposition);
  * \param flags |AST_CDR_FLAG_POSTED whether or not to post the cdr first before resetting it
  *              |AST_CDR_FLAG_LOCKED whether or not to reset locked CDR's
  */
-extern void ast_cdr_reset(struct ast_cdr *cdr, struct ast_flags *flags);
+void ast_cdr_reset(struct ast_cdr *cdr, struct ast_flags *flags);
 
 /*! Flags to a string */
 /*!
@@ -265,33 +265,33 @@ extern void ast_cdr_reset(struct ast_cdr *cdr, struct ast_flags *flags);
  * Converts binary flags to string flags
  * Returns string with flag name
  */
-extern char *ast_cdr_flags2str(int flags);
+char *ast_cdr_flags2str(int flags);
 
-extern int ast_cdr_setaccount(struct ast_channel *chan, const char *account);
-extern int ast_cdr_setamaflags(struct ast_channel *chan, const char *amaflags);
+int ast_cdr_setaccount(struct ast_channel *chan, const char *account);
+int ast_cdr_setamaflags(struct ast_channel *chan, const char *amaflags);
 
 
-extern int ast_cdr_setuserfield(struct ast_channel *chan, const char *userfield);
-extern int ast_cdr_appenduserfield(struct ast_channel *chan, const char *userfield);
+int ast_cdr_setuserfield(struct ast_channel *chan, const char *userfield);
+int ast_cdr_appenduserfield(struct ast_channel *chan, const char *userfield);
 
 
 /* Update CDR on a channel */
-extern int ast_cdr_update(struct ast_channel *chan);
+int ast_cdr_update(struct ast_channel *chan);
 
 
 extern int ast_default_amaflags;
 
 extern char ast_default_accountcode[AST_MAX_ACCOUNT_CODE];
 
-extern struct ast_cdr *ast_cdr_append(struct ast_cdr *cdr, struct ast_cdr *newcdr);
+struct ast_cdr *ast_cdr_append(struct ast_cdr *cdr, struct ast_cdr *newcdr);
 
 /*! Reload the configuration file cdr.conf and start/stop CDR scheduling thread */
-extern void ast_cdr_engine_reload(void);
+void ast_cdr_engine_reload(void);
 
 /*! Load the configuration file cdr.conf and possibly start the CDR scheduling thread */
-extern int ast_cdr_engine_init(void);
+int ast_cdr_engine_init(void);
 
 /*! Submit any remaining CDRs and prepare for shutdown */
-extern void ast_cdr_engine_term(void);
+void ast_cdr_engine_term(void);
 
 #endif /* _ASTERISK_CDR_H */