From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: More cleanup: Consistently use the name "struct tbl_node *tbl"
Date: Fri, 31 May 2013 18:08:09 -0400 (EDT) [thread overview]
Message-ID: <201305312208.r4VM89EB029868@krisdoz.my.domain> (raw)
Log Message:
-----------
More cleanup: Consistently use the name "struct tbl_node *tbl"
that is already used almost everywhere instead of gratuitiously
inventing different names at four places. No functional change.
Modified Files:
--------------
mdocml:
roff.c
tbl.c
Revision Data
-------------
Index: tbl.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/tbl.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -Ltbl.c -Ltbl.c -u -p -r1.26 -r1.27
--- tbl.c
+++ tbl.c
@@ -72,21 +72,21 @@ tbl_read(struct tbl_node *tbl, int ln, c
struct tbl_node *
tbl_alloc(int pos, int line, struct mparse *parse)
{
- struct tbl_node *p;
+ struct tbl_node *tbl;
- p = mandoc_calloc(1, sizeof(struct tbl_node));
- p->line = line;
- p->pos = pos;
- p->parse = parse;
- p->part = TBL_PART_OPTS;
- p->opts.tab = '\t';
- p->opts.linesize = 12;
- p->opts.decimal = '.';
- return(p);
+ tbl = mandoc_calloc(1, sizeof(struct tbl_node));
+ tbl->line = line;
+ tbl->pos = pos;
+ tbl->parse = parse;
+ tbl->part = TBL_PART_OPTS;
+ tbl->opts.tab = '\t';
+ tbl->opts.linesize = 12;
+ tbl->opts.decimal = '.';
+ return(tbl);
}
void
-tbl_free(struct tbl_node *p)
+tbl_free(struct tbl_node *tbl)
{
struct tbl_row *rp;
struct tbl_cell *cp;
@@ -94,8 +94,8 @@ tbl_free(struct tbl_node *p)
struct tbl_dat *dp;
struct tbl_head *hp;
- while (NULL != (rp = p->first_row)) {
- p->first_row = rp->next;
+ while (NULL != (rp = tbl->first_row)) {
+ tbl->first_row = rp->next;
while (rp->first) {
cp = rp->first;
rp->first = cp->next;
@@ -104,8 +104,8 @@ tbl_free(struct tbl_node *p)
free(rp);
}
- while (NULL != (sp = p->first_span)) {
- p->first_span = sp->next;
+ while (NULL != (sp = tbl->first_span)) {
+ tbl->first_span = sp->next;
while (sp->first) {
dp = sp->first;
sp->first = dp->next;
@@ -116,12 +116,12 @@ tbl_free(struct tbl_node *p)
free(sp);
}
- while (NULL != (hp = p->first_head)) {
- p->first_head = hp->next;
+ while (NULL != (hp = tbl->first_head)) {
+ tbl->first_head = hp->next;
free(hp);
}
- free(p);
+ free(tbl);
}
void
Index: roff.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/roff.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -Lroff.c -Lroff.c -u -p -r1.175 -r1.176
--- roff.c
+++ roff.c
@@ -393,13 +393,13 @@ roffnode_push(struct roff *r, enum rofft
static void
roff_free1(struct roff *r)
{
- struct tbl_node *t;
+ struct tbl_node *tbl;
struct eqn_node *e;
int i;
- while (NULL != (t = r->first_tbl)) {
- r->first_tbl = t->next;
- tbl_free(t);
+ while (NULL != (tbl = r->first_tbl)) {
+ r->first_tbl = tbl->next;
+ tbl_free(tbl);
}
r->first_tbl = r->last_tbl = r->tbl = NULL;
@@ -1413,21 +1413,21 @@ roff_EN(ROFF_ARGS)
static enum rofferr
roff_TS(ROFF_ARGS)
{
- struct tbl_node *t;
+ struct tbl_node *tbl;
if (r->tbl) {
mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);
tbl_end(&r->tbl);
}
- t = tbl_alloc(ppos, ln, r->parse);
+ tbl = tbl_alloc(ppos, ln, r->parse);
if (r->last_tbl)
- r->last_tbl->next = t;
+ r->last_tbl->next = tbl;
else
- r->first_tbl = r->last_tbl = t;
+ r->first_tbl = r->last_tbl = tbl;
- r->tbl = r->last_tbl = t;
+ r->tbl = r->last_tbl = tbl;
return(ROFF_IGN);
}
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2013-05-31 22:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201305312208.r4VM89EB029868@krisdoz.my.domain \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).