- cache_table *table = NULL;
- cache_table **curr_rule = &table;
- while ((entry = table_entry_read(file)) != NULL) {
- cache_table *new_rule = ZALLOC(cache_table);
- new_rule->type = name2i(entry->fields[ca_type], cache_type_map);
- new_rule->field_name = entry->fields[ca_field_name];
- new_rule->derived_name = entry->fields[ca_derived_name];
- new_rule->type_def = (strlen(entry->fields[ca_type_def])
- ? entry->fields[ca_type_def]
- : NULL);
- new_rule->expression = (strlen(entry->fields[ca_expression]) > 0
- ? entry->fields[ca_expression]
- : NULL);
- new_rule->file_entry = entry;
- *curr_rule = new_rule;
- curr_rule = &new_rule->next;
- }
- return table;
+ while ((entry = table_read (file)) != NULL)
+ {
+ cache_entry *new_rule = ZALLOC (cache_entry);
+ new_rule->line = entry->line;
+ new_rule->entry_type = name2i (entry->field[ca_type], cache_type_map);
+ new_rule->name = entry->field[ca_derived_name];
+ filter_parse (&new_rule->original_fields, entry->field[ca_field_name]);
+ new_rule->type = entry->field[ca_type_def];
+ /* expression is the concatenation of the remaining fields */
+ if (entry->nr_fields > ca_expression)
+ {
+ int len = 0;
+ int chi;
+ for (chi = ca_expression; chi < entry->nr_fields; chi++)
+ {
+ len += strlen (" : ") + strlen (entry->field[chi]);
+ }
+ new_rule->expression = NZALLOC (char, len);
+ strcpy (new_rule->expression, entry->field[ca_expression]);
+ for (chi = ca_expression + 1; chi < entry->nr_fields; chi++)
+ {
+ strcat (new_rule->expression, " : ");
+ strcat (new_rule->expression, entry->field[chi]);
+ }
+ }
+ /* insert it */
+ *last = new_rule;
+ last = &new_rule->next;
+ }
+ return cache;