Skip to content

Commit 8a48471

Browse files
author
ripley
committed
cleanup
git-svn-id: https://svn.r-project.org/R/trunk@87879 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 639b93a commit 8a48471

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/main/xspline.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static double *ypoints;
4747
/************* Code begins here *************/
4848

4949
/* R_allocs or mallocs global arrays */
50-
static Rboolean
50+
static void // alawys returned true
5151
add_point(double x, double y, pGEDevDesc dd)
5252
{
5353
if (npoints >= max_points) {
@@ -79,14 +79,14 @@ add_point(double x, double y, pGEDevDesc dd)
7979
}
8080
/* ignore identical points */
8181
if (npoints > 0 && xpoints[npoints-1] == x && ypoints[npoints-1] == y)
82-
return TRUE;
82+
return;
8383
/*
8484
* Convert back from 1200ppi to DEVICE coordinates
8585
*/
8686
xpoints[npoints] = toDeviceX(x / 1200, GE_INCHES, dd);
8787
ypoints[npoints] = toDeviceY(y / 1200, GE_INCHES, dd);
8888
npoints = npoints + 1;
89-
return TRUE;
89+
return;
9090
}
9191

9292
/*
@@ -451,9 +451,10 @@ spline_last_segment_computing(double step, int k,
451451
step = step_computing(K, PX, PY, S1, S2, PREC, dd); \
452452
spline_segment_computing(step, K, PX, PY, S1, S2, dd)
453453

454-
static Rboolean
454+
455+
static void // always returned true., return value ignored in engine.c
455456
compute_open_spline(int n, double *x, double *y, double *s,
456-
Rboolean repEnds,
457+
bool repEnds,
457458
double precision,
458459
pGEDevDesc dd)
459460
{
@@ -511,10 +512,10 @@ compute_open_spline(int n, double *x, double *y, double *s,
511512
spline_last_segment_computing(step, n - 4, px, py, ps[1], ps[2], dd);
512513
}
513514

514-
return TRUE;
515+
return;
515516
}
516517

517-
static Rboolean
518+
static void // always returned true, return value ignored in engine.c
518519
compute_closed_spline(int n, double *x, double *y, double *s,
519520
double precision,
520521
pGEDevDesc dd)
@@ -540,5 +541,5 @@ compute_closed_spline(int n, double *x, double *y, double *s,
540541
NEXT_CONTROL_POINTS(k, n);
541542
}
542543

543-
return TRUE;
544+
return;
544545
}

0 commit comments

Comments
 (0)