From 6cee093f50dd39b838bed35cea223b8d4a610f06 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 9 Jul 2014 11:31:43 +0000 Subject: mark defos as const; nobody needs to change it, and it is occasionally useful to be able to pass literal strings --- libmandoc.h | 5 +++-- libmdoc.h | 4 ++-- mandoc.h | 5 +++-- mdoc.c | 4 ++-- read.c | 6 +++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libmandoc.h b/libmandoc.h index a05e709c..1011cc50 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -1,4 +1,4 @@ -/* $Id: libmandoc.h,v 1.41 2014/04/20 16:46:04 schwarze Exp $ */ +/* $Id: libmandoc.h,v 1.42 2014/07/09 11:31:43 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons * Copyright (c) 2013, 2014 Ingo Schwarze @@ -50,7 +50,8 @@ int mandoc_strntoi(const char *, size_t, int); const char *mandoc_a2msec(const char*); void mdoc_free(struct mdoc *); -struct mdoc *mdoc_alloc(struct roff *, struct mparse *, char *, int); +struct mdoc *mdoc_alloc(struct roff *, struct mparse *, + const char *, int); void mdoc_reset(struct mdoc *); int mdoc_parseln(struct mdoc *, int, char *, int); int mdoc_endparse(struct mdoc *); diff --git a/libmdoc.h b/libmdoc.h index f5b7d7f2..8b9b8dec 100644 --- a/libmdoc.h +++ b/libmdoc.h @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.85 2014/07/02 03:48:07 schwarze Exp $ */ +/* $Id: libmdoc.h,v 1.86 2014/07/09 11:31:43 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2013 Ingo Schwarze @@ -25,7 +25,7 @@ enum mdoc_next { struct mdoc { struct mparse *parse; /* parse pointer */ - char *defos; /* default argument for .Os */ + const char *defos; /* default argument for .Os */ int quick; /* abort parse early */ int flags; /* parse flags */ #define MDOC_HALT (1 << 0) /* error in parse: halt */ diff --git a/mandoc.h b/mandoc.h index daff0b27..d0793bda 100644 --- a/mandoc.h +++ b/mandoc.h @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.141 2014/07/07 21:36:20 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.142 2014/07/09 11:31:43 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2014 Ingo Schwarze @@ -419,7 +419,8 @@ int mchars_spec2cp(const struct mchars *, const char *, size_t); const char *mchars_spec2str(const struct mchars *, const char *, size_t, size_t *); -struct mparse *mparse_alloc(int, enum mandoclevel, mandocmsg, char *); +struct mparse *mparse_alloc(int, enum mandoclevel, mandocmsg, + const char *); void mparse_free(struct mparse *); void mparse_keep(struct mparse *); enum mandoclevel mparse_readfd(struct mparse *, int, const char *); diff --git a/mdoc.c b/mdoc.c index bdff8e18..159d4a02 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.219 2014/07/07 15:03:43 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.220 2014/07/09 11:31:43 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze @@ -189,7 +189,7 @@ mdoc_free(struct mdoc *mdoc) */ struct mdoc * mdoc_alloc(struct roff *roff, struct mparse *parse, - char *defos, int quick) + const char *defos, int quick) { struct mdoc *p; diff --git a/read.c b/read.c index 442d6343..537af183 100644 --- a/read.c +++ b/read.c @@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.68 2014/07/07 21:36:20 schwarze Exp $ */ +/* $Id: read.c,v 1.69 2014/07/09 11:31:43 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2014 Ingo Schwarze @@ -65,7 +65,7 @@ struct mparse { mandocmsg mmsg; /* warning/error message handler */ const char *file; struct buf *secondary; - char *defos; /* default operating system */ + const char *defos; /* default operating system */ }; static void resize_buf(struct buf *, size_t); @@ -781,7 +781,7 @@ out: struct mparse * mparse_alloc(int options, enum mandoclevel wlevel, - mandocmsg mmsg, char *defos) + mandocmsg mmsg, const char *defos) { struct mparse *curp; -- cgit v1.2.3-56-ge451