diff options
author | Nico Weber <thakis@chromium.org> | 2015-08-04 13:00:21 -0700 |
---|---|---|
committer | Nico Weber <thakis@chromium.org> | 2015-08-04 13:00:21 -0700 |
commit | 9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f (patch) | |
tree | c97037f398d714665aefccb6eb54d0969ad7030c /core/include/fxcrt/fx_memory.h | |
parent | 780cee82236d1b3b0f9b01a22424e4b8ec9a6f12 (diff) | |
download | pdfium-9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f.tar.xz |
XFA: clang-format all pdfium code.
No behavior change.
Generated by:
find . -name '*.cpp' -o -name '*.h' | \
grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/
See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.
BUG=none
Diffstat (limited to 'core/include/fxcrt/fx_memory.h')
-rw-r--r-- | core/include/fxcrt/fx_memory.h | 114 |
1 files changed, 52 insertions, 62 deletions
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h index d19a3b32ab..e24aa3ecf4 100644 --- a/core/include/fxcrt/fx_memory.h +++ b/core/include/fxcrt/fx_memory.h @@ -13,9 +13,9 @@ extern "C" { #endif // For external C libraries to malloc through PDFium. These may return NULL. -void* FXMEM_DefaultAlloc(size_t byte_size, int flags); -void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags); -void FXMEM_DefaultFree(void* pointer, int flags); +void* FXMEM_DefaultAlloc(size_t byte_size, int flags); +void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags); +void FXMEM_DefaultFree(void* pointer, int flags); #ifdef __cplusplus } // extern "C" @@ -28,94 +28,84 @@ void FXMEM_DefaultFree(void* pointer, int flags); NEVER_INLINE void FX_OutOfMemoryTerminate(); inline void* FX_SafeRealloc(void* ptr, size_t num_members, size_t member_size) { - if (num_members < std::numeric_limits<size_t>::max() / member_size) { - return realloc(ptr, num_members * member_size); - } - return nullptr; + if (num_members < std::numeric_limits<size_t>::max() / member_size) { + return realloc(ptr, num_members * member_size); + } + return nullptr; } inline void* FX_AllocOrDie(size_t num_members, size_t member_size) { - // TODO(tsepez): See if we can avoid the implicit memset(0). - if (void* result = calloc(num_members, member_size)) { - return result; - } - FX_OutOfMemoryTerminate(); // Never returns. - return nullptr; // Suppress compiler warning. + // TODO(tsepez): See if we can avoid the implicit memset(0). + if (void* result = calloc(num_members, member_size)) { + return result; + } + FX_OutOfMemoryTerminate(); // Never returns. + return nullptr; // Suppress compiler warning. } inline void* FX_AllocOrDie2D(size_t w, size_t h, size_t member_size) { - if (w < std::numeric_limits<size_t>::max() / h) { - return FX_AllocOrDie(w * h, member_size); - } - FX_OutOfMemoryTerminate(); // Never returns. - return nullptr; // Suppress compiler warning. + if (w < std::numeric_limits<size_t>::max() / h) { + return FX_AllocOrDie(w * h, member_size); + } + FX_OutOfMemoryTerminate(); // Never returns. + return nullptr; // Suppress compiler warning. } -inline void* FX_ReallocOrDie(void* ptr, size_t num_members, size_t member_size) { - if (void* result = FX_SafeRealloc(ptr, num_members, member_size)) { - return result; - } - FX_OutOfMemoryTerminate(); // Never returns. - return nullptr; // Suppress compiler warning. +inline void* FX_ReallocOrDie(void* ptr, + size_t num_members, + size_t member_size) { + if (void* result = FX_SafeRealloc(ptr, num_members, member_size)) { + return result; + } + FX_OutOfMemoryTerminate(); // Never returns. + return nullptr; // Suppress compiler warning. } // Never returns NULL. -#define FX_Alloc(type, size) (type*)FX_AllocOrDie(size, sizeof(type)) -#define FX_Alloc2D(type, w, h) (type*)FX_AllocOrDie2D(w, h, sizeof(type)) +#define FX_Alloc(type, size) (type*) FX_AllocOrDie(size, sizeof(type)) +#define FX_Alloc2D(type, w, h) (type*) FX_AllocOrDie2D(w, h, sizeof(type)) #define FX_Realloc(type, ptr, size) \ - (type*)FX_ReallocOrDie(ptr, size, sizeof(type)) + (type*) FX_ReallocOrDie(ptr, size, sizeof(type)) // May return NULL. -#define FX_TryAlloc(type, size) (type*)calloc(size, sizeof(type)) +#define FX_TryAlloc(type, size) (type*) calloc(size, sizeof(type)) #define FX_TryRealloc(type, ptr, size) \ - (type*)FX_SafeRealloc(ptr, size, sizeof(type)) + (type*) FX_SafeRealloc(ptr, size, sizeof(type)) #define FX_Free(ptr) free(ptr) -class CFX_DestructObject -{ -public: - - virtual ~CFX_DestructObject() {} +class CFX_DestructObject { + public: + virtual ~CFX_DestructObject() {} }; -class CFX_GrowOnlyPool -{ -public: - - CFX_GrowOnlyPool(size_t trunk_size = 16384); +class CFX_GrowOnlyPool { + public: + CFX_GrowOnlyPool(size_t trunk_size = 16384); - ~CFX_GrowOnlyPool(); + ~CFX_GrowOnlyPool(); - void SetTrunkSize(size_t trunk_size) - { - m_TrunkSize = trunk_size; - } + void SetTrunkSize(size_t trunk_size) { m_TrunkSize = trunk_size; } - void* AllocDebug(size_t size, const FX_CHAR* file, int line) - { - return Alloc(size); - } + void* AllocDebug(size_t size, const FX_CHAR* file, int line) { + return Alloc(size); + } - void* Alloc(size_t size); + void* Alloc(size_t size); - void* ReallocDebug(void* p, size_t new_size, const FX_CHAR* file, int line) - { - return NULL; - } + void* ReallocDebug(void* p, size_t new_size, const FX_CHAR* file, int line) { + return NULL; + } - void* Realloc(void* p, size_t new_size) - { - return NULL; - } + void* Realloc(void* p, size_t new_size) { return NULL; } - void Free(void*) {} + void Free(void*) {} - void FreeAll(); -private: + void FreeAll(); - size_t m_TrunkSize; + private: + size_t m_TrunkSize; - void* m_pFirstTrunk; + void* m_pFirstTrunk; }; #endif // __cplusplus |