summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipsk/papersiz.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-28 18:14:06 +0000
committerKarl Berry <karl@freefriends.org>2010-03-28 18:14:06 +0000
commit20a73306c88f8fdb131482213e9b1b6a8c5e729b (patch)
treebe5857d40602520beebe30c48e31306bbc0e9d17 /Build/source/texk/dvipsk/papersiz.c
parent549a764cf19a1f244d773ab70965eadeef67d5a8 (diff)
eliminate spaces before semicolons
git-svn-id: svn://tug.org/texlive/trunk@17592 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipsk/papersiz.c')
-rw-r--r--Build/source/texk/dvipsk/papersiz.c106
1 files changed, 53 insertions, 53 deletions
diff --git a/Build/source/texk/dvipsk/papersiz.c b/Build/source/texk/dvipsk/papersiz.c
index 19304d5ab55..31143579aaa 100644
--- a/Build/source/texk/dvipsk/papersiz.c
+++ b/Build/source/texk/dvipsk/papersiz.c
@@ -19,14 +19,14 @@
static long
scale(long whole, long num, long den, long sf)
{
- long v ;
+ long v;
- v = whole * sf + num * (sf / den) ;
+ v = whole * sf + num * (sf / den);
if (v / sf != whole || v < 0 || v > 0x40000000L)
- error("! arithmetic overflow in parameter") ;
- sf = sf % den ;
- v += (sf * num * 2 + den) / (2 * den) ;
- return(v) ;
+ error("! arithmetic overflow in parameter");
+ sf = sf % den;
+ v += (sf * num * 2 + den) / (2 * den);
+ return(v);
}
/*
* Convert a sequence of digits into a long; return -1 if no digits.
@@ -35,28 +35,28 @@ scale(long whole, long num, long den, long sf)
static long
myatol(char **s)
{
- register char *p ;
- register long result ;
+ register char *p;
+ register long result;
- result = 0 ;
- p = *s ;
+ result = 0;
+ p = *s;
while ('0' <= *p && *p <= '9') {
if (result > 100000000)
- error("! arithmetic overflow in parameter") ;
- result = 10 * result + *p++ - '0' ;
+ error("! arithmetic overflow in parameter");
+ result = 10 * result + *p++ - '0';
}
if (p == *s && *p == '.') {
return 0;
} else if (p == *s) {
#ifdef KPATHSEA
- error(concat3 ("expected number in ", *s, ", returning 10")) ;
+ error(concat3 ("expected number in ", *s, ", returning 10"));
#else
- error("expected number! returning 10") ;
+ error("expected number! returning 10");
#endif
- return 10 ;
+ return 10;
} else {
- *s = p ;
- return(result) ;
+ *s = p;
+ return(result);
}
}
/*
@@ -64,60 +64,60 @@ myatol(char **s)
* defaults. Returns a value in scaled points.
*/
static long scalevals[] = { 1864680L, 65536L, 786432L, 186468L,
- 1L, 65782L, 70124L, 841489L, 4736286L } ;
-static const char *scalenames = "cmptpcmmspbpddccin" ;
+ 1L, 65782L, 70124L, 841489L, 4736286L };
+static const char *scalenames = "cmptpcmmspbpddccin";
long
myatodim(char **s)
{
- register long w, num, den, sc ;
- register const char *q ;
- char *p ;
- int negative = 0, i ;
+ register long w, num, den, sc;
+ register const char *q;
+ char *p;
+ int negative = 0, i;
- p = *s ;
+ p = *s;
if (**s == '-') {
- p++ ;
- negative = 1 ;
+ p++;
+ negative = 1;
}
- w = myatol(&p) ;
+ w = myatol(&p);
if (w < 0) {
- error("number too large; 1000 used") ;
- w = 1000 ;
+ error("number too large; 1000 used");
+ w = 1000;
}
- num = 0 ;
- den = 1 ;
+ num = 0;
+ den = 1;
if (*p == '.') {
- p++ ;
+ p++;
while ('0' <= *p && *p <= '9') {
if (den <= 1000) {
- den *= 10 ;
- num = num * 10 + *p - '0' ;
+ den *= 10;
+ num = num * 10 + *p - '0';
} else if (den == 10000) {
- den *= 2 ;
- num = num * 2 + (*p - '0') / 5 ;
+ den *= 2;
+ num = num * 2 + (*p - '0') / 5;
}
- p++ ;
+ p++;
}
}
while (*p == ' ')
- p++ ;
- for (i=0, q=scalenames; ; i++, q += 2)
+ p++;
+ for (i=0, q=scalenames;; i++, q += 2)
if (*q == 0) {
#ifdef KPATHSEA
- error(concat3 ("expected units in ", *s, ", assuming inches.")) ;
+ error(concat3 ("expected units in ", *s, ", assuming inches."));
#else
- error("expected units! assuming inches.") ;
+ error("expected units! assuming inches.");
#endif
- sc = scalevals[8] ;
- break ;
+ sc = scalevals[8];
+ break;
} else if (*p == *q && p[1] == q[1]) {
- sc = scalevals[i] ;
- p += 2 ;
- break ;
+ sc = scalevals[i];
+ p += 2;
+ break;
}
- w = scale(w, num, den, sc) ;
- *s = p ;
- return(negative?-w:w) ;
+ w = scale(w, num, den, sc);
+ *s = p;
+ return(negative?-w:w);
}
/*
* The routine where we handle the paper size special. We need to pass in
@@ -127,9 +127,9 @@ void
handlepapersize(char *p, integer *x, integer *y)
{
while (*p == ' ')
- p++ ;
- *x = myatodim(&p) ;
+ p++;
+ *x = myatodim(&p);
while (*p == ' ' || *p == ',')
- p++ ;
- *y = myatodim(&p) ;
+ p++;
+ *y = myatodim(&p);
}