# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1450400135 -7200
# Node ID 49feeaf50ae8d66695b0a6ef900e37e30a06aaac
# Parent  155ed299364a485d1fb8395312006c61a9912317# Parent  670d0affc08f73f47bf40013829b4a4888448da9
merged

diff -r 155ed299364a -r 49feeaf50ae8 src/drawgl.c
--- a/src/drawgl.c	Sat Mar 14 23:25:10 2015 +0200
+++ b/src/drawgl.c	Fri Dec 18 02:55:35 2015 +0200
@@ -176,9 +176,7 @@
 		return;
 	}
 
-	va_start(ap, fmt);
 	buf_size = vsnprintf(&tmp, 0, fmt, ap);
-	va_end(ap);
 
 	if(buf_size == -1) {
 		buf_size = 512;
diff -r 155ed299364a -r 49feeaf50ae8 src/drawtext_impl.h
--- a/src/drawtext_impl.h	Sat Mar 14 23:25:10 2015 +0200
+++ b/src/drawtext_impl.h	Fri Dec 18 02:55:35 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 155ed299364a -r 49feeaf50ae8 src/font.c
--- a/src/font.c	Sat Mar 14 23:25:10 2015 +0200
+++ b/src/font.c	Fri Dec 18 02:55:35 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);
diff -r 155ed299364a -r 49feeaf50ae8 tools/font2glyphmap/Makefile
--- a/tools/font2glyphmap/Makefile	Sat Mar 14 23:25:10 2015 +0200
+++ b/tools/font2glyphmap/Makefile	Fri Dec 18 02:55:35 2015 +0200
@@ -1,3 +1,5 @@
+PREFIX = /usr/local
+
 src = $(wildcard src/*.c)
 obj = $(src:.c=.o)
 bin = font2glyphmap
@@ -22,3 +24,12 @@
 .PHONY: clean
 clean:
 	rm -f $(obj) $(bin) $(lib_so)
+
+.PHONY: install
+install:
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
+
+.PHONY: uninstall
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/$(bin)