Module Name: src
Committed By: joerg
Date: Wed May 16 13:53:29 UTC 2018
Modified Files:
src/external/gpl2/groff/dist/src/preproc/grn: hdb.cpp hgraph.cpp
hpoint.cpp main.cpp
Log Message:
Remove obsolete register keywords from C++ code.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp \
src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp \
src/external/gpl2/groff/dist/src/preproc/grn/hpoint.cpp \
src/external/gpl2/groff/dist/src/preproc/grn/main.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp
diff -u src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp:1.2
--- src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp:1.1.1.1 Wed Jan 13 18:41:49 2016
+++ src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp Wed May 16 13:53:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hdb.cpp,v 1.1.1.1 2016/01/13 18:41:49 christos Exp $ */
+/* $NetBSD: hdb.cpp,v 1.2 2018/05/16 13:53:28 joerg Exp $ */
/* Last non-groff version: hdb.c 1.8 (Berkeley) 84/10/20
*
@@ -33,7 +33,7 @@ extern POINT *PTInit();
extern POINT *PTMakePoint(double x, double y, POINT ** pplist);
-int DBGetType(register char *s);
+int DBGetType(char *s);
/*
@@ -59,7 +59,7 @@ DBCreateElt(int type,
char *text,
ELT **db)
{
- register ELT *temp;
+ ELT *temp;
temp = (ELT *) malloc(sizeof(ELT));
temp->nextelt = *db;
@@ -78,11 +78,11 @@ DBCreateElt(int type,
* pointer to that database.
*/
ELT *
-DBRead(register FILE *file)
+DBRead(FILE *file)
{
- register int i;
- register int done; /* flag for input exhausted */
- register double nx; /* x holder so x is not set before orienting */
+ int i;
+ int done; /* flag for input exhausted */
+ double nx; /* x holder so x is not set before orienting */
int type; /* element type */
ELT *elist; /* pointer to the file's elements */
POINT *plist; /* pointer for reading in points */
@@ -207,7 +207,7 @@ DBRead(register FILE *file)
* New file format has literal names for element types.
*/
int
-DBGetType(register char *s)
+DBGetType(char *s)
{
if (isdigit(s[0]) || (s[0] == '-')) /* old element format or EOF */
return (atoi(s));
@@ -293,7 +293,7 @@ xscanf(FILE *f,
double *xp,
double *yp)
{
- register int c, i, j, m, frac;
+ int c, i, j, m, frac;
int iscale = 1, jscale = 1; /* x = i/scale, y=j/jscale */
while ((c = getc(f)) == ' ');
Index: src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp
diff -u src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp:1.2
--- src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp:1.1.1.1 Wed Jan 13 18:41:49 2016
+++ src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp Wed May 16 13:53:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hgraph.cpp,v 1.1.1.1 2016/01/13 18:41:49 christos Exp $ */
+/* $NetBSD: hgraph.cpp,v 1.2 2018/05/16 13:53:28 joerg Exp $ */
/* Last non-groff version: hgraph.c 1.14 (Berkeley) 84/11/27
*
@@ -50,7 +50,7 @@ extern double adj4;
extern int res;
void HGSetFont(int font, int size);
-void HGPutText(int justify, POINT pnt, register char *string);
+void HGPutText(int justify, POINT pnt, char *string);
void HGSetBrush(int mode);
void tmove2(int px, int py);
void doarc(POINT cp, POINT sp, int angle);
@@ -60,8 +60,8 @@ void drawwig(POINT * ptr, int type);
void HGtline(int x1, int y1);
void deltax(double x);
void deltay(double y);
-void HGArc(register int cx, register int cy, int px, int py, int angle);
-void picurve(register int *x, register int *y, int npts);
+void HGArc(int cx, int cy, int px, int py, int angle);
+void picurve(int *x, int *y, int npts);
void HGCurve(int *x, int *y, int numpoints);
void Paramaterize(int x[], int y[], double h[], int n);
void PeriodicSpline(double h[], int z[],
@@ -85,10 +85,10 @@ void
HGPrintElt(ELT *element,
int /* baseline */)
{
- register POINT *p1;
- register POINT *p2;
- register int length;
- register int graylevel;
+ POINT *p1;
+ POINT *p2;
+ int length;
+ int graylevel;
if (!DBNullelt(element) && !Nullpoint((p1 = element->ptlist))) {
/* p1 always has first point */
@@ -280,7 +280,7 @@ HGPrintElt(ELT *element,
void
HGPutText(int justify,
POINT pnt,
- register char *string)
+ char *string)
{
int savelasty = lasty; /* vertical motion for text is to be */
/* ignored. Save current y here */
@@ -389,7 +389,7 @@ HGSetFont(int font,
void
HGSetBrush(int mode)
{
- register int printed = 0;
+ int printed = 0;
if (linmod != style[--mode]) {
/* Groff doesn't understand \Ds, so we take it out */
@@ -419,7 +419,7 @@ HGSetBrush(int mode)
void
deltax(double x)
{
- register int ix = (int) (x * troffscale);
+ int ix = (int) (x * troffscale);
printf(" %du", ix - lastx);
lastx = ix;
@@ -439,7 +439,7 @@ deltax(double x)
void
deltay(double y)
{
- register int iy = (int) (y * troffscale);
+ int iy = (int) (y * troffscale);
printf(" %du", iy - lastyline);
lastyline = iy;
@@ -459,8 +459,8 @@ void
tmove2(int px,
int py)
{
- register int dx;
- register int dy;
+ int dx;
+ int dy;
if ((dy = py - lasty)) {
printf("\\v'%du'", dy);
@@ -485,10 +485,10 @@ tmove2(int px,
void
tmove(POINT * ptr)
{
- register int ix = (int) (ptr->x * troffscale);
- register int iy = (int) (ptr->y * troffscale);
- register int dx;
- register int dy;
+ int ix = (int) (ptr->x * troffscale);
+ int iy = (int) (ptr->y * troffscale);
+ int dx;
+ int dy;
if ((dy = iy - lasty)) {
printf(".sp %du\n", dy);
@@ -549,7 +549,7 @@ void
drawwig(POINT * ptr,
int type)
{
- register int npts; /* point list index */
+ int npts; /* point list index */
int x[MAXPOINTS], y[MAXPOINTS]; /* point list */
for (npts = 1; !Nullpoint(ptr); ptr = PTNextPoint(ptr), npts++) {
@@ -576,20 +576,20 @@ drawwig(POINT * ptr,
*----------------------------------------------------------------------------*/
void
-HGArc(register int cx,
- register int cy,
+HGArc(int cx,
+ int cy,
int px,
int py,
int angle)
{
double xs, ys, resolution, fullcircle;
int m;
- register int mask;
- register int extent;
- register int nx;
- register int ny;
- register int length;
- register double epsilon;
+ int mask;
+ int extent;
+ int nx;
+ int ny;
+ int length;
+ double epsilon;
xs = px - cx;
ys = py - cy;
@@ -635,13 +635,13 @@ HGArc(register int cx,
*----------------------------------------------------------------------------*/
void
-picurve(register int *x,
- register int *y,
+picurve(int *x,
+ int *y,
int npts)
{
- register int nseg; /* effective resolution for each curve */
- register int xp; /* current point (and temporary) */
- register int yp;
+ int nseg; /* effective resolution for each curve */
+ int xp; /* current point (and temporary) */
+ int yp;
int pxp, pyp; /* previous point (to make lines from) */
int i; /* inner curve segment traverser */
int length = 0;
@@ -712,10 +712,10 @@ HGCurve(int *x,
double h[MAXPOINTS], dx[MAXPOINTS], dy[MAXPOINTS];
double d2x[MAXPOINTS], d2y[MAXPOINTS], d3x[MAXPOINTS], d3y[MAXPOINTS];
double t, t2, t3;
- register int j;
- register int k;
- register int nx;
- register int ny;
+ int j;
+ int k;
+ int nx;
+ int ny;
int lx, ly;
int length = 0;
@@ -778,10 +778,10 @@ Paramaterize(int x[],
double h[],
int n)
{
- register int dx;
- register int dy;
- register int i;
- register int j;
+ int dx;
+ int dy;
+ int i;
+ int j;
double u[MAXPOINTS];
for (i = 1; i <= n; ++i) {
@@ -939,9 +939,9 @@ NaturalEndSpline(double h[], /* paramete
*----------------------------------------------------------------------------*/
void
-change(register int x,
- register int y,
- register int vis)
+change(int x,
+ int y,
+ int vis)
{
static int length = 0;
@@ -969,17 +969,17 @@ void
HGtline(int x_1,
int y_1)
{
- register int x_0 = lastx;
- register int y_0 = lasty;
- register int dx;
- register int dy;
- register int oldcoord;
- register int res1;
- register int visible;
- register int res2;
- register int xinc;
- register int yinc;
- register int dotcounter;
+ int x_0 = lastx;
+ int y_0 = lasty;
+ int dx;
+ int dy;
+ int oldcoord;
+ int res1;
+ int visible;
+ int res2;
+ int xinc;
+ int yinc;
+ int dotcounter;
if (linmod == SOLID) {
line(x_1, y_1);
Index: src/external/gpl2/groff/dist/src/preproc/grn/hpoint.cpp
diff -u src/external/gpl2/groff/dist/src/preproc/grn/hpoint.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/preproc/grn/hpoint.cpp:1.2
--- src/external/gpl2/groff/dist/src/preproc/grn/hpoint.cpp:1.1.1.1 Wed Jan 13 18:41:49 2016
+++ src/external/gpl2/groff/dist/src/preproc/grn/hpoint.cpp Wed May 16 13:53:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hpoint.cpp,v 1.1.1.1 2016/01/13 18:41:49 christos Exp $ */
+/* $NetBSD: hpoint.cpp,v 1.2 2018/05/16 13:53:28 joerg Exp $ */
/* Last non-groff version: hpoint.c 1.1 84/10/08 */
@@ -30,7 +30,7 @@ PTMakePoint(double x,
double y,
POINT **pplist)
{
- register POINT *pt;
+ POINT *pt;
if (Nullpoint(pt = *pplist)) { /* empty list */
*pplist = (POINT *) malloc(sizeof(POINT));
Index: src/external/gpl2/groff/dist/src/preproc/grn/main.cpp
diff -u src/external/gpl2/groff/dist/src/preproc/grn/main.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/preproc/grn/main.cpp:1.2
--- src/external/gpl2/groff/dist/src/preproc/grn/main.cpp:1.1.1.1 Wed Jan 13 18:41:49 2016
+++ src/external/gpl2/groff/dist/src/preproc/grn/main.cpp Wed May 16 13:53:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.cpp,v 1.1.1.1 2016/01/13 18:41:49 christos Exp $ */
+/* $NetBSD: main.cpp,v 1.2 2018/05/16 13:53:28 joerg Exp $ */
/* Last non-groff version: main.c 1.23 (Berkeley) 85/08/05
*
@@ -90,7 +90,7 @@ extern "C" const char *Version_string;
extern void HGPrintElt(ELT *element, int baseline);
extern ELT *DBInit();
-extern ELT *DBRead(register FILE *file);
+extern ELT *DBRead(FILE *file);
extern POINT *PTInit();
extern POINT *PTMakePoint(double x, double y, POINT **pplist);
@@ -217,9 +217,9 @@ int compatibility_flag = FALSE; /* TRUE
void getres();
int doinput(FILE *fp);
-void conv(register FILE *fp, int baseline);
+void conv(FILE *fp, int baseline);
void savestate();
-int has_polygon(register ELT *elist);
+int has_polygon(ELT *elist);
void interpret(char *line);
@@ -247,10 +247,10 @@ main(int argc,
{
setlocale(LC_NUMERIC, "C");
program_name = argv[0];
- register FILE *fp;
- register int k;
- register char c;
- register int gfil = 0;
+ FILE *fp;
+ int k;
+ char c;
+ int gfil = 0;
char *file[50];
char *operand(int *argcp, char ***argvp);
@@ -426,7 +426,7 @@ doinput(FILE *fp)
void
initpic()
{
- register int i;
+ int i;
for (i = 0; i < STYLES; i++) { /* line thickness defaults */
thick[i] = defthick[i];
@@ -471,12 +471,12 @@ initpic()
*----------------------------------------------------------------------------*/
void
-conv(register FILE *fp,
+conv(FILE *fp,
int baseline)
{
- register FILE *gfp = NULL; /* input file pointer */
- register int done = 0; /* flag to remember if finished */
- register ELT *e; /* current element pointer */
+ FILE *gfp = NULL; /* input file pointer */
+ int done = 0; /* flag to remember if finished */
+ ELT *e; /* current element pointer */
ELT *PICTURE; /* whole picture data base pointer */
double temp; /* temporary calculating area */
/* POINT ptr; */ /* coordinates of a point to pass to `mov' */
@@ -537,7 +537,7 @@ conv(register FILE *fp,
} /* here, troffscale is the */
/* picture's scaling factor */
if (pointscale) {
- register int i; /* do pointscaling here, when */
+ int i; /* do pointscaling here, when */
/* scale is known, before output */
for (i = 0; i < SIZES; i++)
tsize[i] = (int) (troffscale * (double) tsize[i] + 0.5);
@@ -552,8 +552,8 @@ conv(register FILE *fp,
xright = (int) (rightpoint * troffscale);
/* save stuff in number registers, */
- /* register g1 = picture width and */
- /* register g2 = picture height, */
+ /* g1 = picture width and */
+ /* g2 = picture height, */
/* set vertical spacing, no fill, */
/* and break (to make sure picture */
/* starts on left), and put out the */
@@ -660,7 +660,7 @@ conv(register FILE *fp,
void
savestate()
{
- register int i;
+ int i;
for (i = 0; i < STYLES; i++) /* line thickness defaults */
defthick[i] = thick[i];
@@ -721,8 +721,8 @@ interpret(char *line)
{
char str1[MAXINLINE];
char str2[MAXINLINE];
- register char *chr;
- register int i;
+ char *chr;
+ int i;
double par;
str2[0] = '\0';
@@ -895,7 +895,7 @@ interpret(char *line)
*/
int
-has_polygon(register ELT *elist)
+has_polygon(ELT *elist)
{
while (!DBNullelt(elist)) {
if (elist->type == POLYGON)
