# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1446179417 -7200
# Node ID 670d0affc08f73f47bf40013829b4a4888448da9
# Parent  4452a6143d1256d063928c72ac5624856f2ec64c
fixed bad commit

diff -r 4452a6143d12 -r 670d0affc08f src/drawgl.c
--- a/src/drawgl.c	Fri Oct 30 06:26:15 2015 +0200
+++ b/src/drawgl.c	Fri Oct 30 06:30:17 2015 +0200
@@ -169,14 +169,6 @@
 void dtx_printf(const char *fmt, ...)
 {
 	va_list ap;
-
-	va_start(ap, fmt);
-	dtx_vprintf(fmt, ap);
-	va_end(ap);
-}
-
-void dtx_vprintf(const char *fmt, va_list ap)
-{
 	int buf_size;
 	char *buf, tmp;
 
diff -r 4452a6143d12 -r 670d0affc08f src/drawtext_impl.h
--- a/src/drawtext_impl.h	Fri Oct 30 06:26:15 2015 +0200
+++ b/src/drawtext_impl.h	Fri Oct 30 06:30:17 2015 +0200
@@ -61,7 +61,7 @@
 
 
 #define fperror(str) \
-	fprintf(stderr, "%s: %s: %s\n", __FUNCTION__, (str), strerror(errno))
+	fprintf(stderr, "%s: %s: %s\n", __func__, (str), strerror(errno))
 
 int dtx_gl_init(void);
 
diff -r 4452a6143d12 -r 670d0affc08f src/font.c
--- a/src/font.c	Fri Oct 30 06:26:15 2015 +0200
+++ b/src/font.c	Fri Oct 30 06:30:17 2015 +0200
@@ -149,14 +149,14 @@
 void dtx_prepare(struct dtx_font *fnt, int sz)
 {
 	if(!dtx_get_font_glyphmap_range(fnt, sz, 0, 256)) {
-		fprintf(stderr, "%s: failed (sz: %d, range: 0-255 [ascii])\n", __FUNCTION__, sz);
+		fprintf(stderr, "%s: failed (sz: %d, range: 0-255 [ascii])\n", __func__, sz);
 	}
 }
 
 void dtx_prepare_range(struct dtx_font *fnt, int sz, int cstart, int cend)
 {
 	if(!dtx_get_font_glyphmap_range(fnt, sz, cstart, cend)) {
-		fprintf(stderr, "%s: failed (sz: %d, range: %d-%d)\n", __FUNCTION__, sz, cstart, cend);
+		fprintf(stderr, "%s: failed (sz: %d, range: %d-%d)\n", __func__, sz, cstart, cend);
 	}
 }
 
@@ -411,7 +411,7 @@
 				}
 
 			} else {
-				fprintf(stderr, "%s: invalid glyph info line\n", __FUNCTION__);
+				fprintf(stderr, "%s: invalid glyph info line\n", __func__);
 				goto err;
 			}
 
@@ -419,14 +419,14 @@
 			switch(hdr_lines) {
 			case 0:
 				if(0[line] != 'P' || 1[line] != '6') {
-					fprintf(stderr, "%s: invalid file format (magic)\n", __FUNCTION__);
+					fprintf(stderr, "%s: invalid file format (magic)\n", __func__);
 					goto err;
 				}
 				break;
 
 			case 1:
 				if(sscanf(line, "%d %d", &gmap->xsz, &gmap->ysz) != 2) {
-					fprintf(stderr, "%s: invalid file format (dim)\n", __FUNCTION__);
+					fprintf(stderr, "%s: invalid file format (dim)\n", __func__);
 					goto err;
 				}
 				break;
@@ -436,7 +436,7 @@
 					char *endp;
 					max_pixval = strtol(line, &endp, 10);
 					if(endp == line) {
-						fprintf(stderr, "%s: invalid file format (maxval)\n", __FUNCTION__);
+						fprintf(stderr, "%s: invalid file format (maxval)\n", __func__);
 						goto err;
 					}
 				}
@@ -450,7 +450,7 @@
 	}
 
 	if(gmap->ptsize == -1 || gmap->line_advance == FLT_MIN) {
-		fprintf(stderr, "%s: invalid glyphmap, insufficient information in ppm comments\n", __FUNCTION__);
+		fprintf(stderr, "%s: invalid glyphmap, insufficient information in ppm comments\n", __func__);
 		goto err;
 	}
 
@@ -514,7 +514,7 @@
 	int res;
 
 	if(!(fp = fopen(fname, "wb"))) {
-		fprintf(stderr, "%s: failed to open file: %s: %s\n", __FUNCTION__, fname, strerror(errno));
+		fprintf(stderr, "%s: failed to open file: %s: %s\n", __func__, fname, strerror(errno));
 		return -1;
 	}
 	res = dtx_save_glyphmap_stream(fp, gmap);