generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modified curl_accept() to take a 'void *' in the 2nd argument instead of

Browse Source 
sockaddr *. This has the added benefit that source files that include
memdebug.h doesn't have to know about "sockaddr".
This commit is contained in:
Daniel Stenberg 2004-02-18 12:18:33 +00:00
parent 62a12b7faf
commit f33be3c313
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/memdebug.c
View File

@ -208,9 +208,10 @@ int curl_socket(int domain, int type, int protocol, int line,
return sockfd; return sockfd;
} }
int curl_accept(int s, struct sockaddr *addr, socklen_t *addrlen, int curl_accept(int s, void *saddr, socklen_t *addrlen,
int line, const char *source) int line, const char *source)
{ {
struct sockaddr *addr = (struct sockaddr *)saddr;
int sockfd=(accept)(s, addr, addrlen); int sockfd=(accept)(s, addr, addrlen);
if(logfile) if(logfile)
fprintf(logfile, "FD %s:%d accept() = %d\n", fprintf(logfile, "FD %s:%d accept() = %d\n",

12
lib/memdebug.h
View File

@ -1,4 +1,6 @@
#ifdef CURLDEBUG #ifdef CURLDEBUG
#ifndef _CURL_MEDEBUG_H
#define _CURL_MEDEBUG_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -22,6 +24,11 @@
* $Id$ * $Id$
***************************************************************************/ ***************************************************************************/
/*
* CAUTION: this header is designed to work when included by the app-side
* as well as the library. Do not mix with library internals!
*/
#include "setup.h" #include "setup.h"
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
@ -51,7 +58,7 @@ void curl_memlimit(long limit);
/* file descriptor manipulators */ /* file descriptor manipulators */
int curl_socket(int domain, int type, int protocol, int line , const char *); int curl_socket(int domain, int type, int protocol, int line , const char *);
int curl_sclose(int sockfd, int, const char *source); int curl_sclose(int sockfd, int, const char *source);
int curl_accept(int s, struct sockaddr *addr, socklen_t *addrlen, int curl_accept(int s, void *addr, socklen_t *addrlen,
int line, const char *source); int line, const char *source);
/* FILE functions */ /* FILE functions */
@ -92,4 +99,5 @@ int curl_fclose(FILE *file, int line, const char *source);
#endif /* MEMDEBUG_NODEFINES */ #endif /* MEMDEBUG_NODEFINES */
#endif #endif /* _CURL_MEDEBUG_H */
#endif /* CURLDEBUG */