diff options
| author | Andrew Tridgell <tridge@samba.org> | 1999-12-13 13:27:58 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1999-12-13 13:27:58 +0000 |
| commit | 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 (patch) | |
| tree | 866dd15416c3d8554bb207709f433a87ad0c012d /source3/mem_man | |
| parent | f6276724bafdb6145c0c7b565172d80cb04516ea (diff) | |
| download | samba-3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7.tar.gz samba-3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7.tar.bz2 samba-3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7.zip | |
first pass at updating head branch to be to be the same as the SAMBA_2_0 branch
(This used to be commit 453a822a76780063dff23526c35408866d0c0154)
Diffstat (limited to 'source3/mem_man')
| -rw-r--r-- | source3/mem_man/mem_man.c | 3 | ||||
| -rw-r--r-- | source3/mem_man/mem_man.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/mem_man/mem_man.c b/source3/mem_man/mem_man.c index 34ae6fd43c..758fac4386 100644 --- a/source3/mem_man/mem_man.c +++ b/source3/mem_man/mem_man.c @@ -501,9 +501,8 @@ int smb_mem_free(void *ptr,char *file,int line) static void mem_write_Index_info(int Index,FILE *outfile) { if (memory_blocks[Index].status != S_UNALLOCATED) - fprintf(outfile,"block %d file %s(%d) : ptr: %p size %d, alloc size %d, status %s\n", + fprintf(outfile,"block %d file %s(%d) : size %d, alloc size %d, status %s\n", Index,memory_blocks[Index].file,memory_blocks[Index].line, - memory_blocks[Index].pointer, memory_blocks[Index].present_size, memory_blocks[Index].allocated_size, status_to_str(memory_blocks[Index].status)); diff --git a/source3/mem_man/mem_man.h b/source3/mem_man/mem_man.h index eef281b2f9..60e31e6d44 100644 --- a/source3/mem_man/mem_man.h +++ b/source3/mem_man/mem_man.h @@ -1,4 +1,4 @@ -#if (defined(NOMEMMAN) && !defined(MEM_MAN_MAIN) && defined(HAVE_MALLOC_H)) +#if (defined(NOMEMMAN) && !defined(MEM_MAN_MAIN)) #include <malloc.h> #else |