Do not cast void pointers to pointers requiring alignment.

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index f67ef4cdb2ed69c8d58ab0a5c1753321ab70d51c..4bc5128204f636e911d14c151bc7c84cef510c80 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,6 @@
-/*     $Id: libman.h,v 1.49 2011/03/23 12:33:01 kristaps Exp $ */
+/*     $Id: libman.h,v 1.55 2011/11/07 01:24:40 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -36,7 +36,7 @@ struct        man {
        struct man_node *last; /* the last parsed node */
        struct man_node *first; /* the first parsed node */
        struct man_meta  meta; /* document meta-data */
        struct man_node *last; /* the last parsed node */
        struct man_node *first; /* the first parsed node */
        struct man_meta  meta; /* document meta-data */

-       struct regset   *regs; /* registers */
+       struct roff     *roff;

 };
 
 #define        MACRO_PROT_ARGS   struct man *m, \
 };
 
 #define        MACRO_PROT_ARGS   struct man *m, \


@@ -54,6 +54,7 @@ struct        man_macro {
 #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_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. */

 };
 
 extern const struct man_macro *const man_macros;
 };
 
 extern const struct man_macro *const man_macros;


@@ -72,13 +73,8 @@ int            man_body_alloc(struct man *, int, int, enum mant);
 int              man_elem_alloc(struct man *, int, int, enum mant);
 void             man_node_delete(struct man *, struct man_node *);
 void             man_hash_init(void);
 int              man_elem_alloc(struct man *, int, int, enum mant);
 void             man_node_delete(struct man *, struct man_node *);
 void             man_hash_init(void);

-enum   mant      man_hash_find(const char *);
+enum mant        man_hash_find(const char *);

 int              man_macroend(struct man *);
 int              man_macroend(struct man *);

-int              man_args(struct man *, int, int *, char *, char **);
-#define        ARGS_ERROR      (-1)
-#define        ARGS_EOLN       (0)
-#define        ARGS_WORD       (1)
-#define        ARGS_QWORD      (1)

 int              man_valid_post(struct man *);
 int              man_valid_pre(struct man *, struct man_node *);
 int              man_unscope(struct man *, 
 int              man_valid_post(struct man *);
 int              man_valid_pre(struct man *, struct man_node *);
 int              man_unscope(struct man *,