diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 17:00:22 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 17:00:22 +0000 |
| commit | cc07f75cb0cc79c8ef0fa6aef0de86285ff52584 (patch) | |
| tree | 94a60fb241f8ef7f70f5dfb872376f7eac9ae450 /include | |
| parent | 1c8d9745b8c1e2cabfcdf57ac15bb0ebd0c90d2a (diff) | |
Kill some startup warnings and errors and make some messages more helpful in tracking down the source.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275105 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 8 | ||||
| -rw-r--r-- | include/asterisk/netsock2.h | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 0ea2cb11a..c61513065 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -753,10 +753,10 @@ struct ast_channel { unsigned int flags; /*!< channel flags of AST_FLAG_ type */ int alertpipe[2]; format_t nativeformats; /*!< Kinds of data this channel can natively handle */ - format_t readformat; /*!< Requested read format */ - format_t writeformat; /*!< Requested write format */ - format_t rawreadformat; /*!< Raw read format */ - format_t rawwriteformat; /*!< Raw write format */ + format_t readformat; /*!< Requested read format (after translation) */ + format_t writeformat; /*!< Requested write format (after translation) */ + format_t rawreadformat; /*!< Raw read format (before translation) */ + format_t rawwriteformat; /*!< Raw write format (before translation) */ unsigned int emulate_dtmf_duration; /*!< Number of ms left to emulate DTMF for */ #ifdef HAVE_EPOLL int epfd; diff --git a/include/asterisk/netsock2.h b/include/asterisk/netsock2.h index dd4fba97e..e7121cb94 100644 --- a/include/asterisk/netsock2.h +++ b/include/asterisk/netsock2.h @@ -293,7 +293,8 @@ int ast_sockaddr_resolve(struct ast_sockaddr **addrs, const char *str, * \retval 0 Address is null * \retval non-zero The port number of the ast_sockaddr */ -uint16_t ast_sockaddr_port(const struct ast_sockaddr *addr); +#define ast_sockaddr_port(addr) _ast_sockaddr_port(addr, __FILE__, __LINE__, __PRETTY_FUNCTION__) +uint16_t _ast_sockaddr_port(const struct ast_sockaddr *addr, const char *file, int line, const char *func); /*! * \since 1.8 @@ -308,7 +309,8 @@ uint16_t ast_sockaddr_port(const struct ast_sockaddr *addr); * \param port The port you wish to set the address to use * \retval void */ -void ast_sockaddr_set_port(struct ast_sockaddr *addr, uint16_t port); +#define ast_sockaddr_set_port(addr,port) _ast_sockaddr_set_port(addr,port,__FILE__,__LINE__,__PRETTY_FUNCTION__) +void _ast_sockaddr_set_port(struct ast_sockaddr *addr, uint16_t port, const char *file, int line, const char *func); /*! * \since 1.8 @@ -500,8 +502,9 @@ int ast_set_qos(int sockfd, int tos, int cos, const char *desc); * \retval nonzero Success * \retval zero Failure */ -int ast_sockaddr_to_sin(const struct ast_sockaddr *addr, - struct sockaddr_in *sin); +#define ast_sockaddr_to_sin(addr,sin) _ast_sockaddr_to_sin(addr,sin, __FILE__, __LINE__, __PRETTY_FUNCTION__) +int _ast_sockaddr_to_sin(const struct ast_sockaddr *addr, + struct sockaddr_in *sin, const char *file, int line, const char *func); /*! * \since 1.8 @@ -512,7 +515,9 @@ int ast_sockaddr_to_sin(const struct ast_sockaddr *addr, * \param sin The sockaddr_in to convert * \return an ast_sockaddr structure */ -void ast_sockaddr_from_sin(struct ast_sockaddr *addr, const struct sockaddr_in *sin); +#define ast_sockaddr_from_sin(addr,sin) _ast_sockaddr_from_sin(addr,sin, __FILE__, __LINE__, __PRETTY_FUNCTION__) +void _ast_sockaddr_from_sin(struct ast_sockaddr *addr, const struct sockaddr_in *sin, + const char *file, int line, const char *func); /*@}*/ |