summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-03-03 13:55:31 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-03-03 13:55:31 +0000
commitfedafaaae16f368355e7387e9b586c527c7b0109 (patch)
tree06189b06e3f6c87e55dd9989755c28716ae6b6bb
parent1ad6f6e0ee89c526a785591e3e32ee04aed82f7b (diff)
downloadmandoc-fedafaaae16f368355e7387e9b586c527c7b0109.tar.gz
remove a few redundant conditions that jsg@ found with cppcheck
-rw-r--r--man.c2
-rw-r--r--mdoc.c2
-rw-r--r--mdoc_html.c2
-rw-r--r--roff.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/man.c b/man.c
index e05204ff..905b99a1 100644
--- a/man.c
+++ b/man.c
@@ -203,7 +203,7 @@ man_pmacro(struct roff_man *man, int ln, char *buf, int offs)
/* Jump to the next non-whitespace word. */
- while (buf[offs] && buf[offs] == ' ')
+ while (buf[offs] == ' ')
offs++;
/*
diff --git a/mdoc.c b/mdoc.c
index d8cdd103..ae1d53a9 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -382,7 +382,7 @@ mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)
/* Jump to the next non-whitespace word. */
- while (buf[offs] && ' ' == buf[offs])
+ while (buf[offs] == ' ')
offs++;
/*
diff --git a/mdoc_html.c b/mdoc_html.c
index 1a9b9d84..306ba0a3 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -666,7 +666,7 @@ mdoc_it_pre(MDOC_ARGS)
enum mdoc_list type;
bl = n->parent;
- while (bl != NULL && bl->tok != MDOC_Bl)
+ while (bl->tok != MDOC_Bl)
bl = bl->parent;
type = bl->norm->Bl.type;
diff --git a/roff.c b/roff.c
index 5792eb86..c8f17532 100644
--- a/roff.c
+++ b/roff.c
@@ -1608,7 +1608,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
return ROFF_IGN;
while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
pos++;
- while (buf->buf[pos] != '\0' && buf->buf[pos] == ' ')
+ while (buf->buf[pos] == ' ')
pos++;
return tbl_read(r->tbl, ln, buf->buf, pos);
}