* mandoc: Drop the "struct roff" argument from three parsing utility
@ 2025-01-04 17:01 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2025-01-04 17:01 UTC (permalink / raw)
To: source
Log Message:
-----------
Drop the "struct roff" argument from three parsing utility functions
that do not use it. No functional change.
Modified Files:
--------------
mandoc:
roff.c
Revision Data
-------------
Index: roff.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/roff.c,v
diff -Lroff.c -Lroff.c -u -p -r1.401 -r1.402
--- roff.c
+++ roff.c
@@ -192,10 +192,8 @@ static int roff_ec(ROFF_ARGS);
static int roff_eo(ROFF_ARGS);
static int roff_eqndelim(struct roff *, struct buf *, int);
static int roff_evalcond(struct roff *, int, char *, int *);
-static int roff_evalnum(struct roff *, int,
- const char *, int *, int *, int);
-static int roff_evalpar(struct roff *, int,
- const char *, int *, int *, int);
+static int roff_evalnum(int, const char *, int *, int *, int);
+static int roff_evalpar(int, const char *, int *, int *, int);
static int roff_evalstrcond(const char *, int *);
static int roff_expand(struct roff *, struct buf *,
int, int, char);
@@ -204,7 +202,7 @@ static void roff_expand_patch(struct b
static void roff_free1(struct roff *);
static void roff_freereg(struct roffreg *);
static void roff_freestr(struct roffkv *);
-static size_t roff_getname(struct roff *, char **, int, int);
+static size_t roff_getname(char **, int, int);
static int roff_getnum(const char *, int *, int *, int);
static int roff_getop(const char *, int *, char *);
static int roff_getregn(struct roff *,
@@ -1529,7 +1527,7 @@ roff_expand(struct roff *r, struct buf *
case 'B':
npos = 0;
ubuf[0] = iendarg > iarg && iend > iendarg &&
- roff_evalnum(r, ln, buf->buf + iarg, &npos,
+ roff_evalnum(ln, buf->buf + iarg, &npos,
NULL, ROFFNUM_SCALE) &&
npos == iendarg - iarg ? '1' : '0';
ubuf[1] = '\0';
@@ -2002,7 +2000,7 @@ roff_parse(struct roff *r, char *buf, in
return TOKEN_NONE;
mac = cp;
- maclen = roff_getname(r, &cp, ln, ppos);
+ maclen = roff_getname(&cp, ln, ppos);
deftype = ROFFDEF_USER | ROFFDEF_REN;
r->current_string = roff_getstrn(r, mac, maclen, &deftype);
@@ -2155,7 +2153,7 @@ roff_block(ROFF_ARGS)
namesz = 0;
} else {
iname = cp;
- namesz = roff_getname(r, &cp, ln, ppos);
+ namesz = roff_getname(&cp, ln, ppos);
iname[namesz] = '\0';
}
@@ -2226,7 +2224,7 @@ roff_block(ROFF_ARGS)
/* Get the custom end marker. */
iname = cp;
- namesz = roff_getname(r, &cp, ln, ppos);
+ namesz = roff_getname(&cp, ln, ppos);
/* Resolve the end marker if it is indirect. */
@@ -2616,7 +2614,7 @@ roff_evalcond(struct roff *r, int ln, ch
while (*cp == ' ')
cp++;
name = cp;
- sz = roff_getname(r, &cp, ln, cp - v);
+ sz = roff_getname(&cp, ln, cp - v);
if (sz == 0)
istrue = 0;
else if (v[*pos] == 'r')
@@ -2633,7 +2631,7 @@ roff_evalcond(struct roff *r, int ln, ch
}
savepos = *pos;
- if (roff_evalnum(r, ln, v, pos, &number, ROFFNUM_SCALE))
+ if (roff_evalnum(ln, v, pos, &number, ROFFNUM_SCALE))
return (number > 0) == wanttrue;
else if (*pos == savepos)
return roff_evalstrcond(v, pos) == wanttrue;
@@ -2771,7 +2769,7 @@ roff_ds(ROFF_ARGS)
if (*name == '\0')
return ROFF_IGN;
- namesz = roff_getname(r, &string, ln, pos);
+ namesz = roff_getname(&string, ln, pos);
switch (name[namesz]) {
case '\\':
return ROFF_IGN;
@@ -2862,15 +2860,14 @@ roff_getop(const char *v, int *pos, char
* or a single signed integer number.
*/
static int
-roff_evalpar(struct roff *r, int ln,
- const char *v, int *pos, int *res, int flags)
+roff_evalpar(int ln, const char *v, int *pos, int *res, int flags)
{
if ('(' != v[*pos])
return roff_getnum(v, pos, res, flags);
(*pos)++;
- if ( ! roff_evalnum(r, ln, v, pos, res, flags | ROFFNUM_WHITE))
+ if ( ! roff_evalnum(ln, v, pos, res, flags | ROFFNUM_WHITE))
return 0;
/*
@@ -2892,8 +2889,7 @@ roff_evalpar(struct roff *r, int ln,
* Proceed left to right, there is no concept of precedence.
*/
static int
-roff_evalnum(struct roff *r, int ln, const char *v,
- int *pos, int *res, int flags)
+roff_evalnum(int ln, const char *v, int *pos, int *res, int flags)
{
int mypos, operand2;
char operator;
@@ -2907,7 +2903,7 @@ roff_evalnum(struct roff *r, int ln, con
while (isspace((unsigned char)v[*pos]))
(*pos)++;
- if ( ! roff_evalpar(r, ln, v, pos, res, flags))
+ if ( ! roff_evalpar(ln, v, pos, res, flags))
return 0;
while (1) {
@@ -2922,7 +2918,7 @@ roff_evalnum(struct roff *r, int ln, con
while (isspace((unsigned char)v[*pos]))
(*pos)++;
- if ( ! roff_evalpar(r, ln, v, pos, &operand2, flags))
+ if ( ! roff_evalpar(ln, v, pos, &operand2, flags))
return 0;
if (flags & ROFFNUM_WHITE)
@@ -3157,7 +3153,7 @@ roff_nr(ROFF_ARGS)
if (*key == '\0')
return ROFF_IGN;
- keysz = roff_getname(r, &val, ln, pos);
+ keysz = roff_getname(&val, ln, pos);
if (key[keysz] == '\\' || key[keysz] == '\t')
return ROFF_IGN;
@@ -3166,13 +3162,13 @@ roff_nr(ROFF_ARGS)
val++;
len = 0;
- if (roff_evalnum(r, ln, val, &len, &iv, ROFFNUM_SCALE) == 0)
+ if (roff_evalnum(ln, val, &len, &iv, ROFFNUM_SCALE) == 0)
return ROFF_IGN;
step = val + len;
while (isspace((unsigned char)*step))
step++;
- if (roff_evalnum(r, ln, step, NULL, &is, 0) == 0)
+ if (roff_evalnum(ln, step, NULL, &is, 0) == 0)
is = INT_MIN;
roff_setregn(r, key, keysz, iv, sign, is);
@@ -3189,7 +3185,7 @@ roff_rr(ROFF_ARGS)
name = cp = buf->buf + pos;
if (*name == '\0')
return ROFF_IGN;
- namesz = roff_getname(r, &cp, ln, pos);
+ namesz = roff_getname(&cp, ln, pos);
name[namesz] = '\0';
prev = &r->regtab;
@@ -3219,7 +3215,7 @@ roff_rm(ROFF_ARGS)
cp = buf->buf + pos;
while (*cp != '\0') {
name = cp;
- namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));
+ namesz = roff_getname(&cp, ln, (int)(cp - buf->buf));
roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);
if (name[namesz] == '\\' || name[namesz] == '\t')
@@ -3235,7 +3231,7 @@ roff_it(ROFF_ARGS)
/* Parse the number of lines. */
- if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {
+ if ( ! roff_evalnum(ln, buf->buf, &pos, &iv, 0)) {
mandoc_msg(MANDOCERR_IT_NONUM,
ln, ppos, "%s", buf->buf + 1);
return ROFF_IGN;
@@ -3502,7 +3498,7 @@ roff_onearg(ROFF_ARGS)
r->man->last->flags |= NODE_NOSRC;
}
npos = 0;
- if (roff_evalnum(r, ln, r->man->last->string, &npos,
+ if (roff_evalnum(ln, r->man->last->string, &npos,
&roffce_lines, 0) == 0) {
mandoc_msg(MANDOCERR_CE_NONUM,
ln, pos, "ce %s", buf->buf + pos);
@@ -3556,12 +3552,12 @@ roff_als(ROFF_ARGS)
if (*newn == '\0')
return ROFF_IGN;
- newsz = roff_getname(r, &oldn, ln, pos);
+ newsz = roff_getname(&oldn, ln, pos);
if (newn[newsz] == '\\' || newn[newsz] == '\t' || *oldn == '\0')
return ROFF_IGN;
end = oldn;
- oldsz = roff_getname(r, &end, ln, oldn - buf->buf);
+ oldsz = roff_getname(&end, ln, oldn - buf->buf);
if (oldsz == 0)
return ROFF_IGN;
@@ -3838,12 +3834,12 @@ roff_rn(ROFF_ARGS)
if (*oldn == '\0')
return ROFF_IGN;
- oldsz = roff_getname(r, &newn, ln, pos);
+ oldsz = roff_getname(&newn, ln, pos);
if (oldn[oldsz] == '\\' || oldn[oldsz] == '\t' || *newn == '\0')
return ROFF_IGN;
end = newn;
- newsz = roff_getname(r, &end, ln, newn - buf->buf);
+ newsz = roff_getname(&end, ln, newn - buf->buf);
if (newsz == 0)
return ROFF_IGN;
@@ -3885,7 +3881,7 @@ roff_shift(ROFF_ARGS)
argpos = pos;
levels = 1;
if (buf->buf[pos] != '\0' &&
- roff_evalnum(r, ln, buf->buf, &pos, &levels, 0) == 0) {
+ roff_evalnum(ln, buf->buf, &pos, &levels, 0) == 0) {
mandoc_msg(MANDOCERR_CE_NONUM,
ln, pos, "shift %s", buf->buf + pos);
levels = 1;
@@ -4028,7 +4024,7 @@ roff_renamed(ROFF_ARGS)
* and advance the pointer to the next word.
*/
static size_t
-roff_getname(struct roff *r, char **cpp, int ln, int pos)
+roff_getname(char **cpp, int ln, int pos)
{
char *name, *cp;
int namesz, inam, iend;
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-01-04 17:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-04 17:01 mandoc: Drop the "struct roff" argument from three parsing utility schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).