moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

fix socket data type and logging format in debug tracking socket functions

Browse Source
This commit is contained in:
Yang Tse 2010-02-22 23:28:56 +00:00
parent 439f62bfa8
commit 5b778a7ca4
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/memdebug.c
View File

@ -275,38 +275,53 @@ void curl_dofree(void *ptr, int line, const char *source)
curl_memlog("MEM %s:%d free(%p)\n", source, line, ptr); curl_memlog("MEM %s:%d free(%p)\n", source, line, ptr);
} }
int curl_socket(int domain, int type, int protocol, int line, curl_socket_t curl_socket(int domain, int type, int protocol,
const char *source) int line, const char *source)
{ {
int sockfd=socket(domain, type, protocol); const char *fmt = (sizeof(curl_socket_t) == sizeof(int)) ?
if(source && (sockfd!=-1)) "FD %s:%d socket() = %d\n" :
curl_memlog("FD %s:%d socket() = %d\n", (sizeof(curl_socket_t) == sizeof(long)) ?
source, line, sockfd); "FD %s:%d socket() = %ld\n" :
"FD %s:%d socket() = %zd\n" ;
curl_socket_t sockfd = socket(domain, type, protocol);
if(source && (sockfd != CURL_SOCKET_BAD))
curl_memlog(fmt, source, line, sockfd);
return sockfd; return sockfd;
} }
int curl_accept(int s, void *saddr, void *saddrlen, curl_socket_t curl_accept(curl_socket_t s, void *saddr, void *saddrlen,
int line, const char *source) int line, const char *source)
{ {
const char *fmt = (sizeof(curl_socket_t) == sizeof(int)) ?
"FD %s:%d accept() = %d\n" :
(sizeof(curl_socket_t) == sizeof(long)) ?
"FD %s:%d accept() = %ld\n" :
"FD %s:%d accept() = %zd\n" ;
struct sockaddr *addr = (struct sockaddr *)saddr; struct sockaddr *addr = (struct sockaddr *)saddr;
curl_socklen_t *addrlen = (curl_socklen_t *)saddrlen; curl_socklen_t *addrlen = (curl_socklen_t *)saddrlen;
int sockfd=accept(s, addr, addrlen); curl_socket_t sockfd = accept(s, addr, addrlen);
if(source) if(source && (sockfd != CURL_SOCKET_BAD))
curl_memlog("FD %s:%d accept() = %d\n", curl_memlog(fmt, source, line, sockfd);
source, line, sockfd);
return sockfd; return sockfd;
} }
/* separate function to allow libcurl to mark a "faked" close */ /* separate function to allow libcurl to mark a "faked" close */
void curl_mark_sclose(int sockfd, int line, const char *source) void curl_mark_sclose(curl_socket_t sockfd, int line, const char *source)
{ {
const char *fmt = (sizeof(curl_socket_t) == sizeof(int)) ?
"FD %s:%d sclose(%d)\n" :
(sizeof(curl_socket_t) == sizeof(long)) ?
"FD %s:%d sclose(%ld)\n" :
"FD %s:%d sclose(%zd)\n" ;
if(source) if(source)
curl_memlog("FD %s:%d sclose(%d)\n", curl_memlog(fmt, source, line, sockfd);
source, line, sockfd);
} }
/* this is our own defined way to close sockets on *ALL* platforms */ /* this is our own defined way to close sockets on *ALL* platforms */
int curl_sclose(int sockfd, int line, const char *source) int curl_sclose(curl_socket_t sockfd, int line, const char *source)
{ {
int res=sclose(sockfd); int res=sclose(sockfd);
curl_mark_sclose(sockfd, line, source); curl_mark_sclose(sockfd, line, source);

13
lib/memdebug.h
View File

@ -57,11 +57,14 @@ CURL_EXTERN void curl_memlimit(long limit);
CURL_EXTERN void curl_memlog(const char *format, ...); CURL_EXTERN void curl_memlog(const char *format, ...);
/* file descriptor manipulators */ /* file descriptor manipulators */
CURL_EXTERN int curl_socket(int domain, int type, int protocol, int line , const char *); CURL_EXTERN curl_socket_t curl_socket(int domain, int type, int protocol,
CURL_EXTERN void curl_mark_sclose(int sockfd, int, const char *source); int line , const char *source);
CURL_EXTERN int curl_sclose(int sockfd, int, const char *source); CURL_EXTERN void curl_mark_sclose(curl_socket_t sockfd,
CURL_EXTERN int curl_accept(int s, void *addr, void *addrlen, int line , const char *source);
int line, const char *source); CURL_EXTERN int curl_sclose(curl_socket_t sockfd,
int line , const char *source);
CURL_EXTERN curl_socket_t curl_accept(curl_socket_t s, void *a, void *alen,
int line, const char *source);
/* FILE functions */ /* FILE functions */
CURL_EXTERN FILE *curl_fopen(const char *file, const char *mode, int line, CURL_EXTERN FILE *curl_fopen(const char *file, const char *mode, int line,