kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kill some startup warnings and errors and make some messages more helpful in tracking down the source.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@275105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-07-09 17:00:22 +00:00
parent 5f92aed2ba
commit da8450323f
34 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/asterisk/netsock2.h
View File

@@ -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);
/*@}*/