diff options
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/devfsd.c | 6 | ||||
-rw-r--r-- | miscutils/hdparm.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 1dfbadf83..49eee9be4 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -689,9 +689,9 @@ static void service_name(const struct devfsd_notify_struct *info) | |||
689 | msg_logger(LOG_ERR, "lost %u events", info->overrun_count); | 689 | msg_logger(LOG_ERR, "lost %u events", info->overrun_count); |
690 | 690 | ||
691 | /* Discard lookups on "/dev/log" and "/dev/initctl" */ | 691 | /* Discard lookups on "/dev/log" and "/dev/initctl" */ |
692 | if (info->type == DEVFSD_NOTIFY_LOOKUP | 692 | if (info->type == DEVFSD_NOTIFY_LOOKUP |
693 | && ((info->devname[0] == 'l' && info->devname[1] == 'o' | 693 | && ((info->devname[0] == 'l' && info->devname[1] == 'o' |
694 | && info->devname[2] == 'g' && !info->devname[3]) | 694 | && info->devname[2] == 'g' && !info->devname[3]) |
695 | || (info->devname[0] == 'i' && info->devname[1] == 'n' | 695 | || (info->devname[0] == 'i' && info->devname[1] == 'n' |
696 | && info->devname[2] == 'i' && info->devname[3] == 't' | 696 | && info->devname[2] == 'i' && info->devname[3] == 't' |
697 | && info->devname[4] == 'c' && info->devname[5] == 't' | 697 | && info->devname[4] == 'c' && info->devname[5] == 't' |
@@ -701,7 +701,7 @@ static void service_name(const struct devfsd_notify_struct *info) | |||
701 | 701 | ||
702 | for (entry = first_config; entry != NULL; entry = entry->next) { | 702 | for (entry = first_config; entry != NULL; entry = entry->next) { |
703 | /* First check if action matches the type, then check if name matches */ | 703 | /* First check if action matches the type, then check if name matches */ |
704 | if (info->type != entry->action.when | 704 | if (info->type != entry->action.when |
705 | || regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0) | 705 | || regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0) |
706 | continue; | 706 | continue; |
707 | for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n) | 707 | for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n) |
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 5c7d1f60c..98cc04fd3 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -1831,7 +1831,7 @@ static void process_dev(char *devname) | |||
1831 | } else if (errno == -ENOMSG) | 1831 | } else if (errno == -ENOMSG) |
1832 | printf(" no identification info available\n"); | 1832 | printf(" no identification info available\n"); |
1833 | else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */ | 1833 | else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */ |
1834 | bb_perror_msg("HDIO_GET_IDENTITY"); | 1834 | bb_perror_msg("HDIO_GET_IDENTITY"); |
1835 | else | 1835 | else |
1836 | bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY); | 1836 | bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY); |
1837 | } | 1837 | } |