Make the code format more in line with style(9).

Update loadalias to use the new libalias api.
Update to version 1.1.

1 files changed, 77 insertions, 73 deletions

diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index a91248b..4119f94 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -11,24 +11,24 @@
 #include "vars.h"
 
 static char *LogNames[] = {
-    "Async",
-    "Carrier",
-    "CCP",
-    "Chat",
-    "Command",
-    "Connect",
-    "Debug",
-    "HDLC",
-    "IPCP",
-    "LCP",
-    "Link",
-    "LQM",
-    "Phase",
-    "TCP/IP",
-    "Tun",
-    "Warning",
-    "Error",
-    "Alert"
+  "Async",
+  "Carrier",
+  "CCP",
+  "Chat",
+  "Command",
+  "Connect",
+  "Debug",
+  "HDLC",
+  "IPCP",
+  "LCP",
+  "Link",
+  "LQM",
+  "Phase",
+  "TCP/IP",
+  "Tun",
+  "Warning",
+  "Error",
+  "Alert"
 };
 
 #define MSK(n) (1<<((n)-1))
@@ -39,112 +39,116 @@ static int LogTunno = -1;
 static int
 syslogLevel(int lev)
 {
-    switch (lev) {
-        case LogDEBUG:	return LOG_DEBUG;
-        case LogWARN:	return LOG_WARNING;
-        case LogERROR:	return LOG_ERR;
-        case LogALERT:	return LOG_ALERT;
-    }
-    return lev >= LogMIN && lev <= LogMAX ? LOG_INFO : 0;
+  switch (lev) {
+    case LogDEBUG:return LOG_DEBUG;
+  case LogWARN:
+    return LOG_WARNING;
+  case LogERROR:
+    return LOG_ERR;
+  case LogALERT:
+    return LOG_ALERT;
+  }
+  return lev >= LogMIN && lev <= LogMAX ? LOG_INFO : 0;
 }
 
 const char *
 LogName(int id)
 {
-    return id < LogMIN || id > LogMAX ? "Unknown" : LogNames[id-1];
+  return id < LogMIN || id > LogMAX ? "Unknown" : LogNames[id - 1];
 }
 
 void
 LogKeep(int id)
 {
-    if (id >= LogMIN && id <= LogMAXCONF)
-        LogMask |= MSK(id);
+  if (id >= LogMIN && id <= LogMAXCONF)
+    LogMask |= MSK(id);
 }
 
 void
 LogDiscard(int id)
 {
-    if (id >= LogMIN && id <= LogMAXCONF)
-        LogMask &= ~MSK(id);
+  if (id >= LogMIN && id <= LogMAXCONF)
+    LogMask &= ~MSK(id);
 }
 
 void
 LogDiscardAll()
 {
-    LogMask = 0;
+  LogMask = 0;
 }
 
 int
 LogIsKept(int id)
 {
-    if (id < LogMIN)
-        return 0;
-    if (id <= LogMAXCONF)
-        return LogMask & MSK(id);
-    return id <= LogMAX;
+  if (id < LogMIN)
+    return 0;
+  if (id <= LogMAXCONF)
+    return LogMask & MSK(id);
+  return id <= LogMAX;
 }
 
 void
 LogOpen(const char *Name)
 {
-    openlog(Name, LOG_PID, LOG_DAEMON);
+  openlog(Name, LOG_PID, LOG_DAEMON);
 }
 
 void
 LogSetTun(int tunno)
 {
-    LogTunno = tunno;
+  LogTunno = tunno;
 }
 
 void
 LogClose()
 {
-    closelog();
-    LogTunno = -1;
+  closelog();
+  LogTunno = -1;
 }
 
 void
-LogPrintf(int lev, char *fmt, ...)
+LogPrintf(int lev, char *fmt,...)
 {
-    va_list ap;
-    va_start(ap, fmt);
-    if (LogIsKept(lev)) {
-        static char nfmt[200];
-
-        if (LogIsKept(LogTUN) && LogTunno != -1)
-            snprintf(nfmt, sizeof nfmt, "tun%d: %s: %s",
-                     LogTunno, LogName(lev), fmt);
-        else
-            snprintf(nfmt, sizeof nfmt, "%s: %s", LogName(lev), fmt);
-        if ((lev == LogERROR || lev == LogALERT || lev == LogWARN) && VarTerm)
-          vfprintf(VarTerm, fmt, ap);
-        if (lev != LogWARN || !VarTerm)
-          vsyslog(syslogLevel(lev), nfmt, ap);
-    }
-    va_end(ap);
+  va_list ap;
+
+  va_start(ap, fmt);
+  if (LogIsKept(lev)) {
+    static char nfmt[200];
+
+    if (LogIsKept(LogTUN) && LogTunno != -1)
+      snprintf(nfmt, sizeof nfmt, "tun%d: %s: %s",
+	       LogTunno, LogName(lev), fmt);
+    else
+      snprintf(nfmt, sizeof nfmt, "%s: %s", LogName(lev), fmt);
+    if ((lev == LogERROR || lev == LogALERT || lev == LogWARN) && VarTerm)
+      vfprintf(VarTerm, fmt, ap);
+    if (lev != LogWARN || !VarTerm)
+      vsyslog(syslogLevel(lev), nfmt, ap);
+  }
+  va_end(ap);
 }
 
 void
-LogDumpBp(int lev, char *hdr, struct mbuf *bp)
+LogDumpBp(int lev, char *hdr, struct mbuf * bp)
 {
-    LogDumpBuff(lev, hdr, MBUF_CTOP(bp), bp->cnt);
+  LogDumpBuff(lev, hdr, MBUF_CTOP(bp), bp->cnt);
 }
 
 void
-LogDumpBuff(int lev, char *hdr, u_char *ptr, int n)
+LogDumpBuff(int lev, char *hdr, u_char * ptr, int n)
 {
-    if (LogIsKept(lev)) {
-        char buf[49];
-        char *b;
-        int f;
-
-        if (hdr && *hdr)
-            LogPrintf(lev, "%s", hdr);
-        while (n > 0) {
-            b = buf;
-            for (f = 0; f < 16 && n--; f++, b += 3)
-               sprintf(b, " %02x", (int)*ptr++);
-            LogPrintf(lev, buf);
-        }
+  if (LogIsKept(lev)) {
+    char buf[49];
+    char *b;
+    int f;
+
+    if (hdr && *hdr)
+      LogPrintf(lev, "%s", hdr);
+    while (n > 0) {
+      b = buf;
+      for (f = 0; f < 16 && n--; f++, b += 3)
+	sprintf(b, " %02x", (int) *ptr++);
+      LogPrintf(lev, buf);
     }
+  }
 }