Cosmetics.

diff --git a/mymail.c b/mymail.c
index 9c085de..b3f76d1 100644 (file)
--- a/mymail.c
+++ b/mymail.c
@@ -92,10 +92,10 @@ static char *field_keys[] = {
 /********************************************************************/
 
 struct search_condition {
-  int field_id;
+  int db_key;
+  regex_t db_value_regexp;
   int negation;
-  regex_t regexp;
-  time_t interval_start, interval_stop;
+  time_t time_start, time_stop;
 };
 
 /********************************************************************/
@@ -250,26 +250,26 @@ int is_a_leading_from_line(char *mbox_line) {
 }
 
 int db_line_match_search(struct search_condition *condition,
-                         int mbox_id, const char *mbox_value) {
+                         int db_key, const char *db_value) {
 
   return
     (
-     (condition->field_id == mbox_id)
+     (condition->db_key == db_key)
 
      ||
 
-     (condition->field_id == ID_PARTICIPANT && (mbox_id == ID_LEADING_LINE ||
-                                                mbox_id == ID_FROM ||
-                                                mbox_id == ID_TO))
+     (condition->db_key == ID_PARTICIPANT && (db_key == ID_LEADING_LINE ||
+                                              db_key == ID_FROM ||
+                                              db_key == ID_TO))
      ||
 
-     (condition->field_id == ID_FROM && mbox_id == ID_LEADING_LINE)
+     (condition->db_key == ID_FROM && db_key == ID_LEADING_LINE)
 
      )
 
     &&
 
-    regexec(&condition->regexp, mbox_value, 0, 0, 0) == 0;
+    regexec(&condition->db_value_regexp, db_value, 0, 0, 0) == 0;
 }
 
 void update_body_hits(char *mail_filename, int position_in_mail,
@@ -297,9 +297,9 @@ void update_body_hits(char *mail_filename, int position_in_mail,
 
       if(!header) {
         for(n = 0; n < nb_search_conditions; n++) {
-          if(search_conditions[n].field_id == ID_BODY && !hits[n]) {
+          if(search_conditions[n].db_key == ID_BODY && !hits[n]) {
             hits[n] =
-              (regexec(&search_conditions[n].regexp, raw_mbox_line, 0, 0, 0) == 0);
+              (regexec(&search_conditions[n].db_value_regexp, raw_mbox_line, 0, 0, 0) == 0);
             if(hits[n]) {
               nb_body_hits++;
             }
@@ -348,17 +348,17 @@ int check_full_mail_match(char *current_mail_filename,
   int n, nb_fulfilled_body_conditions;
 
   for(n = 0; n < nb_search_conditions; n++) {
-    if(search_conditions[n].field_id == ID_TIME_INTERVAL) {
-      hits[n] = (mail_time >= search_conditions[n].interval_start &&
-                 (search_conditions[n].interval_stop == 0 ||
-                  mail_time <= search_conditions[n].interval_stop));
+    if(search_conditions[n].db_key == ID_TIME_INTERVAL) {
+      hits[n] = (mail_time >= search_conditions[n].time_start &&
+                 (search_conditions[n].time_stop == 0 ||
+                  mail_time <= search_conditions[n].time_stop));
     }
   }
 
   /* We first check all conditions but the body ones */
 
   for(n = 0; n < nb_search_conditions &&
-        ((search_conditions[n].field_id == ID_BODY) ||
+        ((search_conditions[n].db_key == ID_BODY) ||
          xor(hits[n], search_conditions[n].negation)); n++);
 
   if(n == nb_search_conditions) {
@@ -374,7 +374,7 @@ int check_full_mail_match(char *current_mail_filename,
                        hits);
 
       for(n = 0; n < nb_search_conditions; n++) {
-        if(search_conditions[n].field_id == ID_BODY &&
+        if(search_conditions[n].db_key == ID_BODY &&
            xor(hits[n], search_conditions[n].negation)) {
           nb_fulfilled_body_conditions++;
         }
@@ -389,18 +389,18 @@ int check_full_mail_match(char *current_mail_filename,
 /* We use the mail leading line time by default, and if we should and
    can, we update with the Date: field */
 
-void update_time(int db_id, const char *db_value, time_t *t) {
+void update_time(int db_key, const char *db_value, time_t *t) {
   const char *c;
   struct tm tm;
 
-  if(db_id == ID_LEADING_LINE) {
+  if(db_key == ID_LEADING_LINE) {
     c = db_value;
     while(*c && *c != ' ') c++; while(*c && *c == ' ') c++;
     strptime(c, "%a %b %e %k:%M:%S %Y", &tm);
     *t = mktime(&tm);
   } else {
     if(!global_use_leading_time) {
-      if(db_id == ID_DATE) {
+      if(db_key == ID_DATE) {
         if(strptime(db_value, "%a, %d %b %Y %k:%M:%S", &tm) ||
            strptime(db_value, "%d %b %Y %k:%M:%S", &tm)) {
           *t = mktime(&tm);
@@ -418,11 +418,11 @@ int search_in_db(const char *db_filename,
   FILE *db_file;
   char raw_db_line[BUFFER_SIZE];
   char current_mail_filename[PATH_MAX + 1];
-  char db_key[TOKEN_BUFFER_SIZE];
+  char db_key_string[TOKEN_BUFFER_SIZE];
   char position_in_file_string[TOKEN_BUFFER_SIZE];
   unsigned long int current_position_in_mail;
   const char *db_value;
-  int db_id;
+  int db_key;
   int hits[MAX_NB_SEARCH_CONDITIONS];
   int nb_body_conditions, need_time;
   int nb_extracted_mails;
@@ -466,10 +466,10 @@ int search_in_db(const char *db_filename,
   mail_time = 0;
 
   for(n = 0; n < nb_search_conditions; n++) {
-    if(search_conditions[n].field_id == ID_BODY) {
+    if(search_conditions[n].db_key == ID_BODY) {
       nb_body_conditions++;
     }
-    else if(search_conditions[n].field_id == ID_TIME_INTERVAL) {
+    else if(search_conditions[n].db_key == ID_TIME_INTERVAL) {
       need_time = 1;
     }
   }
@@ -477,9 +477,9 @@ int search_in_db(const char *db_filename,
   strcpy(current_mail_filename, "");
 
   while(fgets(raw_db_line, BUFFER_SIZE, db_file)) {
-    db_value = parse_token(db_key, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
+    db_value = parse_token(db_key_string, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
 
-    if(strcmp("mail", db_key) == 0) {
+    if(strcmp("mail", db_key_string) == 0) {
       if(current_mail_filename[0]) {
         if(check_full_mail_match(current_mail_filename,
                                  mail_time,
@@ -497,20 +497,20 @@ int search_in_db(const char *db_filename,
     }
 
     else {
-      db_id = -1;
-      for(m = 0; (m < MAX_ID) && db_id == -1; m++) {
-        if(strncmp(field_keys[m], db_key, strlen(db_key)) == 0) {
-          db_id = m;
+      db_key = -1;
+      for(m = 0; (m < MAX_ID) && db_key == -1; m++) {
+        if(strncmp(field_keys[m], db_key_string, strlen(db_key_string)) == 0) {
+          db_key = m;
         }
       }
 
       for(n = 0; n < nb_search_conditions; n++) {
         hits[n] |= db_line_match_search(&search_conditions[n],
-                                        db_id, db_value);
+                                        db_key, db_value);
       }
 
       if(need_time) {
-        update_time(db_id, db_value, &mail_time);
+        update_time(db_key, db_value, &mail_time);
       }
     }
   }
@@ -809,46 +809,46 @@ void init_condition(struct search_condition *condition, const char *full_string,
     condition->negation = 0;
   }
 
-  condition->field_id = -1;
+  condition->db_key = -1;
 
   /* Time condition */
 
   for(k = 0; k < sizeof(time_criteria) / sizeof(struct time_criterion); k++) {
     if(strcmp(time_criteria[k].label, search_field) == 0) {
-      condition->field_id = ID_TIME_INTERVAL;
+      condition->db_key = ID_TIME_INTERVAL;
       if(time_criteria[k].day_criterion) {
-        condition->interval_start = time_for_past_day(time_criteria[k].past_week_day);
-        condition->interval_stop = condition->interval_start + 3600 * 24;
+        condition->time_start = time_for_past_day(time_criteria[k].past_week_day);
+        condition->time_stop = condition->time_start + 3600 * 24;
       } else {
-        condition->interval_start = time(0) - 3600 * time_criteria[k].start_hour;
+        condition->time_start = time(0) - 3600 * time_criteria[k].start_hour;
         if(time_criteria[k].end_hour >= 0) {
-          condition->interval_stop = time(0) - 3600 * time_criteria[k].end_hour;
+          condition->time_stop = time(0) - 3600 * time_criteria[k].end_hour;
         } else {
-          condition->interval_stop = 0;
+          condition->time_stop = 0;
         }
       }
       break;
     }
   }
 
-  if(condition->field_id == -1) {
+  if(condition->db_key == -1) {
 
     /* No time condition matched, look for the search fields */
 
-    for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
+    for(m = 0; (m < MAX_ID) && condition->db_key == -1; m++) {
       if(strncmp(field_keys[m], search_field, strlen(search_field)) == 0) {
-        condition->field_id = m;
+        condition->db_key = m;
       }
     }
 
     /* None match, if there is a default search field, re-run the search with it */
 
-    if(condition->field_id == -1) {
+    if(condition->db_key == -1) {
       if(default_search_field) {
-        for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
+        for(m = 0; (m < MAX_ID) && condition->db_key == -1; m++) {
           if(strncmp(field_keys[m],
                      default_search_field, strlen(default_search_field)) == 0) {
-            condition->field_id = m;
+            condition->db_key = m;
           }
         }
         string = full_string;
@@ -856,28 +856,28 @@ void init_condition(struct search_condition *condition, const char *full_string,
       }
     }
 
-    if(condition->field_id == -1) {
+    if(condition->db_key == -1) {
       fprintf(stderr,
               "mymail: Syntax error in field key \"%s\".\n",
               search_field);
       exit(EXIT_FAILURE);
     }
 
-    if(regcomp(&condition->regexp,
+    if(regcomp(&condition->db_value_regexp,
                string,
                REG_ICASE)) {
       fprintf(stderr,
               "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
               string,
-              field_keys[condition->field_id]);
+              field_keys[condition->db_key]);
       exit(EXIT_FAILURE);
     }
   }
 }
 
 void free_condition(struct search_condition *condition) {
-  if(condition->field_id != ID_TIME_INTERVAL) {
-    regfree(&condition->regexp);
+  if(condition->db_key != ID_TIME_INTERVAL) {
+    regfree(&condition->db_value_regexp);
   }
 }