[libc] Use only generic errortab entries to match generic errors
This commit is contained in:
parent
be670840c7
commit
76d5e493d1
|
@ -24,14 +24,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||||
* Find error description
|
* Find error description
|
||||||
*
|
*
|
||||||
* @v errno Error number
|
* @v errno Error number
|
||||||
* @v mask Mask of bits that we care about
|
|
||||||
* @ret errortab Error description, or NULL
|
* @ret errortab Error description, or NULL
|
||||||
*/
|
*/
|
||||||
static struct errortab * find_error ( int errno, int mask ) {
|
static struct errortab * find_error ( int errno ) {
|
||||||
struct errortab *errortab;
|
struct errortab *errortab;
|
||||||
|
|
||||||
for_each_table_entry ( errortab, ERRORTAB ) {
|
for_each_table_entry ( errortab, ERRORTAB ) {
|
||||||
if ( ( ( errortab->errno ^ errno ) & mask ) == 0 )
|
if ( errortab->errno == errno )
|
||||||
return errortab;
|
return errortab;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,13 +49,13 @@ static struct errortab * find_closest_error ( int errno ) {
|
||||||
struct errortab *errortab;
|
struct errortab *errortab;
|
||||||
|
|
||||||
/* First, look for an exact match */
|
/* First, look for an exact match */
|
||||||
if ( ( errortab = find_error ( errno, 0x7fffffff ) ) != NULL )
|
if ( ( errortab = find_error ( errno ) ) != NULL )
|
||||||
return errortab;
|
return errortab;
|
||||||
|
|
||||||
/* Second, try masking off the gPXE-specific bit and seeing if
|
/* Second, try masking off the gPXE-specific bit and seeing if
|
||||||
* we have an entry for the generic POSIX error message.
|
* we have an entry for the generic POSIX error message.
|
||||||
*/
|
*/
|
||||||
if ( ( errortab = find_error ( errno, 0x4f0000ff ) ) != NULL )
|
if ( ( errortab = find_error ( errno & 0x7f0000ff ) ) != NULL )
|
||||||
return errortab;
|
return errortab;
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Reference in New Issue