Changes in src/memoryallocator.hpp [f66195:7218f8]

File:

• src/memoryallocator.hpp (modified) (5 diffs, 1 prop)

src/memoryallocator.hpp

@@ -55 +55 @@
 template <> char* Malloc<char>(size_t size, const char* output);
 
-/** Allocates a memory range using calloc().
+/* Allocates a memory range using calloc().
  * Prints the provided error message in case of a failure.
  *
@@ -61 +61 @@
  * \param failure message which is printed if the allocation fails
  * \return pointer to the allocated memory range, will be NULL if a failure occurred
- */
+*/
 template <typename X> X* Calloc(size_t size, const char* output)
 {
   X* buffer = NULL;
-  buffer = (X*) calloc(sizeof(X) * size, (size_t) 0);
+  buffer = (X*) calloc(size, sizeof(X));
 
   if (buffer != NULL) {
@@ -76 +76 @@
   return buffer;
 };
+
 
 /** Reallocates a memory range using realloc(). If the provided pointer to the old
@@ -105 +106 @@
 };
 
-/** Frees allocated memory range using free().
+/** Frees allocated memory range using free(), NULL'ing \a **buffer.
  *
- * \param pointer to the allocated memory range to free; may be NULL, this function is a no-op then
+ * \param **buffer to the allocated memory range to free; may be NULL, this function is a no-op then
  * \param *msg optional error message
  */
@@ -115 +116 @@
     return;
 
-  MemoryUsageObserver::getInstance()->removeMemory(*buffer);
+  MemoryUsageObserver::getInstance()->removeMemory(*buffer, msg);
   free(*buffer);
   *buffer = NULL;
 };
 
+/** Frees allocated memory range using free() for ... * const \a buffer types.
+ *
+ * \param *buffer to the allocated memory range to free; may be NULL, this function is a no-op then
+ * \param *msg optional error message
+ */
+template <typename X> void Free(X* const buffer, const char *msg = NULL)
+{
+  if ((buffer == NULL))
+    return;
+
+  MemoryUsageObserver::getInstance()->removeMemory(buffer, msg);
+  free(buffer);
+};
+
 #endif /*MEMORYALLOCATOR_HPP_*/