follow coding style -- but it's still strange code

This commit is contained in:
albert 2002-05-28 03:24:12 +00:00
parent b444f83d49
commit ea1d89ec4f

View File

@ -66,8 +66,7 @@ static void load_drivers(void){
tty_map = tmn; tty_map = tmn;
/* if we have a devfs type name such as /dev/tts/%d then strip the %d but /* if we have a devfs type name such as /dev/tts/%d then strip the %d but
keep a flag. */ keep a flag. */
if(len >= 3 && !strncmp(end - 2, "%d", 2)) if(len >= 3 && !strncmp(end - 2, "%d", 2)){
{
len -= 2; len -= 2;
tmn->devfs_type = 1; tmn->devfs_type = 1;
} }
@ -77,16 +76,17 @@ static void load_drivers(void){
tmn->major_number = atoi(p); tmn->major_number = atoi(p);
p += strspn(p, "0123456789"); p += strspn(p, "0123456789");
while(*p == ' ') p++; while(*p == ' ') p++;
rc = sscanf(p, "%d-%d", &tmn->minor_first, &tmn->minor_last); switch(sscanf(p, "%d-%d", &tmn->minor_first, &tmn->minor_last)){
if(rc == 1) default:
{
tmn->minor_last = tmn->minor_first;
}
else if(rc == 0)
{
/* Can't finish parsing this line so we remove it from the list */ /* Can't finish parsing this line so we remove it from the list */
tty_map = tty_map->next; tty_map = tty_map->next;
free(tmn); free(tmn);
break;
case 1:
tmn->minor_last = tmn->minor_first;
break;
case 2:
break;
} }
} }
fail: fail:
@ -107,12 +107,8 @@ static int driver_name(char * const buf, int maj, int min){
tmn = tmn->next; tmn = tmn->next;
} }
sprintf(buf, "/dev/%s%d", tmn->name, min); /* like "/dev/ttyZZ255" */ sprintf(buf, "/dev/%s%d", tmn->name, min); /* like "/dev/ttyZZ255" */
if(tmn->devfs_type) if(stat(buf, &sbuf) < 0){
{ if(tmn->devfs_type) return 0;
if(stat(buf, &sbuf) < 0) return 0;
}
else if(stat(buf, &sbuf) < 0)
{
sprintf(buf, "/dev/%s", tmn->name); /* like "/dev/ttyZZ255" */ sprintf(buf, "/dev/%s", tmn->name); /* like "/dev/ttyZZ255" */
if(stat(buf, &sbuf) < 0) return 0; if(stat(buf, &sbuf) < 0) return 0;
} }