merge develop

common/utils/utils.h

@@ -13,12 +13,12 @@ extern "C" {
 #include <sys/types.h>
 #include <common/utils/assertions.h>
 
-  #ifdef MALLOC_TRACE
-  #define malloc myMalloc
-  #endif
+#ifdef MALLOC_TRACE
+#define malloc myMalloc
+#endif
 
 #define sizeofArray(a) (sizeof(a)/sizeof(*(a)))
-  
+
 #define cmax(a,b)  ((a>b) ? (a) : (b))
 #define cmax3(a,b,c) ((cmax(a,b)>c) ? (cmax(a,b)) : (c))
 #define cmin(a,b)  ((a<b) ? (a) : (b))
@@ -46,44 +46,47 @@ extern "C" {
 #define openair_free(y,x) free((y))
 #define PAGE_SIZE 4096
 
-#define free_and_zero(PtR) do {			\
-      if (PtR) {           \
-        free(PtR);         \
-        PtR = NULL;        \
-      }                    \
-    } while (0)
-  
-static inline void* malloc16_clear( size_t size )
-{
+#define free_and_zero(PtR) do {     \
+    if (PtR) {           \
+      free(PtR);         \
+      PtR = NULL;        \
+    }                    \
+  } while (0)
+
+static inline void *malloc16_clear( size_t size ) {
 #ifdef __AVX2__
-  void* ptr = memalign(32, size+32);
+  void *ptr = memalign(32, size+32);
 #else
-  void* ptr = memalign(16, size+16);
+  void *ptr = memalign(16, size+16);
 #endif
   DevAssert(ptr);
   memset( ptr, 0, size );
   return ptr;
 }
-  
-  
-  static inline void *calloc_or_fail(size_t size) {
-    void *ptr = calloc(1, size);
-    if (ptr == NULL) {
-      fprintf(stderr, "[UE] Failed to calloc %zu bytes", size);
-      exit(EXIT_FAILURE);
-    }
-    return ptr;
+
+
+static inline void *calloc_or_fail(size_t size) {
+  void *ptr = calloc(1, size);
+
+  if (ptr == NULL) {
+    fprintf(stderr, "[UE] Failed to calloc %zu bytes", size);
+    exit(EXIT_FAILURE);
   }
 
-  static inline void *malloc_or_fail(size_t size) {
+  return ptr;
+}
+
+static inline void *malloc_or_fail(size_t size) {
   void *ptr = malloc(size);
+
   if (ptr == NULL) {
     fprintf(stderr, "[UE] Failed to malloc %zu bytes", size);
     exit(EXIT_FAILURE);
   }
+
   return ptr;
-  }
-  
+}
+
 #if !defined (msg)
 # define msg(aRGS...) LOG_D(PHY, ##aRGS)
 #endif
@@ -94,7 +97,7 @@ static inline void* malloc16_clear( size_t size )
 #    define malloc16(x) memalign(16,x)
 #  endif
 #endif
-  
+
 #define free16(y,x) free(y)
 #define bigmalloc malloc
 #define bigmalloc16 malloc16
@@ -104,7 +107,7 @@ static inline void* malloc16_clear( size_t size )
 #define PAGE_MASK 0xfffff000
 #define virt_to_phys(x) (x)
 
-  const char *hexdump(const void *data, size_t data_len, char *out, size_t out_len);
+const char *hexdump(const void *data, size_t data_len, char *out, size_t out_len);
 
 // Converts an hexadecimal ASCII coded digit into its value. **
 int hex_char_to_hex_value (char c);