From: <al...@us...> - 2003-04-05 01:57:55
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv10398 Modified Files: syslogd.c Log Message: align case with switch Index: syslogd.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.c,v retrieving revision 1.239 retrieving revision 1.240 diff -u -d -r1.239 -r1.240 --- syslogd.c 5 Apr 2003 01:56:11 -0000 1.239 +++ syslogd.c 5 Apr 2003 01:57:52 -0000 1.240 @@ -286,16 +286,16 @@ */ for (argcnt = 1; (ch = getxopt(argc, argv, " l!list d!debug: i!input: " - "f!conf: m!markinterval: P!pidfile: c!console A!localdomain " - "n!nodefault C!nocollapse h!help u!udp p!path a!add", &argcnt)) - != -1; argcnt++) { + "f!conf: m!markinterval: P!pidfile: c!console A!localdomain " + "n!nodefault C!nocollapse h!help u!udp p!path a!add", &argcnt)) + != -1; argcnt++) { char buf[512]; switch (ch) { - case 'l': /* listing of files/directories etc. */ + case 'l': /* listing of files/directories etc. */ globals.FileListing = argv[argcnt]; break; - case 'd': /* debug */ + case 'd': /* debug */ if (argcnt >= argc || *argv[argcnt] == '-' || !isdigit((int) *argv[argcnt])) { /* missing level */ @@ -307,50 +307,50 @@ if (main_lib == NULL) main_lib = dlopen("./" MLIBNAME_STR, DLOPEN_FLAGS); break; - case 'f': /* configuration file */ + case 'f': /* configuration file */ ConfFile = argv[argcnt]; break; - case 'm': /* mark interval */ + case 'm': /* mark interval */ MarkInterval = strtol(argv[argcnt], NULL, 10) * 60; break; - case 'u': /* allow udp input port */ + case 'u': /* allow udp input port */ if (imodule_create(&Inputs, "udp") < 0) { fprintf(stderr, "syslogd: WARNING error on " "udp input module\n"); } break; - case 'i': /* inputs */ + case 'i': /* inputs */ if (imodule_create(&Inputs, argv[argcnt]) < 0) { fprintf(stderr, "syslogd: WARNING error on " "input module, ignoring %s\n", argv[argcnt]); } break; - case 'p': /* path */ - case 'a': /* additional im_unix socket */ + case 'p': /* path */ + case 'a': /* additional im_unix socket */ snprintf(buf, sizeof(buf), "unix %s", argv[argcnt]); if (imodule_create(&Inputs, buf) < 0) { fprintf(stderr, "syslogd: WARNING out of " "descriptors, %s ignored\n", argv[argcnt]); } break; - case 'c': /* don't use console */ + case 'c': /* don't use console */ UseConsole = 0; break; - case 'n': /* don't start default modules */ + case 'n': /* don't start default modules */ default_inputs = 0; break; - case 'P': /* alternate pidfile */ + case 'P': /* alternate pidfile */ pidfile = argv[argcnt]; break; - case 'A': /* use local domain name too */ + case 'A': /* use local domain name too */ DaemonFlags |= USE_LOCALDOMAIN; break; case 'C': DaemonFlags |= DONT_COLLAPSE; break; - case 'h': - default: + case 'h': + default: usage(); } } @@ -409,12 +409,12 @@ /* go daemon and mimic daemon() */ switch (fork()) { - case -1: + case -1: perror("fork"); exit(-1); - case 0: + case 0: break; - default: + default: exit(0); } @@ -587,14 +587,14 @@ switch (count = poll(poll_fd, poll_fd_cnt, (unpoll_fd_cnt ? poll_timeout : -1))) { /* error */ - case -1: + case -1: m_dprintf(MSYSLOG_INFORMATIVE, "syslogd: poll error: [%d]\n", errno); if (errno != EINTR) logerror("poll"); break; /* timeout */ - case 0: + case 0: for (ix = 0; ix < unpoll_fd_cnt; ix++) { struct i_module *current = unpoll_fd_modules[ix]; @@ -624,7 +624,7 @@ break; /* When file descriptors have events */ - default: + default: m_dprintf(MSYSLOG_INFORMATIVE, "syslogd: [%d] poll events\n", count); for (ix = 0; ix < poll_fd_cnt || count < 1; ix++) { struct i_module *current = poll_fd_modules[ix]; @@ -677,7 +677,7 @@ printline(log.im_host, log.im_msg, log.im_len, current->im_flags); } else if (val == 0) { } - /* input module logged the messages, or none need be logged */ + /* input module logged the messages, or none need be logged */ else if (val > 1) { } /* more than one message to print? not * currently supported */ @@ -1281,7 +1281,7 @@ f = NULL; strncpy(prog, "*", 2); - prog[sizeof (prog) - 1] = '\0'; + prog[sizeof(prog) - 1] = '\0'; while (fgets(cline, sizeof(cline), cf) != NULL) { int clen; @@ -1317,7 +1317,7 @@ p++; if (!*p) { strncpy(prog, "*", 2); - prog[sizeof (prog) - 1] = '\0'; + prog[sizeof(prog) - 1] = '\0'; continue; } for (i = 0; i < NAME_MAX; i++) { @@ -1672,7 +1672,7 @@ /* do we need bigger arrays? */ switch (type) { - case 'p': /* pollable */ + case 'p': /* pollable */ if (poll_fd_cnt % 50 == 0) { @@ -1698,7 +1698,7 @@ break; - case 'u': /* unpollable */ + case 'u': /* unpollable */ if (unpoll_fd_cnt % 50 == 0) { @@ -1723,7 +1723,7 @@ break; - default: + default: } return (1); @@ -1739,7 +1739,7 @@ switch (type) { /* determine the index by searching for the file descriptor */ - case 'p': /* pollable */ + case 'p': /* pollable */ for (ix = 0; ix < poll_fd_cnt && poll_fd[ix].fd != fd; ix++); if (ix == poll_fd_cnt || fd != poll_fd[ix].fd) return; /* not found */ @@ -1754,7 +1754,7 @@ break; - case 'u': /* unpollable */ + case 'u': /* unpollable */ for (ix = 0; ix < unpoll_fd_cnt && unpoll_fd[ix] != fd; ix++); if (ix == unpoll_fd_cnt || fd != unpoll_fd[ix]) return; /* not found */ @@ -1768,7 +1768,7 @@ break; - default: + default: } } @@ -1777,10 +1777,10 @@ signal_handler(int signo) { switch (signo) { - case SIGTSTP: + case SIGTSTP: raise(SIGSTOP); break; - default:; + default:; } } |