[PATCH] misc code cleanups.

diff --git a/logging.h b/logging.h
index 2d09b9a088c115452899770bcab525eb01bff598..df5922b3e666e0af7a483685f895cfdb80a5b000 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -34,7 +34,7 @@
 #undef info
 #define info(format, arg...)                                                           \
        do {                                                                            \
 #undef info
 #define info(format, arg...)                                                           \
        do {                                                                            \

-               log_message (LOG_INFO , format , ## arg);       \
+               log_message (LOG_INFO , format , ## arg);                               \

        } while (0)
 
 #ifdef DEBUG
        } while (0)
 
 #ifdef DEBUG

diff --git a/namedev.c b/namedev.c
index 7fd69f7778954332ab2075232fa98b7297b58001..e0d396e6ff725b68e77df77aa56c79e8a73dc776 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -145,25 +145,25 @@ static mode_t get_default_mode(void)
 {
        mode_t mode = 0600;     /* default to owner rw only */
 
 {
        mode_t mode = 0600;     /* default to owner rw only */
 

-       if (strlen(default_mode_str) != 0) {
+       if (strlen(default_mode_str) != 0)

                mode = strtol(default_mode_str, NULL, 8);
                mode = strtol(default_mode_str, NULL, 8);

-       }
+

        return mode;
 }
 
        return mode;
 }
 

-static char * get_default_owner(void)
+static char *get_default_owner(void)

 {
 {

-       if (strlen(default_owner_str) == 0) {
+       if (strlen(default_owner_str) == 0)

                strncpy(default_owner_str, "root", OWNER_SIZE);
                strncpy(default_owner_str, "root", OWNER_SIZE);

-       }
+

        return default_owner_str;
 }
 
        return default_owner_str;
 }
 

-static char * get_default_group(void)
+static char *get_default_group(void)

 {
 {

-       if (strlen(default_group_str) == 0) {
+       if (strlen(default_group_str) == 0)

                strncpy(default_group_str, "root", GROUP_SIZE);
                strncpy(default_group_str, "root", GROUP_SIZE);

-       }
+

        return default_group_str;
 }
 
        return default_group_str;
 }
 


@@ -563,10 +563,9 @@ device_found:
         * if needed
         */
         if (sysfs_device) {
         * if needed
         */
         if (sysfs_device) {

-               

                if (sysfs_device->bus[0] != '\0')
                        goto bus_found;
                if (sysfs_device->bus[0] != '\0')
                        goto bus_found;

-               
+

                loop = 10;
                tspec.tv_nsec = 10000000;
                while (loop--) {
                loop = 10;
                tspec.tv_nsec = 10000000;
                while (loop--) {

diff --git a/namedev_parse.c b/namedev_parse.c
index 546d767aed6a665f55cd9156adac6a6f3cc035d8..b15be0e6fa7d5894c9c8bc0a3a19f07034300a06 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -120,7 +120,6 @@ void dump_perm_dev_list(void)
                dump_perm_dev(dev);
 }
 
                dump_perm_dev(dev);
 }
 

-

 int namedev_init_rules(void)
 {
        char line[255];
 int namedev_init_rules(void)
 {
        char line[255];


@@ -345,6 +344,5 @@ int namedev_init_permissions(void)
 exit:
        fclose(fd);
        return retval;
 exit:
        fclose(fd);
        return retval;

-}      
-
+}