--- syslogd.c.old Fri Oct 26 16:07:45 2001 +++ syslogd.c Fri Oct 26 16:12:17 2001 @@ -755,9 +755,9 @@ void printline(const char *hname, char *msg); void printsys(char *msg); void logmsg(int pri, char *msg, const char *from, int flags); -void fprintlog(register struct filed *f, char *from, int flags, char *msg); +void fprintlog(struct filed *f, char *from, int flags, char *msg); void endtty(); -void wallmsg(register struct filed *f, struct iovec *iov); +void wallmsg(struct filed *f, struct iovec *iov); void reapchild(); const char *cvthname(struct sockaddr_in *f); void domark(); @@ -768,7 +768,7 @@ void doexit(int sig); #endif void init(); -void cfline(char *line, register struct filed *f); +void cfline(char *line, struct filed *f); int decode(char *name, struct code *codetab); #if defined(__GLIBC__) #define dprintf mydprintf @@ -787,8 +787,8 @@ int argc; char **argv; { - register int i; - register char *p; + int i; + char *p; #if !defined(__GLIBC__) int len, num_fds; #else /* __GLIBC__ */ @@ -1358,12 +1358,12 @@ int len; int fd; { - auto int ptlngth; + int ptlngth; - auto char *start = msg, - *p, - *end, - tmpline[MAXLINE + 1]; + char *start = msg, + *p, + *end, + tmpline[MAXLINE + 1]; dprintf("Message length: %d, File descriptor: %d.\n", len, fd); tmpline[0] = '\0'; @@ -1429,8 +1429,8 @@ const char *hname; char *msg; { - register char *p, *q; - register unsigned char c; + char *p, *q; + unsigned char c; char line[MAXLINE + 1]; int pri; @@ -1481,8 +1481,8 @@ void printsys(msg) char *msg; { - register char *p, *q; - register int c; + char *p, *q; + int c; char line[MAXLINE + 1]; int pri, flags; char *lp; @@ -1544,7 +1544,7 @@ const char *from; int flags; { - register struct filed *f; + struct filed *f; int fac, prilev; int msglen; char *timestamp; @@ -1658,16 +1658,16 @@ #endif void fprintlog(f, from, flags, msg) - register struct filed *f; + struct filed *f; char *from; int flags; char *msg; { struct iovec iov[6]; - register struct iovec *v = iov; + struct iovec *v = iov; char repbuf[80]; #ifdef SYSLOG_INET - register int l; + int l; char line[MAXLINE + 1]; time_t fwd_suspend; struct hostent *hp; @@ -1886,11 +1886,11 @@ */ void wallmsg(f, iov) - register struct filed *f; + struct filed *f; struct iovec *iov; { char p[6 + UNAMESZ]; - register int i; + int i; int ttyf, len; static int reenter = 0; struct utmp ut; @@ -2004,7 +2004,7 @@ struct sockaddr_in *f; { struct hostent *hp; - register char *p; + char *p; int count; if (f->sin_family != AF_INET) { @@ -2062,7 +2062,7 @@ void domark() { - register struct filed *f; + struct filed *f; if (MarkInterval > 0) { now = time(0); @@ -2119,7 +2119,7 @@ int sig; { - register struct filed *f; + struct filed *f; char buf[100]; int i; int was_initialized = Initialized; @@ -2175,13 +2175,11 @@ void init() { - register int i; - register FILE *cf; - register struct filed *f; - register struct filed **nextp = &Files; - register struct filed *next; - register char *p; - register unsigned int Forwarding = 0; + int i; + FILE *cf; + struct filed *f, *next, **nextp; + char *p; + unsigned int Forwarding = 0; #ifdef CONT_LINE char cbuf[BUFSIZ]; char *cline; @@ -2224,8 +2222,8 @@ next = f->f_next; free (f); } - Files = NULL; + nextp = &Files; /* open the configuration file */ if ((cf = fopen(ConfFile, "r")) == NULL) { @@ -2397,11 +2395,11 @@ void cfline(line, f) char *line; - register struct filed *f; + struct filed *f; { - register char *p; - register char *q; - register int i, i2; + char *p; + char *q; + int i, i2; char *bp; int pri; int singlpri = 0; @@ -2652,8 +2650,8 @@ char *name; struct code *codetab; { - register struct code *c; - register char *p; + struct code *c; + char *p; char buf[80]; dprintf ("symbolic name: %s", name);