client: xcalloc

diff --git a/client/press.c b/client/press.c
index e1eddfcfbc66f010d53f28f66940bcf42a2ba733..1c8ce9f1ae2cb4e2318a90192ccbe0ec0150e245 100644 (file)
--- a/client/press.c
+++ b/client/press.c
@@ -11,13 +11,16 @@ static bool next_send_less_than(void *user_data, pheap_node_id_t a,
   return next_send(&presses[a]) < next_send(&presses[b]);
 }
 
   return next_send(&presses[a]) < next_send(&presses[b]);
 }
 

-press_pile_t *create_press_pile() {
-  press_pile_t *pp = (press_pile_t *)malloc(sizeof(press_pile_t));
-  if (pp == NULL)
-    signal_error_by_blinking();
-  pp->presses = calloc(PICO_PHEAP_MAX_ENTRIES, sizeof(press_t));
-  if (pp->presses == NULL)
+static void *xcalloc(size_t nmemb, size_t size) {
+  void *p = calloc(nmemb, size);
+  if (p == NULL)

     signal_error_by_blinking();
     signal_error_by_blinking();

+  return p;
+}
+
+press_pile_t *create_press_pile() {
+  press_pile_t *pp = (press_pile_t *)xcalloc(1, sizeof(press_pile_t));
+  pp->presses = (press_t *)xcalloc(PICO_PHEAP_MAX_ENTRIES, sizeof(press_t));

   pp->sleeps_heap =
       ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, pp->presses);
   if (pp->sleeps_heap == NULL)
   pp->sleeps_heap =
       ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, pp->presses);
   if (pp->sleeps_heap == NULL)