AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2024-12-28 06:35:34 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwdb: remove support for (not fully implemented) conditional properties

Browse Source 
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
This commit is contained in:
Kay Sievers 2013-07-01 17:39:50 +00:00 committed by Anthony G. Basile
parent c9096d0490
commit 86d0542d34
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/udev/udevadm-hwdb.c
View File

@ -411,14 +411,12 @@ static int import_file(struct trie *trie, const char *filename) {
FILE *f;
char line[LINE_MAX];
char match[LINE_MAX];
char cond[LINE_MAX];
f = fopen(filename, "re");
if (f == NULL)
return -errno;
match[0] = '\0';
cond[0] = '\0';
while (fgets(line, sizeof(line), f)) {
size_t len;
@ -428,7 +426,6 @@ static int import_file(struct trie *trie, const char *filename) {
/* new line, new record */
if (line[0] == '\n') {
match[0] = '\0';
cond[0] = '\0';
continue;
}
@ -441,20 +438,10 @@ static int import_file(struct trie *trie, const char *filename) {
/* start of new record */
if (match[0] == '\0') {
strcpy(match, line);
cond[0] = '\0';
continue;
}
if (line[0] == '+') {
strcpy(cond, line);
continue;
}
/* TODO: support +; skip the entire record until we support it */
if (cond[0] != '\0')
continue;
/* value lines */
/* value line */
if (line[0] == ' ') {
char *value;
@ -464,7 +451,10 @@ static int import_file(struct trie *trie, const char *filename) {
value[0] = '\0';
value++;
trie_insert(trie, trie->root, match, line, value);
continue;
}
log_error("Error parsing line '%s' in '%s\n", line, filename);
}
fclose(f);
return 0;