diff options
| author | Peter Jones <pjones@redhat.com> | 2005-03-02 00:33:33 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2005-03-02 00:33:33 +0000 |
| commit | 147fc1e7a6f76256ba29fcd3b8ffdc08d953c6b3 (patch) | |
| tree | 671bf4763d25cb3d69621e008262809f6fea54b6 /isys | |
| parent | 251d4c84f696eae58f45e091b3a5f8bb1f20cf00 (diff) | |
| download | anaconda-147fc1e7a6f76256ba29fcd3b8ffdc08d953c6b3.tar.gz anaconda-147fc1e7a6f76256ba29fcd3b8ffdc08d953c6b3.tar.xz anaconda-147fc1e7a6f76256ba29fcd3b8ffdc08d953c6b3.zip | |
More silly return value handling for things that just won't fail.
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/devnodes.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/isys/devnodes.c b/isys/devnodes.c index 14179df6a..782a1e023 100644 --- a/isys/devnodes.c +++ b/isys/devnodes.c @@ -205,27 +205,27 @@ int devMakeInode(char * devName, char * path) { #endif } else if (!strncmp(devName, "rd/", 3)) { /* dac 960 "/rd/c0d0{p1}" */ - int c, d, p; + int c, d, p, e; c = d = p = 0; - sscanf(devName + 3, "c%dd%dp%d", &c, &d, &p); + e = sscanf(devName + 3, "c%dd%dp%d", &c, &d, &p); type = S_IFBLK; major = 48 + c; /* controller */ minor = d * 8; /* disk */ minor += p; /* partition */ } else if (!strncmp(devName, "ida/", 4)) { /* Compaq Smart Array "ida/c0d0{p1} */ - int c, d, p; + int c, d, p, e; c = d = p = 0; - sscanf(devName + 4, "c%dd%dp%d", &c, &d, &p); + e = sscanf(devName + 4, "c%dd%dp%d", &c, &d, &p); type = S_IFBLK; major = 72 + c; /* controller */ minor = d * 16; /* disk */ minor += p; /* partition */ } else if (!strncmp(devName, "cciss/", 6)) { /* Compaq Smart Array 5300 "cciss/c0d0{p1} */ - int c, d, p; + int c, d, p, e; c = d = p = 0; - sscanf(devName + 6, "c%dd%dp%d", &c, &d, &p); + e = sscanf(devName + 6, "c%dd%dp%d", &c, &d, &p); type = S_IFBLK; major = 104 + c; /* controller */ minor = d * 16; /* disk */ @@ -238,9 +238,9 @@ int devMakeInode(char * devName, char * path) { minor += atoi(devName + 11); } else if (!strncmp(devName, "sx8/", 4)) { /* Promise SX8 "sx8/0{p1} */ - int d, p; + int d, p, e; d = p = 0; - sscanf(devName + 4, "%dp%d", &d, &p); + e = sscanf(devName + 4, "%dp%d", &d, &p); type = S_IFBLK; major = 160 + (d/8); /* controller */ minor = (d % 8) * 32; /* disk */ |