[Msyslog-cvs] syslog/src/modules om_regex.c,1.48,1.49

[<al...@us...>]

Update of /cvsroot/msyslog/syslog/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv27968a/src/modules

Modified Files:
	om_regex.c 
Log Message:
style before changing


Index: om_regex.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_regex.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- om_regex.c	26 Sep 2002 18:46:07 -0000	1.48
+++ om_regex.c	1 Oct 2002 19:37:39 -0000	1.49
@@ -183,137 +183,135 @@
    *
    */
 
-  for(
-   argcnt = 1   /* skip module name */
-   ;
-   ( ch = getxopt(
-    argc,
-    argv, 
-    "v!reverse!inverse m!message: h!host: s!subst:",
-    &argcnt
-   ) ) != -1
-   ;
-   argcnt++
-  ) {
-
-    p = NULL;
+  for(argcnt = 1; (ch = getxopt(argc, argv, "v!reverse!inverse m!message: "
+	    "h!host: s!subst: i!icase", &argcnt)) != -1; argcnt++) {
 
-    switch (ch) {
+	p = NULL;
 
-      case 'v':
-        if (c->filters & OM_FILTER_SUBST) {
-          m_dprintf(MSYSLOG_WARNING, "om_regex: error compiling "
-            "inverse regular expression incompatible with substitution\n");
-    break;
-        }
-        c->filters |= OM_FILTER_INVERSE;
-        statbuf_len += snprintf(statbuf + statbuf_len, sizeof(statbuf) - statbuf_len, ", inverse");
-    break;
+	switch (ch) {
 
-      case 'm':
-        if (m_processed) {
-          m_dprintf(MSYSLOG_WARNING, "om_regex: "
-           "m option specified more than once, only first accepted\n");
-    break;
-        }
-        c->filters |= OM_FILTER_MESSAGE;
+	case 'v':
+		if (c->filters & OM_FILTER_SUBST) {
+			m_dprintf(MSYSLOG_WARNING, "om_regex: error compiling "
+			    "inverse regular expression incompatible with "
+			    "substitution\n");
+			break;
+		}
+		c->filters |= OM_FILTER_INVERSE;
+		statbuf_len += snprintf(statbuf + statbuf_len,
+		    sizeof(statbuf) - statbuf_len, ", inverse");
+		break;
 
-        if (regcomp(&c->msg_exp, argv[argcnt], REG_EXTENDED) != 0) {
+	case 'm':
+		if (m_processed) {
+			m_dprintf(MSYSLOG_WARNING, "om_regex: m option "
+			    "specified more than once, only first accepted\n");
+			break;
+		}
+		c->filters |= OM_FILTER_MESSAGE;
 
-          m_dprintf(MSYSLOG_SERIOUS, "om_regex: error compiling "
-           "regular expression [%s] for message\n", argv[argcnt]);
-          free(*ctx);
-return -1;
-        }
+		if (regcomp(&c->msg_exp, argv[argcnt], REG_EXTENDED) != 0) {
 
-        c->msg_no_subexp = count_subexp(&subexp_regex_comp, argv[argcnt]);
-        p = ", message";
-        opt_recent = 'm';
-        m_processed = 1;
-    break;
+			m_dprintf(MSYSLOG_SERIOUS, "om_regex: error compiling "
+			    "regular expression [%s] for message\n",
+			    argv[argcnt]);
+			free(*ctx);
+			return -1;
+		}
 
-      case 'h':
-        if (h_processed) {
-          m_dprintf(MSYSLOG_WARNING, "om_regex: "
-           "h option specified more than once, only first accepted\n");
-    break;
-        }
-        c->filters |= OM_FILTER_HOST;
+		c->msg_no_subexp = count_subexp(&subexp_regex_comp,
+		    argv[argcnt]);
+		p = ", message";
+		opt_recent = 'm';
+		m_processed = 1;
+		break;
 
-        if (regcomp(&c->host_exp, argv[argcnt], REG_EXTENDED) != 0) {
+	case 'h':
+		if (h_processed) {
+			m_dprintf(MSYSLOG_WARNING, "om_regex: h option "
+			    "specified more than once, only first accepted\n");
+			break;
+		}
+		c->filters |= OM_FILTER_HOST;
 
-          m_dprintf(MSYSLOG_SERIOUS, "om_regex: error compiling "
-           "regular expression [%s] for message\n", argv[argcnt]);
-          free(*ctx);
+		if (regcomp(&c->host_exp, argv[argcnt], REG_EXTENDED) != 0) {
 
-return -1;
-        }
+			m_dprintf(MSYSLOG_SERIOUS, "om_regex: error compiling "
+			    "regular expression [%s] for message\n",
+			    argv[argcnt]);
+			free(*ctx);
+			return -1;
+		}
 
-        c->host_no_subexp = count_subexp(&subexp_regex_comp, argv[argcnt]);
-        p = ", host";
-        opt_recent = 'h';
-        h_processed = 1;
-    break;
+		c->host_no_subexp = count_subexp(&subexp_regex_comp,
+		    argv[argcnt]);
+		p = ", host";
+		opt_recent = 'h';
+		h_processed = 1;
+		break;
 
-      case 's':
-        if (c->filters & OM_FILTER_INVERSE) {
-          m_dprintf(MSYSLOG_WARNING, "om_regex: error compiling "
-           "substitution incompatible with inverse regular expression\n");
-        }
-        if (opt_recent == 0) {
-          m_dprintf(MSYSLOG_WARNING, "om_regex: "
-           "s option specified with no matching m or h option\n");
-    break;
-        }
+	case 's':
+		if (c->filters & OM_FILTER_INVERSE) {
+			m_dprintf(MSYSLOG_WARNING, "om_regex: error compiling "
+			    "substitution incompatible with inverse regular "
+			    "expression\n");
+		}
+		if (opt_recent == 0) {
+			m_dprintf(MSYSLOG_WARNING, "om_regex: s option "
+			    "specified with no matching m or h option\n");
+			break;
+		}
 
-        {
-          int no_subexp;
-          int max_subexp_no;
-          int *no_subst;
-          char ***non_subst;
-          int **subexp_no;
+		{
+		int no_subexp;
+		int max_subexp_no;
+		int *no_subst;
+		char ***non_subst;
+		int **subexp_no;
 
-          if (opt_recent == 'm') {
-            no_subexp = c->msg_no_subexp;
-            no_subst = &c->msg_no_subst;
-            non_subst = &c->msg_non_subst;
-            subexp_no = &c->msg_subexp_no;
-          } else {    /* if (opt_recent == 'h') { */
-            no_subexp = c->host_no_subexp;
-            no_subst = &c->host_no_subst;
-            non_subst = &c->host_non_subst;
-            subexp_no = &c->host_subexp_no;
-          }
-          parse_subst(&subst_regex_comp, argv[argcnt], no_subst, non_subst, subexp_no);
+		if (opt_recent == 'm') {
+			no_subexp = c->msg_no_subexp;
+			no_subst = &c->msg_no_subst;
+			non_subst = &c->msg_non_subst;
+			subexp_no = &c->msg_subexp_no;
+		} else {    /* if (opt_recent == 'h')  */
+			no_subexp = c->host_no_subexp;
+			no_subst = &c->host_no_subst;
+			non_subst = &c->host_non_subst;
+			subexp_no = &c->host_subexp_no;
+		}
+		parse_subst(&subst_regex_comp, argv[argcnt], no_subst,
+		    non_subst, subexp_no);
 
-          max_subexp_no = max_subexp(*subexp_no, *no_subst);
+		max_subexp_no = max_subexp(*subexp_no, *no_subst);
 
-          if (max_subexp_no > no_subexp) {
-            m_dprintf(MSYSLOG_SERIOUS, "om_regex: substitution pattern "
-             "references sub-expression [%d], max is [%d]\n", max_subexp_no, no_subexp);
-return -1;
-          }
-        }
-        opt_recent = 0;
+		if (max_subexp_no > no_subexp) {
+			m_dprintf(MSYSLOG_SERIOUS, "om_regex: substitution "
+			    "pattern references sub-expression [%d], max is "
+			    "[%d]\n", max_subexp_no, no_subexp);
+			return -1;
+		}
+		}
 
-        c->filters |= OM_FILTER_SUBST;
-        p = ", subst";
-    break;
+		opt_recent = 0;
 
-      default:
-        m_dprintf(MSYSLOG_SERIOUS, "om_regex: unknown parameter [%c]\n", ch);
-        free(*ctx);
-return -1;
+		c->filters |= OM_FILTER_SUBST;
+		p = ", subst";
+		break;
 
-    } /* END switch */
+	default:
+		m_dprintf(MSYSLOG_SERIOUS, "om_regex: unknown parameter [%c]\n",
+		    ch);
+		free(*ctx);
+		return -1;
 
+	}
 
-    if (p) {
-      statbuf_len += snprintf(statbuf + statbuf_len, sizeof(statbuf) - statbuf_len,
-       " %s [%s]", p, argv[argcnt]);
-    }
+	if (p)
+		statbuf_len += snprintf(statbuf + statbuf_len,
+		    sizeof(statbuf) - statbuf_len, " %s [%s]", p, argv[argcnt]);
 
-  } /* END for */
+  } /* END for(getxopt) */
 
   *status = strdup(statbuf);