1 files changed, 15 insertions, 15 deletions

diff --git a/src/mem.c b/src/mem.c
index 82b28f3..01fb010 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -176,7 +176,7 @@ dbg_malloc (size_t size, const char *pos)
   unsigned *buf;
 
    if (size == 0)
-    return (void *)0;
+    return NULL;
 
   size = EXTRA_SPACE + (size + sizeof (unsigned) - 1) / sizeof (unsigned);
   buf = xmalloc (size * sizeof (unsigned));
@@ -197,13 +197,13 @@ dbg_calloc (size_t nmemb, size_t size, const char *pos)
   void *buf;
 
   if (!nmemb || !size)
-    return (void *)0;
+    return NULL;
 
   EXIT_IF (nmemb > SIZE_MAX / size, _("overflow at %s"), pos);
 
   size *= nmemb;
   if ((buf = dbg_malloc (size, pos)) == NULL)
-    return (void *)0;
+    return NULL;
 
   bzero (buf, size);
 
@@ -216,16 +216,16 @@ dbg_realloc (void *ptr, size_t nmemb, size_t size, const char *pos)
   unsigned *buf, old_size, new_size, cpy_size;
 
   if (ptr == NULL)
-    return (void *)0;
+    return NULL;
 
   new_size = nmemb *size;
   if (new_size == 0)
-    return (void *)0;
+    return NULL;
 
   EXIT_IF (nmemb > SIZE_MAX / size, _("overflow at %s"), pos);
 
   if ((buf = dbg_malloc (new_size, pos)) == NULL)
-    return (void *)0;
+    return NULL;
 
   old_size = *((unsigned *)ptr - EXTRA_SPACE_START + BLK_SIZE);
   cpy_size = (old_size > new_size) ? new_size : old_size;
@@ -243,11 +243,11 @@ dbg_strdup (const char *s, const char *pos)
   char *buf;
 
   if (s == NULL)
-    return (char *)0;
+    return NULL;
 
   size = strlen (s);
   if ((buf = dbg_malloc (size + 1, pos)) == NULL)
-    return (char *)0;
+    return NULL;
 
   return strncpy (buf, s, size + 1);
 }
@@ -287,24 +287,24 @@ dump_block_info (struct mem_blk *blk)
   if (blk == NULL)
     return;
 
-  printf (_("---==== MEMORY BLOCK ====----------------\n"));
+  puts (_("---==== MEMORY BLOCK ====----------------\n"));
   printf (_("            id: %u\n"), blk->id);
   printf (_("          size: %u\n"), blk->size);
   printf (_("  allocated in: %s\n"), blk->pos);
-  printf (_("-----------------------------------------\n"));
+  puts (_("-----------------------------------------\n"));
 }
 
 void
 mem_stats (void)
 {
-  printf ("\n");
-  printf (_("+------------------------------+\n"));
-  printf (_("| calcurse memory usage report |\n"));
-  printf (_("+------------------------------+\n"));
+  putchar ('\n');
+  puts (_("+------------------------------+\n"));
+  puts (_("| calcurse memory usage report |\n"));
+  puts (_("+------------------------------+\n"));
   printf (_("  number of calls: %u\n"), mstats.ncall);
   printf (_(" allocated blocks: %u\n"), mstats.nalloc);
   printf (_("   unfreed blocks: %u\n"), mstats.nalloc - mstats.nfree);
-  printf ("\n");
+  putchar ("\n");
 
   if (mstats.nfree < mstats.nalloc)
     {