yaid.8.in: Fix formatting.

[yaid] / yaid.h

diff --git a/yaid.h b/yaid.h
index 4011787..a91ea27 100644 (file)
--- a/yaid.h
+++ b/yaid.h
@@ -195,12 +195,12 @@ extern void dputsock(dstr */*d*/, const struct addrops */*ao*/,
 enum { L, R, NDIR };
 
 /* Response types, and the data needed to represent any associated data.  A
- * U(MEMB, TYPE) constructs a union member; an N means no associated data.
+ * U_(MEMB, TYPE) constructs a union member; an N_ means no associated data.
  */
 #define RESPONSE(_)                                                    \
-  _(ERROR, U(error, unsigned))                                         \
-  _(UID, U(uid, uid_t))                                                        \
-  _(NAT, U(nat, struct socket))
+  _(ERROR, U_(error, unsigned))                                                \
+  _(UID, U_(uid, uid_t))                                               \
+  _(NAT, U_(nat, struct socket))
 
 enum {
 #define DEFENUM(what, branch) R_##what,
@@ -234,11 +234,11 @@ struct query {
   unsigned resp;                       /* Our response type */
   union {                              /* A union of response data */
 #define DEFBRANCH(WHAT, branch) branch
-#define U(memb, ty) ty memb;
-#define N
+#define U_(memb, ty) ty memb;
+#define N_
     RESPONSE(DEFBRANCH)
-#undef U
-#undef N
+#undef U_
+#undef N_
 #undef DEFBRANCH
   } u;
 } query;
@@ -330,8 +330,8 @@ extern int match_policy(const struct policy */*p*/,
 enum {
   T_OK,                                        /* Successful: results returned */
   T_EOL,                               /* End-of-line found immediately */
-  T_EOF,                               /* End-of-file found immediately */
-  T_ERROR                              /* Some kind of error occurred */
+  T_ERROR,                             /* Some kind of error occurred */
+  T_EOF                                        /* End-of-file found immediately */
 };
 
 /* A context for parsing a policy file. */
@@ -349,7 +349,9 @@ struct policy_file {
  * formatting error messages for the log.
  */
 extern int open_policy_file(struct policy_file */*pf*/, const char */*name*/,
-                           const char */*what*/, const struct query */*q*/);
+                           const char */*what*/, const struct query */*q*/,
+                           unsigned /*f*/);
+#define OPF_NOENTOK 1u                 /* Don't complain if file missing */
 
 /* Read a policy rule from the file, storing it in PF->p.  Return one of the
  * T_* codes.