summaryrefslogtreecommitdiffstats
path: root/boggle
diff options
context:
space:
mode:
authorCameron Katri <me@cameronkatri.com>2021-05-05 15:00:19 -0400
committerCameron Katri <me@cameronkatri.com>2021-05-05 15:00:19 -0400
commitdfc80bf956a344dcd185f6db2980af7919c52e0d (patch)
tree21077bdd964c0747b042dc95aa69f70f0719bcf9 /boggle
parent1c75ca2e2dc72d118edbb854455e602d70d80a52 (diff)
downloadbsdgames-darwin-trunk.tar.gz
bsdgames-darwin-trunk.tar.zst
bsdgames-darwin-trunk.zip
Fix merge conflictsHEADtrunk
Diffstat (limited to 'boggle')
-rw-r--r--boggle/boggle/prtable.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/boggle/boggle/prtable.c b/boggle/boggle/prtable.c
index 84421678..67d3484b 100644
--- a/boggle/boggle/prtable.c
+++ b/boggle/boggle/prtable.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prtable.c,v 1.10 2013/10/19 17:23:08 christos Exp $ */
+/* $NetBSD: prtable.c,v 1.11 2021/05/02 12:50:43 rillig Exp $ */
/*-
* Copyright (c) 1993
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: prtable.c,v 1.10 2013/10/19 17:23:08 christos Exp $");
+__RCSID("$NetBSD: prtable.c,v 1.11 2021/05/02 12:50:43 rillig Exp $");
#endif /* not lint */
#include <ncurses.h>
@@ -58,14 +58,14 @@ static int get_maxlen(const char *const [], int, int (*)(const char *const *, in
* width - max line width if not zero
* prentry - address of the routine to call to print the string
* length - address of the routine to call to determine the length
- * of string to be printed
+ * of string to be printed
*
* prtable and length are called with the address of the base and
* an index
*/
void
-prtable(const char *const base[], int num, int d_cols, int width,
- void (*prentry)(const char *const [], int),
+prtable(const char *const base[], int num, int d_cols, int width,
+ void (*prentry)(const char *const [], int),
int (*length)(const char *const [], int))
{
int c, j;
@@ -114,7 +114,7 @@ prtable(const char *const base[], int num, int d_cols, int width,
}
static int
-get_maxlen(const char *const base[], int num,
+get_maxlen(const char *const base[], int num,
int (*length)(const char *const *, int))
{
int i, len, max;