ML_SCORE
};
+struct mood_line_parser_data {
+ struct mood *m;
+ unsigned line_num;
+};
+
/*
* <accept [with score <score>] | deny [with score <score>] | score <score>>
* [if] [not] <mood_method> [options]
static int parse_mood_line(char *mood_line, void *data)
{
- struct mood *m = data;
+ struct mood_line_parser_data *mlpd = data;
char **argv;
char *delim = " \t";
unsigned num_words;
struct mood_item *mi = NULL;
char *buf = para_strdup(mood_line);
+ mlpd->line_num++;
num_words = split_args(buf, &argv, delim);
ret = 1;
if (!num_words) /* empty line */
goto out;
mi->method = &mood_methods[i];
success:
- if (mlt == ML_ACCEPT)
- para_list_add(&mi->mood_item_node, &m->accept_list);
- else if (mlt == ML_DENY)
- para_list_add(&mi->mood_item_node, &m->deny_list);
- else
- para_list_add(&mi->mood_item_node, &m->score_list);
+ if (mlpd->m) {
+ if (mlt == ML_ACCEPT)
+ para_list_add(&mi->mood_item_node, &mlpd->m->accept_list);
+ else if (mlt == ML_DENY)
+ para_list_add(&mi->mood_item_node, &mlpd->m->deny_list);
+ else
+ para_list_add(&mi->mood_item_node, &mlpd->m->score_list);
+ }
PARA_DEBUG_LOG("%s entry added, method: %p\n", mlt == ML_ACCEPT? "accept" :
(mlt == ML_DENY? "deny" : "score"), mi->method);
ret = 1;
static int load_mood(const struct osl_row *mood_row, struct mood **m)
{
- int ret;
- struct osl_object objs[NUM_BLOB_COLUMNS];
+ char *mood_name;
+ struct osl_object mood_def;
+ struct mood_line_parser_data mlpd = {.line_num = 0};
+ int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
- ret = osl_get_object(moods_table, mood_row, BLOBCOL_NAME, &objs[BLOBCOL_NAME]);
if (ret < 0)
return ret;
- if (objs[BLOBCOL_NAME].size <= 1)
+ if (!*mood_name)
return -E_DUMMY_ROW;
- ret = osl_open_disk_object(moods_table, mood_row, BLOBCOL_DEF, &objs[BLOBCOL_DEF]);
- if (ret < 0)
- return ret;
- *m = alloc_new_mood((char*)objs[BLOBCOL_NAME].data);
- ret = for_each_line_ro(objs[BLOBCOL_DEF].data, objs[BLOBCOL_DEF].size,
- parse_mood_line, *m);
- osl_close_disk_object(&objs[BLOBCOL_DEF]);
+ mlpd.m = alloc_new_mood(mood_name);
+ ret = for_each_line_ro(mood_def.data, mood_def.size,
+ parse_mood_line, &mlpd);
+ osl_close_disk_object(&mood_def);
if (ret < 0) {
- PARA_ERROR_LOG("unable to load mood %s: %s\n", (*m)->name,
+ PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name,
PARA_STRERROR(-ret));
- destroy_mood(*m);
+ destroy_mood(mlpd.m);
return ret;
}
- PARA_INFO_LOG("loaded mood %s\n", (*m)->name);
+ PARA_INFO_LOG("loaded mood %s\n", mlpd.m->name);
+ *m = mlpd.m;
return 1;
}
return -E_NO_MOOD;
}
+static int check_mood(struct osl_row *mood_row, void *data)
+{
+ struct para_buffer *pb = data;
+ char *mood_name;
+ struct osl_object mood_def;
+ struct mood_line_parser_data mlpd = {.line_num = 0};
+
+ int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
+
+ if (ret < 0) {
+ para_printf(pb, "failed to get mood definition\n");
+ return ret;
+ }
+ if (!*mood_name) /* ignore dummy row */
+ goto out;
+ para_printf(pb, "checking mood %s...\n", mood_name);
+ ret = for_each_line_ro(mood_def.data, mood_def.size,
+ parse_mood_line, &mlpd);
+ if (ret < 0)
+ para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
+ PARA_STRERROR(-ret));
+out:
+ osl_close_disk_object(&mood_def);
+ return 1;
+}
+
+/**
+ * Check all moods for syntax errors.
+ *
+ * \param query Unused.
+ * \param result: Contains check messages.
+ */
+int mood_check_callback(__a_unused const struct osl_object *query,
+ struct osl_object *result)
+{
+ struct para_buffer pb = {.buf = NULL};
+
+ para_printf(&pb, "checking moods...\n");
+ osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb,
+ check_mood);
+ result->data = pb.buf;
+ result->size = pb.size;
+ return 1;
+}
+
#if 0
static unsigned int_log2(uint64_t x)
{