chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] update TODO with some new, small items.
[elogind.git]
/
namedev_parse.c
diff --git
a/namedev_parse.c
b/namedev_parse.c
index 98e822dfef4bd82c34350179602b6e02d780b741..0712c3b44769350d268845b2bd858d5588407fa8 100644
(file)
--- a/
namedev_parse.c
+++ b/
namedev_parse.c
@@
-21,8
+21,10
@@
*
*/
*
*/
-/* define this to enable parsing debugging */
+#ifdef DEBUG
+/* define this to enable parsing debugging also */
/* #define DEBUG_PARSER */
/* #define DEBUG_PARSER */
+#endif
#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdlib.h>
@@
-230,7
+232,9
@@
int namedev_init_rules(void)
continue;
}
continue;
}
- dbg_parse("unknown type of field '%s'", temp2);
+ dbg("unknown type of field '%s'", temp2);
+ dbg("You might be using a rules file in the old format, please fix.");
+ goto error;
}
/* simple plausibility check for given keys */
}
/* simple plausibility check for given keys */
@@
-250,7
+254,7
@@
int namedev_init_rules(void)
dbg("add_config_dev returned with error %d", retval);
continue;
error:
dbg("add_config_dev returned with error %d", retval);
continue;
error:
- dbg("%s:%d:%
Z
d: parse error, rule skipped",
+ dbg("%s:%d:%d: parse error, rule skipped",
udev_rules_filename, lineno, temp - line);
}
}
udev_rules_filename, lineno, temp - line);
}
}