From e7b9d4bef4ffea17759401a3d882958420a3d664 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Thu, 1 Jan 2004 16:29:50 +0000 Subject: [PATCH] * examples/cacaview.c: + Use sprintf() instead of snprintf() so that cacaview builds with DJGPP. * examples/aafire.c: + bzero the pixel buffer in the initialisation routine. --- examples/aafire.c | 2 ++ examples/cacaview.c | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/examples/aafire.c b/examples/aafire.c index 1003367..a058879 100644 --- a/examples/aafire.c +++ b/examples/aafire.c @@ -29,6 +29,7 @@ #include "config.h" #include #include +#include #include "caca.h" #define XSIZ (caca_get_width() * 2) @@ -133,6 +134,7 @@ initialize (void) caca_bitmap = caca_create_bitmap(8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0); caca_set_bitmap_palette(caca_bitmap, r, g, b, a); bitmap = malloc(4 * caca_get_width() * caca_get_height() * sizeof(char)); + memset(bitmap, 0, 4 * caca_get_width() * caca_get_height()); #else aa_hidecursor (context); #endif diff --git a/examples/cacaview.c b/examples/cacaview.c index b6f2ae6..8dee727 100644 --- a/examples/cacaview.c +++ b/examples/cacaview.c @@ -227,12 +227,18 @@ int main(int argc, char **argv) if(items && reload) { - char *buffer = malloc(ww + 1); + char *buffer; + int len = strlen(" Loading `%s'... ") + strlen(list[current]); + + if(len < ww + 1) + len = ww + 1; + + buffer = malloc(len); /* Reset image-specific runtime variables */ zoom = 0; - snprintf(buffer, ww, " Loading `%s'... ", list[current]); + sprintf(buffer, " Loading `%s'... ", list[current]); buffer[ww] = '\0'; caca_set_color(CACA_COLOR_WHITE, CACA_COLOR_BLUE); caca_putstr((ww - strlen(buffer)) / 2, wh / 2, buffer); @@ -261,8 +267,15 @@ int main(int argc, char **argv) } else if(!pixels) { - char *buffer = malloc(ww + 1); - snprintf(buffer, ww, " Error loading `%s'. ", list[current]); + char *buffer; + int len = strlen(" Error loading `%s'. ") + strlen(list[current]); + + if(len < ww + 1) + len = ww + 1; + + buffer = malloc(len); + + sprintf(buffer, " Error loading `%s'. ", list[current]); buffer[ww] = '\0'; caca_set_color(CACA_COLOR_WHITE, CACA_COLOR_BLUE); caca_putstr((ww - strlen(buffer)) / 2, wh / 2, buffer); @@ -322,7 +335,7 @@ int main(int argc, char **argv) caca_printf(ww - 14, wh - 2, "(zoom: %s%i)", zoom > 0 ? "+" : "", zoom); - caca_set_color(CACA_COLOR_LIGHTRED, CACA_COLOR_BLACK); + caca_set_color(CACA_COLOR_LIGHTGRAY, CACA_COLOR_BLACK); caca_draw_line(0, wh - 1, ww - 1, wh - 1, ' '); switch(status) {