From 388412f98c61fff9a6aaae8fd9291bc9d2f38477 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 20 Mar 2015 12:54:22 +0000 Subject: Simplify by almost halving the number of macro flags: 1. MAN_EXPLICIT was used iff fp == blk_exp, so just test fp. 2. MAN_FSCOPED was used only for TP, so just test for TP. 3. MAN_NOCLOSE was completely unused. No functional change. --- libman.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'libman.h') diff --git a/libman.h b/libman.h index 8d115b3a..e55bc89a 100644 --- a/libman.h +++ b/libman.h @@ -1,7 +1,7 @@ -/* $Id: libman.h,v 1.67 2014/12/28 14:42:27 schwarze Exp $ */ +/* $Id: libman.h,v 1.68 2015/03/20 12:54:22 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2014 Ingo Schwarze + * Copyright (c) 2014, 2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -47,13 +47,10 @@ struct man { struct man_macro { void (*fp)(MACRO_PROT_ARGS); int flags; -#define MAN_SCOPED (1 << 0) -#define MAN_EXPLICIT (1 << 1) /* See blk_imp(). */ -#define MAN_FSCOPED (1 << 2) /* See blk_imp(). */ -#define MAN_NSCOPED (1 << 3) /* See in_line_eoln(). */ -#define MAN_NOCLOSE (1 << 4) /* See blk_exp(). */ -#define MAN_BSCOPE (1 << 5) /* Break BLINE scope. */ -#define MAN_JOIN (1 << 6) /* Join arguments together. */ +#define MAN_SCOPED (1 << 0) /* Optional next-line scope. */ +#define MAN_NSCOPED (1 << 1) /* Allowed in next-line element scope. */ +#define MAN_BSCOPE (1 << 2) /* Break next-line block scope. */ +#define MAN_JOIN (1 << 3) /* Join arguments together. */ }; extern const struct man_macro *const man_macros; -- cgit v1.2.3