X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=11948caccea8b7d03204e90998394274346334bf;hp=5dcd760c55956447bce490810cf377e05d9020a9;hb=88cbfb09ee5510277503ff1830ecc3aa6c380b00;hpb=761dfddcc027d0a4be881d779cc2f62edafbb2eb

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 5dcd760c5..11948cacc 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -321,11 +321,10 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 			const char *tk_ptr = (char *)token;
 			unsigned int idx = (tk_ptr - tks_ptr) / sizeof(struct token);
 
-			dbg(rules->udev, "* RULE %s:%u, token: %u, count: %u, label: '%s', flags: 0x%02x\n",
+			dbg(rules->udev, "* RULE %s:%u, token: %u, count: %u, label: '%s'\n",
 			    &rules->buf[token->rule.filename_off], token->rule.filename_line,
 			    idx, token->rule.token_count,
-			    &rules->buf[token->rule.label_off],
-			    token->rule.flags);
+			    &rules->buf[token->rule.label_off]);
 			break;
 		}
 	case TK_M_ACTION:
@@ -895,7 +894,7 @@ static int get_key(struct udev *udev, char **line, char **key, enum operation_ty
 		return -1;
 	*key = linepos;
 
-	while (1) {
+	for (;;) {
 		linepos++;
 		if (linepos[0] == '\0')
 			return -1;
@@ -1181,7 +1180,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 	rule_tmp.rule.rule.filename_line = lineno;
 
 	linepos = line;
-	while (1) {
+	for (;;) {
 		char *key;
 		char *value;
 		enum operation_type op;
@@ -1708,7 +1707,7 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
 		return -1;
 	}
 
-	while (1) {
+	for (;;) {
 		struct dirent *dent;
 
 		dent = readdir(dir);
@@ -1941,7 +1940,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
 
 			split = &rules->buf[token->key.value_off];
 			len = strlen(val);
-			while (1) {
+			for (;;) {
 				const char *next;
 
 				next = strchr(split, '|');
@@ -2183,7 +2182,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 				/* loop over parents */
 				event->dev_parent = event->dev;
-				while (1) {
+				for (;;) {
 					struct token *key;
 
 					dbg(event->udev, "parent: '%s'\n", udev_device_get_syspath(event->dev_parent));