Cosmetics.

diff --git a/mymail.c b/mymail.c
index 219f6a3..50e5ba5 100644 (file)
--- a/mymail.c
+++ b/mymail.c
@@ -76,7 +76,7 @@ enum {
   MAX_ID
 };
 
   MAX_ID
 };
 

-static char *field_names[] = {
+static char *field_keys[] = {

   "mail",
   "lead",
   "from",
   "mail",
   "lead",
   "from",


@@ -363,7 +363,7 @@ int search_in_db(const char *db_filename,
   char raw_db_line[BUFFER_SIZE];
   char current_mail_filename[PATH_MAX + 1];
   unsigned long int current_position_in_mail;
   char raw_db_line[BUFFER_SIZE];
   char current_mail_filename[PATH_MAX + 1];
   unsigned long int current_position_in_mail;

-  char mbox_name[TOKEN_BUFFER_SIZE];
+  char mbox_key[TOKEN_BUFFER_SIZE];

   const char *mbox_value;
   int mbox_id;
   int already_written, m, n;
   const char *mbox_value;
   int mbox_id;
   int already_written, m, n;


@@ -413,9 +413,9 @@ int search_in_db(const char *db_filename,
   strcpy(current_mail_filename, "");
 
   while(fgets(raw_db_line, BUFFER_SIZE, db_file)) {
   strcpy(current_mail_filename, "");
 
   while(fgets(raw_db_line, BUFFER_SIZE, db_file)) {

-    mbox_value = parse_token(mbox_name, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
+    mbox_value = parse_token(mbox_key, TOKEN_BUFFER_SIZE, ' ', raw_db_line);

 
 

-    if(strcmp("mail", mbox_name) == 0) {
+    if(strcmp("mail", mbox_key) == 0) {

       char position_in_file_string[TOKEN_BUFFER_SIZE];
 
       if(current_mail_filename[0]) {
       char position_in_file_string[TOKEN_BUFFER_SIZE];
 
       if(current_mail_filename[0]) {


@@ -464,7 +464,7 @@ int search_in_db(const char *db_filename,
     else {
       mbox_id = -1;
       for(m = 0; (m < MAX_ID) && mbox_id == -1; m++) {
     else {
       mbox_id = -1;
       for(m = 0; (m < MAX_ID) && mbox_id == -1; m++) {

-        if(strncmp(field_names[m], mbox_name, strlen(mbox_name)) == 0) {
+        if(strncmp(field_keys[m], mbox_key, strlen(mbox_key)) == 0) {

           mbox_id = m;
         }
       }
           mbox_id = m;
         }
       }


@@ -542,7 +542,7 @@ void index_one_mbox_line(unsigned int nb_fields_to_parse,
   for(f = 0; f < nb_fields_to_parse; f++) {
     if(regexec(&fields_to_parse[f].regexp, raw_mbox_line, 1, &matches, 0) == 0) {
       fprintf(db_file, "%s %s\n",
   for(f = 0; f < nb_fields_to_parse; f++) {
     if(regexec(&fields_to_parse[f].regexp, raw_mbox_line, 1, &matches, 0) == 0) {
       fprintf(db_file, "%s %s\n",

-              field_names[fields_to_parse[f].id],
+              field_keys[fields_to_parse[f].id],

               raw_mbox_line + matches.rm_eo);
     }
   }
               raw_mbox_line + matches.rm_eo);
     }
   }


@@ -774,7 +774,7 @@ void init_condition(struct search_condition *condition, const char *full_string,
     /* No time condition matched, look for the search fields */
 
     for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
     /* No time condition matched, look for the search fields */
 
     for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {

-      if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) {
+      if(strncmp(field_keys[m], search_field, strlen(search_field)) == 0) {

         condition->field_id = m;
       }
     }
         condition->field_id = m;
       }
     }


@@ -784,7 +784,7 @@ void init_condition(struct search_condition *condition, const char *full_string,
     if(condition->field_id == -1) {
       if(default_search_field) {
         for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
     if(condition->field_id == -1) {
       if(default_search_field) {
         for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {

-          if(strncmp(field_names[m],
+          if(strncmp(field_keys[m],

                      default_search_field, strlen(default_search_field)) == 0) {
             condition->field_id = m;
           }
                      default_search_field, strlen(default_search_field)) == 0) {
             condition->field_id = m;
           }


@@ -795,7 +795,7 @@ void init_condition(struct search_condition *condition, const char *full_string,
 
     if(condition->field_id == -1) {
       fprintf(stderr,
 
     if(condition->field_id == -1) {
       fprintf(stderr,

-              "mymail: Syntax error in field name \"%s\".\n",
+              "mymail: Syntax error in field key \"%s\".\n",

               search_field);
       exit(EXIT_FAILURE);
     }
               search_field);
       exit(EXIT_FAILURE);
     }


@@ -806,7 +806,7 @@ void init_condition(struct search_condition *condition, const char *full_string,
       fprintf(stderr,
               "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
               string,
       fprintf(stderr,
               "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
               string,

-              field_names[condition->field_id]);
+              field_keys[condition->field_id]);

       exit(EXIT_FAILURE);
     }
   }
       exit(EXIT_FAILURE);
     }
   }


@@ -1002,7 +1002,7 @@ int main(int argc, char **argv) {
         fprintf(stderr,
                 "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
                 fields_to_parse[f].regexp_string,
         fprintf(stderr,
                 "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
                 fields_to_parse[f].regexp_string,

-                field_names[fields_to_parse[f].id]);
+                field_keys[fields_to_parse[f].id]);

         exit(EXIT_FAILURE);
       }
     }
         exit(EXIT_FAILURE);
       }
     }