Commit 89367d47 authored by Yang Tse's avatar Yang Tse
Browse files

Disable tracking of fdopen() calls in the low-level memory leak tracking 

code when fdopen() is not available, to avoid compiler error.
parent 7fdfd938

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


                                  Changelog



Yang Tse (13 Sep 2008)

- Disable tracking of fdopen() calls in the low-level memory leak tracking

  code when fdopen() is not available, to avoid compiler error.



Yang Tse (12 Sep 2008)

- Further adjust detection of strerror_r() in the configure process, and

  ensure that errno is not modified inside Curl_strerror().

lib/memdebug.c

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ FILE *curl_fopen(const char *file, const char *mode, 
  return res;

}



#ifdef HAVE_FDOPEN

FILE *curl_fdopen(int filedes, const char *mode,

                  int line, const char *source)

{
@@ -292,6 +293,7 @@ FILE *curl_fdopen(int filedes, const char *mode, 
            source, line, filedes, mode, res);

  return res;

}

#endif



int curl_fclose(FILE *file, int line, const char *source)

{

lib/memdebug.h

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -67,8 +67,10 @@ CURL_EXTERN int curl_accept(int s, void *addr, void *addrlen, 
/* FILE functions */

CURL_EXTERN FILE *curl_fopen(const char *file, const char *mode, int line,

                             const char *source);

#ifdef HAVE_FDOPEN

CURL_EXTERN FILE *curl_fdopen(int filedes, const char *mode, int line,

                              const char *source);

#endif

CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source);



#ifndef MEMDEBUG_NODEFINES