Module Name: xsrc
Committed By: mrg
Date: Fri May 31 05:11:36 UTC 2013
Modified Files:
xsrc/external/mit/fstobdf/dist: fstobdf.c
xsrc/external/mit/mkfontscale/dist: ident.c
Removed Files:
xsrc/external/mit/appres/dist: NEWS appres.man autogen.sh compile
xsrc/external/mit/bdftopcf/dist: bdftopcf.man
xsrc/external/mit/beforelight/dist: beforelight.man
xsrc/external/mit/editres/dist: autogen.sh editres.man
xsrc/external/mit/fslsfonts/dist: fslsfonts.man
xsrc/external/mit/fstobdf/dist: fstobdf.man
xsrc/external/mit/listres/dist: listres.man
xsrc/external/mit/mkfontdir/dist: mkfontdir.cpp mkfontdir.man
Log Message:
merge appres 1.0.4, bdftopcf 1.0.4, beforelight 1.0.5, editres 1.0.6,
fslsfonts 1.0.4, fstobdf 1.0.5, listres 1.0.3, and mkfontdir 1.0.7.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/appres/dist/NEWS \
xsrc/external/mit/appres/dist/autogen.sh \
xsrc/external/mit/appres/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/appres/dist/appres.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/bdftopcf/dist/bdftopcf.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/beforelight/dist/beforelight.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/editres/dist/autogen.sh \
xsrc/external/mit/editres/dist/editres.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/fslsfonts/dist/fslsfonts.man
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fstobdf/dist/fstobdf.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/fstobdf/dist/fstobdf.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/listres/dist/listres.man
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/mkfontdir/dist/mkfontdir.cpp \
xsrc/external/mit/mkfontdir/dist/mkfontdir.man
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/mkfontscale/dist/ident.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fstobdf/dist/fstobdf.c
diff -u xsrc/external/mit/fstobdf/dist/fstobdf.c:1.2 xsrc/external/mit/fstobdf/dist/fstobdf.c:1.3
--- xsrc/external/mit/fstobdf/dist/fstobdf.c:1.2 Thu May 30 23:10:29 2013
+++ xsrc/external/mit/fstobdf/dist/fstobdf.c Fri May 31 05:11:35 2013
@@ -1,5 +1,5 @@
/*
-
+
Copyright 1990, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +23,7 @@ used in advertising or otherwise to prom
in this Software without prior written authorization from The Open Group.
* Copyright 1990 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation
+ * Portions Copyright 1987 by Digital Equipment Corporation
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
@@ -47,7 +47,9 @@ in this Software without prior written a
#include <stdlib.h>
#include <string.h>
#include "fstobdf.h"
-static void
+
+
+static void _X_NORETURN
usage(char *progName)
{
fprintf(stderr, "Usage: %s [-s <font server>] -fn <font name>\n",
@@ -55,7 +57,7 @@ usage(char *progName)
exit(0);
}
-static void
+static void _X_NORETURN
Fail(char *progName)
{
fprintf(stderr, "%s: unable to dump font\n", progName);
Index: xsrc/external/mit/mkfontscale/dist/ident.c
diff -u xsrc/external/mit/mkfontscale/dist/ident.c:1.3 xsrc/external/mit/mkfontscale/dist/ident.c:1.4
--- xsrc/external/mit/mkfontscale/dist/ident.c:1.3 Sun Nov 21 02:19:23 2010
+++ xsrc/external/mit/mkfontscale/dist/ident.c Fri May 31 05:11:36 2013
@@ -144,8 +144,8 @@ fontFileSeek(fontFile *ff, z_off_t offse
break;
default:
return -1;
- }
-
+ }
+
while (n > BUFSIZ) {
if (BZ2_bzread(ff->f.bz2, buf, BUFSIZ) != BUFSIZ)
return -1;
@@ -223,7 +223,7 @@ getInt32(fontFile *f, int format)
}
}
-int
+int
bitmapIdentify(const char *filename, char **name)
{
fontFile ff;
@@ -272,7 +272,7 @@ pcfIdentify(fontFile *f, char **name)
rc = fontFileSeek(f, prop_position, SEEK_SET);
if(rc < 0)
goto fail;
-
+
format = getLSB32(f);
if((format & 0xFFFFFF00) != 0)
goto fail;
@@ -430,7 +430,7 @@ bdfIdentify(fontFile *f, char **name)
while(1) {
if(!eol) {
rc = bdfskip(f);
- if(rc < 0)
+ if(rc < 0)
goto fail;
}
k = getKeyword(f, &eol);
