summaryrefslogtreecommitdiff
path: root/src/parse.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/parse.h')
-rw-r--r--src/parse.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/parse.h b/src/parse.h
index 1b1870a..7dfcc1b 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -118,9 +118,12 @@ typedef struct _ParsedAttribute {
int target_type;
int target_id;
int attr;
- int val;
- float fval; /* XXX put in a union with val? */
- const float *pfval; /* XXX put in a union with val? */
+ union {
+ int i;
+ float f;
+ const float *pf;
+ char *str;
+ } val;
uint32 display_device_mask;
uint32 flags;
struct _ParsedAttribute *next;
@@ -329,6 +332,7 @@ const char *parse_read_integer_pair(const char *str,
const char separator, int *a, int *b);
const char *parse_read_name(const char *str, char **name, char term);
const char *parse_read_display_name(const char *str, unsigned int *mask);
+const char *parse_read_display_id(const char *str, unsigned int *id);
int parse_read_float_range(const char *str, float *min, float *max);
int count_number_of_bits(unsigned int mask);