udevd: use enum instead of char in struct declaration

diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index 9b51ea3300d44078a86cca40c5e9f60e6b58d268..207dd821a6693fec59010ed00d4165c6397d710f 100644 (file)
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -1,7 +1,7 @@
 /*
  * libudev - interface to udev device information
  *
- * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2008-2009 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -76,8 +76,8 @@ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const
 
 /* udev and kernel device events */
 struct udev_monitor;
-struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
 struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char *name);
+struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
 int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor);
 struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor);
 void udev_monitor_unref(struct udev_monitor *udev_monitor);

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index e6452a6fa4e0c4d49f8d62f22368cf1839b09481..4e760a517683563e3a538f1d8c2ffc4dd2117696 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2008-2009 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -166,7 +166,7 @@ struct token {
        union {
                unsigned char type;             /* same as in rule and key */
                struct {
-                       unsigned char type;
+                       enum token_type type:8;
                        unsigned char flags;
                        unsigned short token_count;
                        unsigned int label_off;
@@ -174,10 +174,10 @@ struct token {
                        unsigned short filename_line;
                } rule;
                struct {
-                       unsigned char type;
+                       enum token_type type:8;
+                       enum operation_type op:8;
+                       enum string_glob_type glob:8;
                        unsigned char flags;
-                       unsigned char op;
-                       unsigned char glob;
                        unsigned int value_off;
                        union {
                                unsigned int attr_off;