[PATCH] add IGNORE rule type

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index 02ffb0a3e70def31d4221dd8214b973eca07f799..5b5a5b3bc10a8b94b357a90ed15bc543c2943ac1 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -103,13 +103,17 @@ void dump_config_dev(struct config_device *dev)
                          dev->name, dev->bus, dev->place);
                break;
        case REPLACE:
-               dbg_parse("REPLACE name=%s, kernel_name=%s",
+               dbg_parse("REPLACE name='%s', kernel_name='%s'",
                          dev->name, dev->kernel_name);
                break;
        case CALLOUT:
                dbg_parse("CALLOUT name='%s', bus='%s', program='%s', id='%s'",
                          dev->name, dev->bus, dev->exec_program, dev->id);
                break;
+       case IGNORE:
+               dbg_parse("IGNORE name='%s', kernel_name='%s'",
+                         dev->name, dev->kernel_name);
+               break;
        default:
                dbg_parse("unknown type of method");
        }
@@ -117,12 +121,10 @@ void dump_config_dev(struct config_device *dev)
 
 void dump_config_dev_list(void)
 {
-       struct list_head *tmp;
+       struct config_device *dev;
 
-       list_for_each(tmp, &config_device_list) {
-               struct config_device *dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node)
                dump_config_dev(dev);
-       }
 }
 
 void dump_perm_dev(struct perm_device *dev)
@@ -133,12 +135,10 @@ void dump_perm_dev(struct perm_device *dev)
 
 void dump_perm_dev_list(void)
 {
-       struct list_head *tmp;
+       struct perm_device *dev;
 
-       list_for_each(tmp, &perm_device_list) {
-               struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+       list_for_each_entry(dev, &perm_device_list, node)
                dump_perm_dev(dev);
-       }
 }
 
 
@@ -213,6 +213,11 @@ int namedev_init_rules(void)
                        goto keys;
                }
 
+               if (strcasecmp(temp2, TYPE_IGNORE) == 0) {
+                       dev.type = IGNORE;
+                       goto keys;
+               }
+
                dbg_parse("unknown type of method '%s'", temp2);
                goto error;
 keys:
@@ -327,6 +332,12 @@ keys:
                            (*dev.exec_program == '\0'))
                                goto error;
                        break;
+               case IGNORE:
+                       dbg_parse(TYPE_IGNORE "name='%s', kernel_name='%s'",
+                                 dev.name, dev.kernel_name);
+                       if ((*dev.kernel_name == '\0'))
+                               goto error;
+                       break;
                default:
                        dbg_parse("unknown type of method");
                        goto error;