union {
int intval;
char *stringval;
- Filename fileval;
- FontSpec fontval;
+ Filename *fileval;
+ FontSpec *fontval;
} u;
};
{
if (type == TYPE_STR)
sfree(val->u.stringval);
+ else if (type == TYPE_FILENAME)
+ filename_free(val->u.fileval);
+ else if (type == TYPE_FONT)
+ fontspec_free(val->u.fontval);
}
/*
to->u.stringval = dupstr(from->u.stringval);
break;
case TYPE_FILENAME:
- to->u.fileval = from->u.fileval;
+ to->u.fileval = filename_copy(from->u.fileval);
break;
case TYPE_FONT:
- to->u.fontval = from->u.fontval;
+ to->u.fontval = fontspec_copy(from->u.fontval);
break;
}
}
struct conf_entry *entry, *entry2;
int i;
+ conf_clear(newconf);
+
for (i = 0; (entry = index234(oldconf->tree, i)) != NULL; i++) {
entry2 = snew(struct conf_entry);
copy_key(&entry2->key, &entry->key);
key.primary = primary;
entry = find234(conf->tree, &key, NULL);
assert(entry);
- return &entry->value.u.fileval;
+ return entry->value.u.fileval;
}
FontSpec *conf_get_fontspec(Conf *conf, int primary)
key.primary = primary;
entry = find234(conf->tree, &key, NULL);
assert(entry);
- return &entry->value.u.fontval;
+ return entry->value.u.fontval;
}
void conf_set_int(Conf *conf, int primary, int value)
assert(subkeytypes[primary] == TYPE_NONE);
assert(valuetypes[primary] == TYPE_FILENAME);
entry->key.primary = primary;
- entry->value.u.fileval = *value; /* structure copy */
+ entry->value.u.fileval = filename_copy(value);
conf_insert(conf, entry);
}
assert(subkeytypes[primary] == TYPE_NONE);
assert(valuetypes[primary] == TYPE_FONT);
entry->key.primary = primary;
- entry->value.u.fontval = *value; /* structure copy */
+ entry->value.u.fontval = fontspec_copy(value);
conf_insert(conf, entry);
}
size += 1 + strlen(entry->value.u.stringval);
break;
case TYPE_FILENAME:
- size += sizeof(entry->value.u.fileval);
+ size += filename_serialise(entry->value.u.fileval, NULL);
break;
case TYPE_FONT:
- size += sizeof(entry->value.u.fontval);
+ size += fontspec_serialise(entry->value.u.fontval, NULL);
break;
}
}
*data++ = 0;
break;
case TYPE_FILENAME:
- memcpy(data, &entry->value.u.fileval,
- sizeof(entry->value.u.fileval));
- data += sizeof(entry->value.u.fileval);
+ data += filename_serialise(entry->value.u.fileval, data);
break;
case TYPE_FONT:
- memcpy(data, &entry->value.u.fontval,
- sizeof(entry->value.u.fontval));
- data += sizeof(entry->value.u.fontval);
+ data += fontspec_serialise(entry->value.u.fontval, data);
break;
}
}
unsigned char *data = (unsigned char *)vdata;
unsigned char *start = data;
struct conf_entry *entry;
- int primary;
+ int primary, used;
unsigned char *zero;
while (maxsize >= 4) {
data = zero + 1;
break;
case TYPE_FILENAME:
- if (maxsize < sizeof(entry->value.u.fileval)) {
+ entry->value.u.fileval =
+ filename_deserialise(data, maxsize, &used);
+ if (!entry->value.u.fileval) {
if (subkeytypes[entry->key.primary] == TYPE_STR)
sfree(entry->key.secondary.s);
sfree(entry);
goto done;
}
- memcpy(&entry->value.u.fileval, data,
- sizeof(entry->value.u.fileval));
- data += sizeof(entry->value.u.fileval);
- maxsize -= sizeof(entry->value.u.fileval);
+ data += used;
+ maxsize -= used;
break;
case TYPE_FONT:
- if (maxsize < sizeof(entry->value.u.fontval)) {
+ entry->value.u.fontval =
+ fontspec_deserialise(data, maxsize, &used);
+ if (!entry->value.u.fontval) {
if (subkeytypes[entry->key.primary] == TYPE_STR)
sfree(entry->key.secondary.s);
sfree(entry);
goto done;
}
- memcpy(&entry->value.u.fontval, data,
- sizeof(entry->value.u.fontval));
- data += sizeof(entry->value.u.fontval);
- maxsize -= sizeof(entry->value.u.fontval);
+ data += used;
+ maxsize -= used;
break;
}
conf_insert(conf, entry);