diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2014-12-01 04:14:14 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-12-01 04:14:14 +0000 |
commit | bdec20eae6e2b2f2fa464025170b85076a6ae68f (patch) | |
tree | 04dab8325e4c0f6bdf723e5cc86e8cd70a9dc93c /read.c | |
parent | 62befa7fcd92427df4055e759c9da7358b13ef9e (diff) | |
download | mandoc-bdec20eae6e2b2f2fa464025170b85076a6ae68f.tar.gz mandoc-bdec20eae6e2b2f2fa464025170b85076a6ae68f.tar.zst mandoc-bdec20eae6e2b2f2fa464025170b85076a6ae68f.zip |
The file read.c is part of the parser, so it cannot include main.h,
which is not part of the parser. Besides, the parser *does* modify
the input buffer, so marking it "const" in the mparse_readmem()
interface is an outright lie. Fix all this by killing the const,
the UNCONST, and the bogus inclusion.
Diffstat (limited to 'read.c')
-rw-r--r-- | read.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.103 2014/11/30 05:29:00 schwarze Exp $ */ +/* $Id: read.c,v 1.104 2014/12/01 04:14:14 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -41,7 +41,6 @@ #include "libmandoc.h" #include "mdoc.h" #include "man.h" -#include "main.h" #define REPARSE_LIMIT 1000 @@ -756,12 +755,12 @@ mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file) } enum mandoclevel -mparse_readmem(struct mparse *curp, const void *buf, size_t len, +mparse_readmem(struct mparse *curp, void *buf, size_t len, const char *file) { struct buf blk; - blk.buf = UNCONST(buf); + blk.buf = buf; blk.sz = len; mparse_parse_buffer(curp, blk, file); |