Bug#760387: dvi2ps: FTBFS with clang instead of gcc

[Nicolas Sévelin-Radiguet]

Package: dvi2ps
Version: 5.1j-1.1
Severity: minor
Tags: patch
User: pkg-llvm-t...@lists.alioth.debian.org
Usertags: clang-ftbfs

Dear Maintainer,

Your package fails to build with clang instead of gcc. [-Wreturn-type]
The attached patch fixes it.
Buildlogs and patch are here:
https://github.com/nonas/debian-clang/tree/master/buildlogs/dvi2ps

Regards,
Nicolas

-- System Information:
Debian Release: jessie/sid
  APT prefers testing-updates
  APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Description: fix FTBFS with clang instead of gcc [-Wreturn-type]
Author: Nicolas Sévelin-Radiguet <nic...@free.fr>
Last-Update: 2014-09-03
--- a/virfont.c
+++ b/virfont.c
@@ -317,7 +317,7 @@
     struct font_entry *save_curfontent;
 
     if (ce->vfdstat >= VFD_NULL)
-	return;
+	return NULL;
     if (ce->vfdstat == VFD_UNDEF) {
 	if ((defce = &virfinfo(fe)->ch[JISDEFAULT])->vfdstat == VFD_UNDEF)
 	    Fatal("char %d in vf file %s is not defined", c, fe->n);
@@ -369,7 +369,7 @@
 	MarkChar(ce->vfd.set.c);
 	setcurfont(save_curfontent);
 	free((char *)dvip);
-	return;
+	return NULL;
     }
     ce->vfd.dvi.where.dviptr = dvip;
 
--- a/pkfont.c
+++ b/pkfont.c
@@ -150,11 +150,11 @@
 	if ((cc = getuint(fntfp, 4)) > MAXMARKCHAR) {
 	    Warning("cc %d in pk file %s (skipped)", cc, fe->name);
 	    (void)fseek(fntfp, pl+8, SEEK_CUR);
-	    return;
+	    return NULL;
 	}
 	if (rii->mark[cc] == FALSE) {
 	    (void)fseek(fntfp, pl+8, SEEK_CUR);
-	    return;
+	    return NULL;
 	}
 	ce = &rastfinfo(fe)->ch[cc];
 	ce->tfmw = scale(getuint(fntfp, 4), fe->s);
@@ -165,7 +165,7 @@
 	ce = &rastfinfo(fe)->ch[cc = getuint(fntfp, 1)];
 	if (rii->mark[cc] == FALSE) {
 	    (void)fseek(fntfp, pl+3, SEEK_CUR);
-	    return;
+	    return NULL;
 	}
 	ce->tfmw = scale(getuint(fntfp, 3), fe->s);
 	n = 2;
@@ -174,7 +174,7 @@
 	ce = &rastfinfo(fe)->ch[cc = getuint(fntfp, 1)];
 	if (rii->mark[cc] == FALSE) {
 	    (void)fseek(fntfp, pl+3, SEEK_CUR);
-	    return;
+	    return NULL;
 	}
 	ce->tfmw = scale(getuint(fntfp, 3), fe->s);
 	n = 1;
--- a/rastfont.c
+++ b/rastfont.c
@@ -91,7 +91,7 @@
 {
     if (c > MAXMARKCHAR) {
 	Warning("char %d in %s ignored", c, curfontent->name);
-	return;
+	return NULL;
     }
     rastinifinfo(curfontent)->mark[c] = TRUE;
     if (c > rastinifinfo(curfontent)->maxc)
--- a/wlfont.c
+++ b/wlfont.c
@@ -93,7 +93,7 @@
 					      kpse_type1_format)) == NULL) {
 		    Warning("FreeType font file %s not found", k1wlfn);
 		    read_null_fontinfo(fe);
-		    return;
+		    return NULL;
 		}
 #else
 		filename = k1wlfn;
--- a/ttfont.c
+++ b/ttfont.c
@@ -431,7 +431,7 @@
     if ((filename = kpsearch_file(fn, fe->n, kpse_truetype_format)) == NULL) {
 	Warning("FreeType font file %s not found", fn);
 	read_null_fontinfo(fe);
-	return;
+	return NULL;
     }
 #else
     filename = fn;
--- a/pst1form.c
+++ b/pst1form.c
@@ -117,7 +117,7 @@
     for (i = 0; i <= maxc; i++)
 	if (mark[i] && std_char_names[remap[i]] == NULL) {
 	    stdex_type1_reencoding(mark, maxc, remap);
-	    return;
+	    return NULL;
 	}
     EMIT(outfp, "/Encoding StandardEncoding def\n");
 }