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

the malloc debug system only logs data if the logfile FILE * is set, which

Browse Source 
makes it easier to disable debug output when built with debug functions
This commit is contained in:
Daniel Stenberg
2001-10-17 12:33:35 +00:00
parent db0e3cc60c
commit 010044e03c
2 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/hostip.c
View File

@@ -96,20 +96,26 @@ int curl_getaddrinfo(char *hostname, char *service,
int line, const char *source) int line, const char *source)
{ {
int res=(getaddrinfo)(hostname, service, hints, result); int res=(getaddrinfo)(hostname, service, hints, result);
if(0 == res) if(0 == res) {
/* success */ /* success */
fprintf(logfile?logfile:stderr, "ADDR %s:%d getaddrinfo() = %p\n", if(logfile)
fprintf(logfile, "ADDR %s:%d getaddrinfo() = %p\n",
source, line, *result); source, line, *result);
else }
fprintf(logfile?logfile:stderr, "ADDR %s:%d getaddrinfo() failed\n", else {
if(logfile)
fprintf(logfile, "ADDR %s:%d getaddrinfo() failed\n",
source, line); source, line);
}
return res; return res;
} }
void curl_freeaddrinfo(struct addrinfo *freethis, void curl_freeaddrinfo(struct addrinfo *freethis,
int line, const char *source) int line, const char *source)
{ {
(freeaddrinfo)(freethis); (freeaddrinfo)(freethis);
fprintf(logfile?logfile:stderr, "ADDR %s:%d freeaddrinfo(%p)\n", if(logfile)
fprintf(logfile, "ADDR %s:%d freeaddrinfo(%p)\n",
source, line, freethis); source, line, freethis);
} }

31
lib/memdebug.c
View File

@@ -60,14 +60,18 @@ FILE *logfile;
/* this sets the log file name */ /* this sets the log file name */
void curl_memdebug(const char *logname) void curl_memdebug(const char *logname)
{ {
if(logname)
logfile = fopen(logname, "w"); logfile = fopen(logname, "w");
else
logfile = stderr;
} }
void *curl_domalloc(size_t size, int line, const char *source) void *curl_domalloc(size_t size, int line, const char *source)
{ {
void *mem=(malloc)(size); void *mem=(malloc)(size);
fprintf(logfile?logfile:stderr, "MEM %s:%d malloc(%d) = %p\n", if(logfile)
fprintf(logfile, "MEM %s:%d malloc(%d) = %p\n",
source, line, size, mem); source, line, size, mem);
return mem; return mem;
} }
@@ -85,7 +89,8 @@ char *curl_dostrdup(const char *str, int line, const char *source)
mem=(strdup)(str); mem=(strdup)(str);
len=strlen(str)+1; len=strlen(str)+1;
fprintf(logfile?logfile:stderr, "MEM %s:%d strdup(%p) (%d) = %p\n", if(logfile)
fprintf(logfile, "MEM %s:%d strdup(%p) (%d) = %p\n",
source, line, str, len, mem); source, line, str, len, mem);
return mem; return mem;
} }
@@ -93,7 +98,8 @@ char *curl_dostrdup(const char *str, int line, const char *source)
void *curl_dorealloc(void *ptr, size_t size, int line, const char *source) void *curl_dorealloc(void *ptr, size_t size, int line, const char *source)
{ {
void *mem=(realloc)(ptr, size); void *mem=(realloc)(ptr, size);
fprintf(logfile?logfile:stderr, "MEM %s:%d realloc(%p, %d) = %p\n", if(logfile)
fprintf(logfile, "MEM %s:%d realloc(%p, %d) = %p\n",
source, line, ptr, size, mem); source, line, ptr, size, mem);
return mem; return mem;
} }
@@ -108,14 +114,15 @@ void curl_dofree(void *ptr, int line, const char *source)
(free)(ptr); (free)(ptr);
fprintf(logfile?logfile:stderr, "MEM %s:%d free(%p)\n", if(logfile)
source, line, ptr); fprintf(logfile, "MEM %s:%d free(%p)\n", source, line, ptr);
} }
int curl_socket(int domain, int type, int protocol, int line, char *source) int curl_socket(int domain, int type, int protocol, int line, char *source)
{ {
int sockfd=(socket)(domain, type, protocol); int sockfd=(socket)(domain, type, protocol);
fprintf(logfile?logfile:stderr, "FD %s:%d socket() = %d\n", if(logfile)
fprintf(logfile, "FD %s:%d socket() = %d\n",
source, line, sockfd); source, line, sockfd);
return sockfd; return sockfd;
} }
@@ -124,7 +131,8 @@ int curl_accept(int s, struct sockaddr *addr, socklen_t *addrlen,
int line, const char *source) int line, const char *source)
{ {
int sockfd=(accept)(s, addr, addrlen); int sockfd=(accept)(s, addr, addrlen);
fprintf(logfile?logfile:stderr, "FD %s:%d accept() = %d\n", if(logfile)
fprintf(logfile, "FD %s:%d accept() = %d\n",
source, line, sockfd); source, line, sockfd);
return sockfd; return sockfd;
} }
@@ -133,7 +141,8 @@ int curl_accept(int s, struct sockaddr *addr, socklen_t *addrlen,
int curl_sclose(int sockfd, int line, char *source) int curl_sclose(int sockfd, int line, char *source)
{ {
int res=sclose(sockfd); int res=sclose(sockfd);
fprintf(logfile?logfile:stderr, "FD %s:%d sclose(%d)\n", if(logfile)
fprintf(logfile, "FD %s:%d sclose(%d)\n",
source, line, sockfd); source, line, sockfd);
return res; return res;
} }
@@ -142,7 +151,8 @@ FILE *curl_fopen(const char *file, const char *mode,
int line, const char *source) int line, const char *source)
{ {
FILE *res=(fopen)(file, mode); FILE *res=(fopen)(file, mode);
fprintf(logfile?logfile:stderr, "FILE %s:%d fopen(\"%s\") = %p\n", if(logfile)
fprintf(logfile, "FILE %s:%d fopen(\"%s\") = %p\n",
source, line, file, res); source, line, file, res);
return res; return res;
} }
@@ -150,7 +160,8 @@ FILE *curl_fopen(const char *file, const char *mode,
int curl_fclose(FILE *file, int line, const char *source) int curl_fclose(FILE *file, int line, const char *source)
{ {
int res=(fclose)(file); int res=(fclose)(file);
fprintf(logfile?logfile:stderr, "FILE %s:%d fclose(%p)\n", if(logfile)
fprintf(logfile, "FILE %s:%d fclose(%p)\n",
source, line, file); source, line, file);
return res; return res;
} }