Commit f33be3c3 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

sockaddr *. This has the added benefit that source files that include
memdebug.h doesn't have to know about "sockaddr".
parent 62a12b7f

lib/memdebug.c

+2 −1
Original line number Diff line number Diff line
@@ -208,9 +208,10 @@ int curl_socket(int domain, int type, int protocol, int line, 
  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)

{

  struct sockaddr *addr = (struct sockaddr *)saddr;

  int sockfd=(accept)(s, addr, addrlen);

  if(logfile)

    fprintf(logfile, "FD %s:%d accept() = %d\n",

lib/memdebug.h

+10 −2
Original line number Diff line number Diff line 
#ifdef CURLDEBUG

#ifndef _CURL_MEDEBUG_H

#define _CURL_MEDEBUG_H

/***************************************************************************

 *                                  _   _ ____  _     

 *  Project                     ___| | | |  _ \| |
@@ -22,6 +24,11 @@ 
 * $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"



#ifdef HAVE_SYS_TYPES_H
@@ -51,7 +58,7 @@ void curl_memlimit(long limit); 
/* file descriptor manipulators */

int curl_socket(int domain, int type, int protocol, int line , const char *);

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);



/* FILE functions */
@@ -92,4 +99,5 @@ int curl_fclose(FILE *file, int line, const char *source); 


#endif /* MEMDEBUG_NODEFINES */



#endif
 
#endif /* _CURL_MEDEBUG_H */

#endif /* CURLDEBUG */