id management / bug fixes in database

This commit is contained in:
Cedric Roux
2016-04-27 14:10:47 +02:00
parent f0a704145b
commit 7dbb2b8c3f
2 changed files with 16 additions and 3 deletions
+15 -3
View File
@@ -27,6 +27,7 @@ typedef struct {
int isize; int isize;
group *g; group *g;
int gsize; int gsize;
int *pos;
} database; } database;
typedef struct { typedef struct {
@@ -324,6 +325,11 @@ void *parse_database(char *filename)
free(p.name.data); free(p.name.data);
free(p.value.data); free(p.value.data);
/* setup pos */
r->pos = malloc(sizeof(int) * r->isize); if (r->pos == NULL) abort();
for (i = 0; i < r->isize; i++)
r->pos[r->i[i].id] = i;
return r; return r;
} }
@@ -410,6 +416,12 @@ void on_off(void *_d, char *item, int *a, int onoff)
} }
} }
char *event_name_from_id(void *_database, int id)
{
database *d = _database;
return d->i[d->pos[id]].name;
}
database_event_format get_format(void *_database, int event_id) database_event_format get_format(void *_database, int event_id)
{ {
database *d = _database; database *d = _database;
@@ -420,9 +432,9 @@ database_event_format get_format(void *_database, int event_id)
abort(); abort();
} }
ret.type = d->i[event_id].arg_type; ret.type = d->i[d->pos[event_id]].arg_type;
ret.name = d->i[event_id].arg_name; ret.name = d->i[d->pos[event_id]].arg_name;
ret.count = d->i[event_id].asize; ret.count = d->i[d->pos[event_id]].asize;
return ret; return ret;
} }
+1
View File
@@ -7,6 +7,7 @@ void dump_database(void *database);
void list_ids(void *database); void list_ids(void *database);
void list_groups(void *database); void list_groups(void *database);
void on_off(void *d, char *item, int *a, int onoff); void on_off(void *d, char *item, int *a, int onoff);
char *event_name_from_id(void *database, int id);
/****************************************************************************/ /****************************************************************************/
/* get format of an event */ /* get format of an event */