summaryrefslogtreecommitdiff
path: root/utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'utils.c')
-rw-r--r--utils.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/utils.c b/utils.c
index 489c794..ddd044f 100644
--- a/utils.c
+++ b/utils.c
@@ -24,7 +24,6 @@
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
-#include <stdlib.h>
#include <time.h>
#include "utils.h"
@@ -52,15 +51,6 @@ utils_info(const char *fmt, ...)
fputc('\n', stderr);
}
-void *
-utils_malloc(size_t size)
-{
- void *m = malloc(size);
- if (!m)
- utils_fatal("memory exhausted");
- return m;
-}
-
void
utils_delay_us(int us)
{
@@ -71,7 +61,7 @@ utils_delay_us(int us)
if (errno == EINTR)
delay = remaining;
else
- utils_fatal("can not sleep: %m");
+ g_error("can not sleep: %m");
}
}
@@ -79,14 +69,12 @@ void
utils_dialog_error(GtkWindow *parent, const char *fmt, ...)
{
va_list ap;
- char *msg;
va_start(ap, fmt);
- if (vasprintf(&msg, fmt, ap) == -1)
- utils_fatal("memory exhausted");
+ char *msg = g_strdup_vprintf(fmt, ap);
va_end(ap);
GtkWidget *dialog = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", msg);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
- free(msg);
+ g_free(msg);
}