Imported Upstream version 1.8.7

[debian/sudo] / plugins / sudoers / toke.h

diff --git a/plugins/sudoers/toke.h b/plugins/sudoers/toke.h
index 5e2a24a9033e6ab0c83c1c36f7a57d3470c3a9b4..002f8fbd6d7feef7b7b22b9e509f5846654d1e5f 100644 (file)
--- a/plugins/sudoers/toke.h
+++ b/plugins/sudoers/toke.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2011-2013 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,15 +14,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SUDO_TOKE_H
-#define _SUDO_TOKE_H
+#ifndef _SUDOERS_TOKE_H
+#define _SUDOERS_TOKE_H
 
-int append(const char *, int);
-int fill_args(const char *, int, int);
-int fill_cmnd(const char *, int);
-int fill_txt(const char *, int, int);
-int ipv6_valid(const char *s);
-void yyerror(const char *);
+bool append(const char *, int);
+bool fill_args(const char *, int, int);
+bool fill_cmnd(const char *, int);
+bool fill_txt(const char *, int, int);
+bool ipv6_valid(const char *s);
+int sudoers_trace_print(const char *msg);
+void sudoerserror(const char *);
 
 #ifndef FLEX_SCANNER
 extern int (*trace_print)(const char *msg);
@@ -33,9 +34,9 @@ extern int (*trace_print)(const char *msg);
 /* realloc() to size + COMMANDARGINC to make room for command args */
 #define COMMANDARGINC   64
 
-#define LEXTRACE(msg)   do { \
-    if (trace_print != NULL) \
-        (*trace_print)(msg); \
+#define LEXTRACE(msg)   do {                                           \
+    if (trace_print != NULL)                                           \
+       (*trace_print)(msg);                                            \
 } while (0);
 
-#endif /* _SUDO_TOKE_H */
+#endif /* _SUDOERS_TOKE_H */