aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/ppp/timer.c
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>1998-04-03 19:26:02 +0000
committerBrian Somers <brian@FreeBSD.org>1998-04-03 19:26:02 +0000
commitb6217683dc0269a53b799399522dbdfb5a4919cc (patch)
tree902951de8deb101adced0820378356c58e63d98b /usr.sbin/ppp/timer.c
parent8390b576621390705c322cd2a7781df9174356f7 (diff)
Notes
Diffstat (limited to 'usr.sbin/ppp/timer.c')
-rw-r--r--usr.sbin/ppp/timer.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 3a732b2d191c5..282d9dd9d6e5c 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: timer.c,v 1.27 1998/01/21 02:15:29 brian Exp $
+ * $Id: timer.c,v 1.27.2.1 1998/04/03 19:21:54 brian Exp $
*
* TODO:
*/
@@ -155,7 +155,7 @@ TimerService()
time_t n = time(NULL); /* Only show timers every second */
if (n > t)
- ShowTimers(LogDEBUG);
+ ShowTimers(LogDEBUG, NULL);
t = n;
}
tp = TimerList;
@@ -200,7 +200,7 @@ TimerService()
}
void
-ShowTimers(int LogLevel)
+ShowTimers(int LogLevel, struct prompt *prompt)
{
struct pppTimer *pt;
int rest = 0;
@@ -212,18 +212,18 @@ ShowTimers(int LogLevel)
pt->name, pt, SECS(pt->load), HSECS(pt->load), SECS(rest), \
HSECS(rest), tState2Nam(pt->state)
- if (LogIsKept(LogLevel))
+ if (!prompt)
LogPrintf(LogLevel, "---- Begin of Timer Service List---\n");
for (pt = TimerList; pt; pt = pt->next) {
rest += pt->rest;
- if (LogIsKept(LogLevel))
+ if (prompt)
+ prompt_Printf(prompt, DISP);
+ else
LogPrintf(LogLevel, DISP);
- else if (LogLevel < LogMIN)
- prompt_Printf(&prompt, DISP);
}
- if (LogIsKept(LogLevel))
+ if (!prompt)
LogPrintf(LogLevel, "---- End of Timer Service List ---\n");
}