From 267f534d1c809c31e0dcc9613953ecac45529038 Mon Sep 17 00:00:00 2001 From: "greg@kroah.com" Date: Thu, 22 Jan 2004 00:54:52 -0800 Subject: [PATCH] misc code cleanups. --- logging.h | 2 +- namedev.c | 19 +++++++++---------- namedev_parse.c | 4 +--- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/logging.h b/logging.h index 2d09b9a088..df5922b3e6 100644 --- a/logging.h +++ b/logging.h @@ -34,7 +34,7 @@ #undef info #define info(format, arg...) \ do { \ - log_message (LOG_INFO , format , ## arg); \ + log_message (LOG_INFO , format , ## arg); \ } while (0) #ifdef DEBUG diff --git a/namedev.c b/namedev.c index 7fd69f7778..e0d396e6ff 100644 --- 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 */ - if (strlen(default_mode_str) != 0) { + if (strlen(default_mode_str) != 0) mode = strtol(default_mode_str, NULL, 8); - } + 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); - } + 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); - } + return default_group_str; } @@ -563,10 +563,9 @@ device_found: * if needed */ if (sysfs_device) { - if (sysfs_device->bus[0] != '\0') goto bus_found; - + loop = 10; tspec.tv_nsec = 10000000; while (loop--) { diff --git a/namedev_parse.c b/namedev_parse.c index 546d767aed..b15be0e6fa 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -120,7 +120,6 @@ void dump_perm_dev_list(void) dump_perm_dev(dev); } - int namedev_init_rules(void) { char line[255]; @@ -345,6 +344,5 @@ int namedev_init_permissions(void) exit: fclose(fd); return retval; -} - +} -- cgit v1.2.3-54-g00ecf