diff options
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/devfsd.c | 69 | ||||
| -rw-r--r-- | miscutils/hdparm.c | 4 |
2 files changed, 40 insertions, 33 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index fd5f547..f99a946 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -606,17 +606,18 @@ static void process_config_line (const char *line, unsigned long *event_mask) char name[STRING_LENGTH]; char * msg=""; char *ptr; + int i; /* !!!! Only Uppercase Keywords in devsfd.conf */ - const char *options[] = { "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE", - "PERMISSIONS", "MODLOAD", "EXECUTE", "COPY", "IGNORE", - "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT", 0 }; - - int i; + static const char *const options[] = { + "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", + "RESTORE", "PERMISSIONS", "MODLOAD", "EXECUTE", + "COPY", "IGNORE", "MKOLDCOMPAT", "MKNEWCOMPAT", + "RMOLDCOMPAT", "RMNEWCOMPAT", 0 + }; debug_msg_logger(LOG_INFO, __FUNCTION__); - for (count = 0; count < MAX_ARGS; ++count) p[count][0] = '\0'; num_args = sscanf (line, "%s %s %s %s %s %s %s %s %s %s", when, name, what, @@ -678,7 +679,7 @@ static void process_config_line (const char *line, unsigned long *event_mask) if ( ( ptr = strchr (p[0], '.') ) == NULL ) { msg="UID.GID"; - goto process_config_line_err; /*"missing '.' in UID.GID */ + goto process_config_line_err; /*"missing '.' in UID.GID"*/ } *ptr++ = '\0'; @@ -993,17 +994,19 @@ static void action_compat (const struct devfsd_notify_struct *info, unsigned int unsigned int i; char rewind_; /* 1 to 5 "scsi/" , 6 to 9 "ide/host" */ - const char *fmt[] = { NULL , - "sg/c%db%dt%du%d", /* scsi/generic */ - "sd/c%db%dt%du%d", /* scsi/disc */ - "sr/c%db%dt%du%d", /* scsi/cd */ - "sd/c%db%dt%du%dp%d", /* scsi/part */ - "st/c%db%dt%du%dm%d%c", /* scsi/mt */ - "ide/hd/c%db%dt%du%d", /* ide/host/disc */ - "ide/cd/c%db%dt%du%d", /* ide/host/cd */ - "ide/hd/c%db%dt%du%dp%d", /* ide/host/part */ - "ide/mt/c%db%dt%du%d%s", /* ide/host/mt */ - NULL }; + static const char *const fmt[] = { + NULL , + "sg/c%db%dt%du%d", /* scsi/generic */ + "sd/c%db%dt%du%d", /* scsi/disc */ + "sr/c%db%dt%du%d", /* scsi/cd */ + "sd/c%db%dt%du%dp%d", /* scsi/part */ + "st/c%db%dt%du%dm%d%c", /* scsi/mt */ + "ide/hd/c%db%dt%du%d", /* ide/host/disc */ + "ide/cd/c%db%dt%du%d", /* ide/host/cd */ + "ide/hd/c%db%dt%du%dp%d", /* ide/host/part */ + "ide/mt/c%db%dt%du%d%s", /* ide/host/mt */ + NULL + }; /* First construct compatibility name */ switch (action) @@ -1596,20 +1599,22 @@ const char *get_old_name (const char *devname, unsigned int namelen, const char *pty2; size_t len; /* 1 to 5 "scsi/" , 6 to 9 "ide/host", 10 sbp/, 11 vcc/, 12 pty/ */ - const char *fmt[] = { NULL , - "sg%u", /* scsi/generic */ - NULL, /* scsi/disc */ - "sr%u", /* scsi/cd */ - NULL, /* scsi/part */ - "nst%u%c", /* scsi/mt */ - "hd%c" , /* ide/host/disc */ - "hd%c" , /* ide/host/cd */ - "hd%c%s", /* ide/host/part */ - "%sht%d", /* ide/host/mt */ - "sbpcd%u", /* sbp/ */ - "vcs%s", /* vcc/ */ - "%cty%c%c", /* pty/ */ - NULL }; + static const char *const fmt[] = { + NULL , + "sg%u", /* scsi/generic */ + NULL, /* scsi/disc */ + "sr%u", /* scsi/cd */ + NULL, /* scsi/part */ + "nst%u%c", /* scsi/mt */ + "hd%c" , /* ide/host/disc */ + "hd%c" , /* ide/host/cd */ + "hd%c%s", /* ide/host/part */ + "%sht%d", /* ide/host/mt */ + "sbpcd%u", /* sbp/ */ + "vcs%s", /* vcc/ */ + "%cty%c%c", /* pty/ */ + NULL + }; debug_msg_logger(LOG_INFO, __FUNCTION__); diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 750cb49..e733c91 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c @@ -1305,10 +1305,12 @@ static const char * const BuffType[] = {"unknown", "1Sect", "DualPort", "DualPor static void dump_identity (const struct hd_driveid *id) { int i; - char pmodes[64] = {0,}, dmodes[128]={0,}, umodes[128]={0,}; + char pmodes[64], dmodes[128], umodes[128]; const unsigned short int *id_regs= (const void*) id; unsigned long capacity; + pmodes[0] = dmodes[0] = umodes[0] = '\0'; + printf("\n Model=%.40s, FwRev=%.8s, SerialNo=%.20s\n Config={", id->model, id->fw_rev, id->serial_no); for (i=0; i<=15; i++) |