From d05ebf8bed8ac45b50263c85ce1c0d2327d66d55 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 9 Mar 2020 01:58:39 -0700
Subject: token: Rename some functions

---
 cc.h    | 4 ++--
 main.c  | 2 +-
 pp.c    | 4 ++--
 token.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cc.h b/cc.h
index 3e6eecf..96dde5e 100644
--- a/cc.h
+++ b/cc.h
@@ -370,8 +370,8 @@ struct init {
 extern struct token tok;
 extern const char *tokstr[];
 
-void tokprint(const struct token *);
-void tokdesc(char *, size_t, enum tokenkind, const char *);
+void tokenprint(const struct token *);
+void tokendesc(char *, size_t, enum tokenkind, const char *);
 _Noreturn void error(const struct location *, const char *, ...);
 
 /* scan */
diff --git a/main.c b/main.c
index 2cf5bcb..a147c28 100644
--- a/main.c
+++ b/main.c
@@ -51,7 +51,7 @@ main(int argc, char *argv[])
 	ppinit();
 	if (pponly) {
 		while (tok.kind != TEOF) {
-			tokprint(&tok);
+			tokenprint(&tok);
 			next();
 		}
 	} else {
diff --git a/pp.c b/pp.c
index a92ee26..e62845f 100644
--- a/pp.c
+++ b/pp.c
@@ -136,8 +136,8 @@ expect(enum tokenkind kind, const char *msg)
 	char *lit, want[64], got[64];
 
 	if (tok.kind != kind) {
-		tokdesc(want, sizeof(want), kind, NULL);
-		tokdesc(got, sizeof(got), tok.kind, tok.lit);
+		tokendesc(want, sizeof(want), kind, NULL);
+		tokendesc(got, sizeof(got), tok.kind, tok.lit);
 		error(&tok.loc, "expected %s %s, saw %s", want, msg, got);
 	}
 	lit = tok.lit;
diff --git a/token.c b/token.c
index da5d597..2397756 100644
--- a/token.c
+++ b/token.c
@@ -112,7 +112,7 @@ const char *tokstr[] = {
 };
 
 void
-tokprint(const struct token *t)
+tokenprint(const struct token *t)
 {
 	const char *str;
 
@@ -137,7 +137,7 @@ tokprint(const struct token *t)
 }
 
 void
-tokdesc(char *buf, size_t len, enum tokenkind kind, const char *lit)
+tokendesc(char *buf, size_t len, enum tokenkind kind, const char *lit)
 {
 	const char *class;
 	bool quote;
-- 
cgit v1.2.3