summaryrefslogtreecommitdiffstats
path: root/roff.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-05-14 16:06:08 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-05-14 16:06:08 +0000
commit060aa662da1355a03d3193d7e0dcd9b0bbc33ccc (patch)
treeca1f2c782e5a1569bba81bda878c94b56f4a3b58 /roff.c
parente0e21a567e51c014b019aee34241e8ae82a2eaca (diff)
downloadmandoc-060aa662da1355a03d3193d7e0dcd9b0bbc33ccc.tar.gz
Move roff.c's strtol into libmandoc.h for use by other parts of the code
(which will come).
Diffstat (limited to 'roff.c')
-rw-r--r--roff.c32
1 files changed, 5 insertions, 27 deletions
diff --git a/roff.c b/roff.c
index 6c6f6e7d..2cc50e9f 100644
--- a/roff.c
+++ b/roff.c
@@ -20,12 +20,9 @@
#endif
#include <assert.h>
-#include <errno.h>
#include <ctype.h>
-#include <limits.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
#include "mandoc.h"
#include "libroff.h"
@@ -206,7 +203,6 @@ static void roffnode_push(struct roff *, enum rofft,
const char *, int, int);
static void roffnode_pop(struct roff *);
static enum rofft roff_parse(struct roff *, const char *, int *);
-static int roff_parse_nat(const char *, unsigned int *);
/* See roff_hash_find() */
#define ROFF_HASH(p) (p[0] - ASCII_LO)
@@ -593,27 +589,6 @@ roff_parse(struct roff *r, const char *buf, int *pos)
return(t);
}
-
-static int
-roff_parse_nat(const char *buf, unsigned int *res)
-{
- char *ep;
- long lval;
-
- errno = 0;
- lval = strtol(buf, &ep, 10);
- if (buf[0] == '\0' || *ep != '\0')
- return(0);
- if ((errno == ERANGE &&
- (lval == LONG_MAX || lval == LONG_MIN)) ||
- (lval > INT_MAX || lval < 0))
- return(0);
-
- *res = (unsigned int)lval;
- return(1);
-}
-
-
/* ARGSUSED */
static enum rofferr
roff_cblock(ROFF_ARGS)
@@ -1090,6 +1065,7 @@ roff_nr(ROFF_ARGS)
{
const char *key;
char *val;
+ int iv;
struct reg *rg;
val = *bufp + pos;
@@ -1098,8 +1074,10 @@ roff_nr(ROFF_ARGS)
if (0 == strcmp(key, "nS")) {
rg[(int)REG_nS].set = 1;
- if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u))
- rg[(int)REG_nS].v.u = 0;
+ if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)
+ rg[REG_nS].v.u = (unsigned)iv;
+ else
+ rg[(int)REG_nS].v.u = 0u;
}
return(ROFF_IGN);