diff options
author | greg@kroah.com <greg@kroah.com> | 2004-01-22 00:54:52 -0800 |
---|---|---|
committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:13:17 -0700 |
commit | 267f534d1c809c31e0dcc9613953ecac45529038 (patch) | |
tree | 006bf6a04b73645d06400daf9aa3a5405e6e036b /namedev.c | |
parent | 069bd530124afe40453a5530b8bfa17b1b39989a (diff) |
[PATCH] misc code cleanups.
Diffstat (limited to 'namedev.c')
-rw-r--r-- | namedev.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -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--) { |