[PATCH] trivial rename of some variables

diff --git a/namedev.c b/namedev.c
index a365574435785b61b0ce5193aadeabbcdb6c0306..f0a5c34f79a777659706aa9f1c3e37781b8b1c64 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -152,7 +152,7 @@ static int find_free_number(struct udevice *udev, const char *name)
        while (1) {
                dbg("look for existing node '%s'", filename);
                memset(&db_udev, 0x00, sizeof(struct udevice));
-               if (udev_db_get_device_byname(&db_udev, filename) != 0) {
+               if (udev_db_get_device_by_name(&db_udev, filename) != 0) {
                        dbg("free num=%d", num);
                        return num;
                }

diff --git a/udev_db.c b/udev_db.c
index df63bbe2ce147690a16d585382a16c9b2f308b85..61d4b130d35f0e64aeb82b3189deaf108a5d346a 100644 (file)
--- a/udev_db.c
+++ b/udev_db.c
@@ -179,7 +179,7 @@ int udev_db_get_device_by_devpath(struct udevice *udev, const char *devpath)
        return parse_db_file(udev, filename);
 }
 
-int udev_db_get_device_byname(struct udevice *udev, const char *name)
+int udev_db_get_device_by_name(struct udevice *udev, const char *name)
 {
        struct dirent *ent;
        DIR *dir;

diff --git a/udev_db.h b/udev_db.h
index 75f1d982967a0f844b8bee10d19ff9c7c41e2975..5065eaa6c694edd5153307774ef51cdff3d2c170 100644 (file)
--- a/udev_db.h
+++ b/udev_db.h
@@ -29,6 +29,6 @@ extern int udev_db_add_device(struct udevice *dev);
 extern int udev_db_delete_device(struct udevice *dev);
 
 extern int udev_db_get_device_by_devpath(struct udevice *dev, const char *devpath);
-extern int udev_db_get_device_byname(struct udevice *udev, const char *name);
+extern int udev_db_get_device_by_name(struct udevice *udev, const char *name);
 
 #endif /* _UDEV_DB_H_ */

diff --git a/udevd.c b/udevd.c
index 7d7fd63332baf664b9ba111e3553115aeca993fc..bd21f156146e7bc0162901f11d394a23c3948fad 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -87,14 +87,14 @@ static void msg_dump_queue(void)
 #ifdef DEBUG
        struct hotplug_msg *msg;
 
-       list_for_each_entry(msg, &msg_list, list)
+       list_for_each_entry(msg, &msg_list, node)
                dbg("sequence %llu in queue", msg->seqnum);
 #endif
 }
 
 static void run_queue_delete(struct hotplug_msg *msg)
 {
-       list_del(&msg->list);
+       list_del(&msg->node);
        free(msg);
 }
 
@@ -106,13 +106,13 @@ static void msg_queue_insert(struct hotplug_msg *msg)
 
        if (msg->seqnum == 0) {
                dbg("no SEQNUM, move straight to the exec queue");
-               list_add(&msg->list, &exec_list);
+               list_add(&msg->node, &exec_list);
                run_exec_q = 1;
                return;
        }
 
        /* sort message by sequence number into list */
-       list_for_each_entry_reverse(loop_msg, &msg_list, list) {
+       list_for_each_entry_reverse(loop_msg, &msg_list, node) {
                if (loop_msg->seqnum < msg->seqnum)
                        break;
 
@@ -126,7 +126,7 @@ static void msg_queue_insert(struct hotplug_msg *msg)
        sysinfo(&info);
        msg->queue_time = info.uptime;
 
-       list_add(&msg->list, &loop_msg->list);
+       list_add(&msg->node, &loop_msg->node);
        dbg("queued message seq %llu", msg->seqnum);
 
        /* run msg queue manager */
@@ -291,7 +291,7 @@ static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
        if (msg->devpath == NULL)
                return NULL;
 
-       list_for_each_entry(loop_msg, &running_list, list) {
+       list_for_each_entry(loop_msg, &running_list, node) {
                if (loop_msg->devpath == NULL)
                        continue;
 
@@ -321,7 +321,7 @@ static void exec_queue_manager(void)
        if (running < 0)
                running = THROTTLE_MAX_RUNNING_CHILDS;
 
-       list_for_each_entry_safe(loop_msg, tmp_msg, &exec_list, list) {
+       list_for_each_entry_safe(loop_msg, tmp_msg, &exec_list, node) {
                /* check running processes in our session and possibly throttle */
                if (running >= THROTTLE_MAX_RUNNING_CHILDS) {
                        running = running_processes_in_session(sid, THROTTLE_MAX_RUNNING_CHILDS+10);
@@ -335,7 +335,7 @@ static void exec_queue_manager(void)
                msg = running_with_devpath(loop_msg);
                if (!msg) {
                        /* move event to run list */
-                       list_move_tail(&loop_msg->list, &running_list);
+                       list_move_tail(&loop_msg->node, &running_list);
                        udev_run(loop_msg);
                        running++;
                        dbg("moved seq %llu to running list", loop_msg->seqnum);
@@ -348,7 +348,7 @@ static void exec_queue_manager(void)
 
 static void msg_move_exec(struct hotplug_msg *msg)
 {
-       list_move_tail(&msg->list, &exec_list);
+       list_move_tail(&msg->node, &exec_list);
        run_exec_q = 1;
        expected_seqnum = msg->seqnum+1;
        dbg("moved seq %llu to exec, next expected is %llu",
@@ -367,7 +367,7 @@ static void msg_queue_manager(void)
 
        dbg("msg queue manager, next expected is %llu", expected_seqnum);
 recheck:
-       list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, list) {
+       list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, node) {
                /* move event with expected sequence to the exec list */
                if (loop_msg->seqnum == expected_seqnum) {
                        msg_move_exec(loop_msg);
@@ -532,7 +532,7 @@ static void udev_done(int pid)
        /* find msg associated with pid and delete it */
        struct hotplug_msg *msg;
 
-       list_for_each_entry(msg, &running_list, list) {
+       list_for_each_entry(msg, &running_list, node) {
                if (msg->pid == pid) {
                        dbg("<== exec seq %llu came back", msg->seqnum);
                        run_queue_delete(msg);

diff --git a/udevd.h b/udevd.h
index ae1d20e5ecfd309f6679ae6610b67c9872159177..64e1d6ad12105a087c612dad0c469c5404297a48 100644 (file)
--- a/udevd.h
+++ b/udevd.h
@@ -52,7 +52,7 @@ struct udevsend_msg {
 };
 
 struct hotplug_msg {
-       struct list_head list;
+       struct list_head node;
        pid_t pid;
        long queue_time;
        char *action;

diff --git a/udevinfo.c b/udevinfo.c
index a4c17da3f09069bded7b65c3d3b97a86c6f6ce9b..e7417697cf7174c028d6cad69fd6ee4f75f3914f 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -293,7 +293,7 @@ static int process_options(int argc, char *argv[])
 
                        memset(&udev, 0x00, sizeof(struct udevice));
                        strfieldcpy(udev.name, pos);
-                       retval = udev_db_get_device_byname(&udev, pos);
+                       retval = udev_db_get_device_by_name(&udev, pos);
                        if (retval != 0) {
                                printf("device not found in database\n");
                                goto exit;