summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorveego <veego@NetBSD.org>1999-04-25 09:10:07 +0000
committerveego <veego@NetBSD.org>1999-04-25 09:10:07 +0000
commit635cf4e57c04552a902e07e2f4c1a18fcdfcf0de (patch)
tree5204cdc05369916deb3aa401fa75f148710bb69d
parenta8743ef778dbf5b66d424339c2bf6597d46ac03f (diff)
It was a bad idea to call a function 'beep'.
Rename it to msg_beep to avoid conflicts with the new curses.h.
-rw-r--r--usr.bin/msgc/msg_sys.def8
-rw-r--r--usr.bin/msgc/msgc.14
-rw-r--r--usr.bin/msgc/msgdb.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/msgc/msg_sys.def b/usr.bin/msgc/msg_sys.def
index f257f956f45..ada8e16a475 100644
--- a/usr.bin/msgc/msg_sys.def
+++ b/usr.bin/msgc/msg_sys.def
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_sys.def,v 1.1.1.1 1997/09/26 21:16:38 phil Exp $ */
+/* $NetBSD: msg_sys.def,v 1.2 1999/04/25 09:10:07 veego Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -42,7 +42,7 @@ static int do_echo = 1;
/* Routines */
-void beep (void)
+void msg_beep (void)
{
fprintf (stderr, "\a");
}
@@ -155,14 +155,14 @@ static void msg_vprompt (char *msg, char *def, char *val, int max_chars,
wdelch(msg_win);
}
} else
- beep ();
+ msg_beep ();
}
else if (count < max_chars && isprint(ch)) {
if (do_echo)
waddch (msg_win, ch);
val[count++] = ch;
} else
- beep ();
+ msg_beep ();
if (do_echo)
wrefresh(msg_win);
}
diff --git a/usr.bin/msgc/msgc.1 b/usr.bin/msgc/msgc.1
index 293db4dd7f3..5aaf45c4893 100644
--- a/usr.bin/msgc/msgc.1
+++ b/usr.bin/msgc/msgc.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: msgc.1,v 1.3 1999/03/22 18:16:40 garbled Exp $
+.\" $NetBSD: msgc.1,v 1.4 1999/04/25 09:10:07 veego Exp $
.\"
.\" Copyright 1997 Piermont Information Systems Inc.
.\" All rights reserved.
@@ -48,7 +48,7 @@ msgc
.Ft void
.Fn msg_window "WINDOW *window"
.Ft void
-.Fn beep "void"
+.Fn msg_beep "void"
.Ft char *
.Fn msg_string "int msg_no"
.Ft void
diff --git a/usr.bin/msgc/msgdb.c b/usr.bin/msgc/msgdb.c
index d66d7a1ccb1..dccbd4bd213 100644
--- a/usr.bin/msgc/msgdb.c
+++ b/usr.bin/msgc/msgdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msgdb.c,v 1.2 1997/10/03 16:37:25 enami Exp $ */
+/* $NetBSD: msgdb.c,v 1.3 1999/04/25 09:10:07 veego Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -146,7 +146,7 @@ write_msg_file ()
"#include <curses.h>\n"
"\n"
"/* Prototypes */\n"
- "void beep(void);\n"
+ "void msg_beep(void);\n"
"void msg_window(WINDOW *window);\n"
"char *msg_string (int msg_no);\n"
"void msg_clear(void);\n"