Changeset e187445

Timestamp:

Jun 22, 2003, 1:40:49 PM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

53f421b

Parents:

a6560fe

Message:

reformatted filter, filterelement and regex to new code style

Files:

• filter.c (modified) (7 diffs)
• filterelement.c (modified) (3 diffs)
• regex.c (modified) (4 diffs)

filter.c

@@ -4 +4 @@
 static const char fileIdent[] = "$Id$";
 
-int owl_filter_init_fromstring(owl_filter *f, char *name, char *string) {
+int owl_filter_init_fromstring(owl_filter *f, char *name, char *string)
+{
   char **argv;
   int argc, out;
@@ -14 +15 @@
 }
 
-int owl_filter_init(owl_filter *f, char *name, int argc, char **argv) {
+int owl_filter_init(owl_filter *f, char *name, int argc, char **argv)
+{
   int i, error;
   owl_filterelement *fe;
@@ -88 +90 @@
 }
 
-char *owl_filter_get_name(owl_filter *f) {
+char *owl_filter_get_name(owl_filter *f)
+{
   return(f->name);
 }
 
-void owl_filter_set_polarity_match(owl_filter *f) {
+void owl_filter_set_polarity_match(owl_filter *f)
+{
   f->polarity=0;
 }
 
-void owl_filter_set_polarity_unmatch(owl_filter *f) {
+void owl_filter_set_polarity_unmatch(owl_filter *f)
+{
   f->polarity=1;
 }
 
-void owl_filter_set_color(owl_filter *f, int color) {
+void owl_filter_set_color(owl_filter *f, int color)
+{
   f->color=color;
 }
 
-int owl_filter_get_color(owl_filter *f) {
+int owl_filter_get_color(owl_filter *f)
+{
   return(f->color);
 }
 
-void owl_filter_set_cachedmsgid(owl_filter *f, int cachedmsgid) {
+void owl_filter_set_cachedmsgid(owl_filter *f, int cachedmsgid)
+{
   f->cachedmsgid=cachedmsgid;
 }
 
-int owl_filter_get_cachedmsgid(owl_filter *f) {
+int owl_filter_get_cachedmsgid(owl_filter *f)
+{
   return(f->cachedmsgid);
 }
 
-int owl_filter_message_match(owl_filter *f, owl_message *m) {
+int owl_filter_message_match(owl_filter *f, owl_message *m)
+{
   int i, j, tmp;
   owl_list work_fes, *fes;
@@ -205 +215 @@
 }
 
-int _owl_filter_message_match_recurse(owl_filter *f, owl_message *m, owl_list *fes, int start, int end) {
+int _owl_filter_message_match_recurse(owl_filter *f, owl_message *m, owl_list *fes, int start, int end)
+{
   int a=0, b=0, i, x, y, z, score, ret, type;
   owl_filterelement *fe, *tmpfe=NULL;
@@ -357 +368 @@
 }
 
-void owl_filter_print(owl_filter *f, char *out) {
+void owl_filter_print(owl_filter *f, char *out)
+{
   int i, j;
   owl_filterelement *fe;
@@ -381 +393 @@
 }
 
-int owl_filter_equiv(owl_filter *a, owl_filter *b) {
+int owl_filter_equiv(owl_filter *a, owl_filter *b)
+{
   char buff[LINE], buff2[LINE];
 
@@ -391 +404 @@
 }
 
-void owl_filter_free(owl_filter *f) {
+void owl_filter_free(owl_filter *f)
+{
   void (*func)();
 

filterelement.c

@@ -14 +14 @@
 
 
-void owl_filterelement_create_null(owl_filterelement *fe) {
+void owl_filterelement_create_null(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_NULL;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_openbrace(owl_filterelement *fe) {
+void owl_filterelement_create_openbrace(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_OPENBRACE;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_closebrace(owl_filterelement *fe) {
+void owl_filterelement_create_closebrace(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_CLOSEBRACE;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_and(owl_filterelement *fe) {
+void owl_filterelement_create_and(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_AND;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_or(owl_filterelement *fe) {
+void owl_filterelement_create_or(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_OR;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_not(owl_filterelement *fe) {
+void owl_filterelement_create_not(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_NOT;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_true(owl_filterelement *fe) {
+void owl_filterelement_create_true(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_TRUE;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_false(owl_filterelement *fe) {
+void owl_filterelement_create_false(owl_filterelement *fe)
+{
   fe->type=OWL_FILTERELEMENT_FALSE;
   fe->field=NULL;
 }
 
-void owl_filterelement_create_re(owl_filterelement *fe, char *field, char *re) {
+void owl_filterelement_create_re(owl_filterelement *fe, char *field, char *re)
+{
   fe->type=OWL_FILTERELEMENT_RE;
   fe->field=owl_strdup(field);
@@ -60 +69 @@
 }
 
-void owl_filterelement_free(owl_filterelement *fe) {
+void owl_filterelement_free(owl_filterelement *fe)
+{
   if (fe->field) owl_free(fe->field);
 }
 
-int owl_filterelement_is_null(owl_filterelement *fe) {
+int owl_filterelement_is_null(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_NULL) return(1);
   return(0);
 }
 
-int owl_filterelement_is_openbrace(owl_filterelement *fe) {
+int owl_filterelement_is_openbrace(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_OPENBRACE) return(1);
   return(0);
 }
 
-int owl_filterelement_is_closebrace(owl_filterelement *fe) {
+int owl_filterelement_is_closebrace(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_CLOSEBRACE) return(1);
   return(0);
 }
 
-int owl_filterelement_is_and(owl_filterelement *fe) {
+int owl_filterelement_is_and(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_AND) return(1);
   return(0);
 }
 
-int owl_filterelement_is_or(owl_filterelement *fe) {
+int owl_filterelement_is_or(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_OR) return(1);
   return(0);
 }
 
-int owl_filterelement_is_not(owl_filterelement *fe) {
+int owl_filterelement_is_not(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_NOT) return(1);
   return(0);
 }
 
-int owl_filterelement_is_true(owl_filterelement *fe) {
+int owl_filterelement_is_true(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_TRUE) return(1);
   return(0);
 }
 
-int owl_filterelement_is_false(owl_filterelement *fe) {
+int owl_filterelement_is_false(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_FALSE) return(1);
   return(0);
 }
 
-int owl_filterelement_is_re(owl_filterelement *fe) {
+int owl_filterelement_is_re(owl_filterelement *fe)
+{
   if (fe->type==OWL_FILTERELEMENT_RE) return(1);
   return(0);
 }
 
-owl_regex *owl_filterelement_get_re(owl_filterelement *fe) {
+owl_regex *owl_filterelement_get_re(owl_filterelement *fe)
+{
   return(&(fe->re));
 }
 
-char *owl_filterelement_get_field(owl_filterelement *fe) {
+char *owl_filterelement_get_field(owl_filterelement *fe)
+{
   return(fe->field);
 }
 
-int owl_filterelement_is_value(owl_filterelement *fe) {
+int owl_filterelement_is_value(owl_filterelement *fe)
+{
   if ( (fe->type==OWL_FILTERELEMENT_TRUE) ||
        (fe->type==OWL_FILTERELEMENT_FALSE) ||
@@ -127 +149 @@
 
 
-char *owl_filterelement_to_string(owl_filterelement *fe) {
+char *owl_filterelement_to_string(owl_filterelement *fe)
+{
   /* return must be freed by caller */
   

regex.c

@@ -4 +4 @@
 static const char fileIdent[] = "$Id$";
 
-void owl_regex_init(owl_regex *re) {
+void owl_regex_init(owl_regex *re)
+{
   re->negate=0;
   re->string=NULL;
 }
 
-int owl_regex_create(owl_regex *re, char *string) {
+int owl_regex_create(owl_regex *re, char *string)
+{
   int ret;
   char buff1[LINE], buff2[LINE];
@@ -37 +39 @@
 }
 
-int owl_regex_compare(owl_regex *re, char *string) {
+int owl_regex_compare(owl_regex *re, char *string)
+{
   int out, ret;
 
@@ -53 +56 @@
 }
 
-int owl_regex_is_set(owl_regex *re) {
+int owl_regex_is_set(owl_regex *re)
+{
   if (re->string) return(1);
   return(0);
 }
 
-char *owl_regex_get_string(owl_regex *re) {
+char *owl_regex_get_string(owl_regex *re)
+{
   return(re->string);
 }
 
-void owl_regex_copy(owl_regex *a, owl_regex *b) {
+void owl_regex_copy(owl_regex *a, owl_regex *b)
+{
   b->negate=a->negate;
   b->string=owl_strdup(a->string);
@@ -68 +74 @@
 }
 
-void owl_regex_free(owl_regex *re) {
+void owl_regex_free(owl_regex *re)
+{
   if (re->string) owl_free(re->string);