diff options
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 29 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 7 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_mempool.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 |
5 files changed, 22 insertions, 20 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index dfb3fe69474..65ce7baba1e 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -20,19 +20,19 @@ * * The Original Code is: all of this file. * - * Contributor(s): none yet. + * Contributor(s): Brecht Van Lommel + * Campbell Barton * * ***** END GPL LICENSE BLOCK ***** */ -/** \file MEM_guardedalloc.h - * \ingroup MEM +/** + * \file MEM_guardedalloc.h + * \ingroup MEM + * + * \author Copyright (C) 2001 NaN Technologies B.V. + * \brief Read \ref MEMPage * - * \author Copyright (C) 2001 NaN Technologies B.V. - * \brief Read \ref MEMPage - */ - -/** * \page MEMPage Guarded memory(de)allocation * * \section aboutmem c-style guarded memory allocation @@ -118,8 +118,9 @@ extern "C" { __attribute__((alloc_size(1))) #endif ; - - /** Allocate a block of memory of size len, with tag name str. The + + /** + * Allocate a block of memory of size len, with tag name str. The * name must be a static, because only a pointer to it is stored ! * */ void *MEM_mallocN(size_t len, const char *str) @@ -129,8 +130,9 @@ extern "C" { __attribute__((alloc_size(1))) #endif ; - - /** Same as callocN, clears memory and uses mmap (disk cached) if supported. + + /** + * Same as callocN, clears memory and uses mmap (disk cached) if supported. * Can be free'd with MEM_freeN as usual. * */ void *MEM_mapallocN(size_t len, const char *str) @@ -171,7 +173,8 @@ extern "C" { /** Attempt to enforce OSX (or other OS's) to have malloc and stack nonzero */ void MEM_set_memory_debug(void); - /** Memory usage stats + /** + * Memory usage stats * - MEM_get_memory_in_use is all memory * - MEM_get_mapped_memory_in_use is a subset of all memory */ uintptr_t MEM_get_memory_in_use(void); diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 7eda5a3ab5e..76df58f4a50 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -20,7 +20,8 @@ * * The Original Code is: all of this file. * - * Contributor(s): none yet. + * Contributor(s): Brecht Van Lommel + * Campbell Barton * * ***** END GPL LICENSE BLOCK ***** */ @@ -904,6 +905,4 @@ const char *MEM_name_ptr(void *vmemh) return "MEM_name_ptr(NULL)"; } } -#endif - -/* eof */ +#endif /* NDEBUG */ diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h index c773cfbe680..8fd2166e6f8 100644 --- a/source/blender/blenlib/BLI_mempool.h +++ b/source/blender/blenlib/BLI_mempool.h @@ -31,7 +31,7 @@ /** \file BLI_mempool.h * \ingroup bli * \author Geoffrey Bantle - * \brief Simple fast memory allocator. + * \brief Simple fast memory allocator for fixed size chunks. */ #ifdef __cplusplus diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index c4b9d5989e1..2a5739db56f 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -27,9 +27,9 @@ /** \file blender/editors/space_node/drawnode.c * \ingroup spnode + * \brief lower level node drawing for nodes (boarders, headers etc), also node layout. */ - #include <math.h> #include <stdio.h> #include <string.h> diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index adf52313307..708d7e0b5e6 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -26,9 +26,9 @@ /** \file blender/editors/space_node/node_draw.c * \ingroup spnode + * \brief higher level node drawing for the node editor. */ - #include <math.h> #include <stdio.h> #include <string.h> |