ncurses 6.2 - patch 20210418

[ncurses.git] / ncurses / base / lib_beep.c

diff --git a/ncurses/base/lib_beep.c b/ncurses/base/lib_beep.c
index 0bad4c1699ccf29bea3929870f42af635590b204..b1a60b923ef6be0fbfaafa1d01299a5b2ffc0bf7 100644 (file)
--- a/ncurses/base/lib_beep.c
+++ b/ncurses/base/lib_beep.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -46,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_beep.c,v 1.14 2009/05/23 19:33:20 tom Exp $")
+MODULE_ID("$Id: lib_beep.c,v 1.18 2020/02/02 23:34:34 tom Exp $")
 
 /*
  *     beep()
@@ -61,22 +62,19 @@ NCURSES_SP_NAME(beep) (NCURSES_SP_DCL0)
 {
     int res = ERR;
 
-    T((T_CALLED("beep(%p)"), SP_PARM));
+    T((T_CALLED("beep(%p)"), (void *) SP_PARM));
 
 #ifdef USE_TERM_DRIVER
     if (SP_PARM != 0)
-       res = CallDriver_1(SP_PARM, doBeepOrFlash, TRUE);
+       res = CallDriver_1(SP_PARM, td_doBeepOrFlash, TRUE);
 #else
     /* FIXME: should make sure that we are not in altchar mode */
     if (cur_term == 0) {
        res = ERR;
     } else if (bell) {
-       TPUTS_TRACE("bell");
-       res = putp(bell);
-       _nc_flush();
+       res = NCURSES_PUTP2_FLUSH("bell", bell);
     } else if (flash_screen) {
-       TPUTS_TRACE("flash_screen");
-       res = putp(flash_screen);
+       res = NCURSES_PUTP2_FLUSH("flash_screen", flash_screen);
        _nc_flush();
     }
 #endif