summaryrefslogtreecommitdiffstats
path: root/src/include/errno.h
diff options
context:
space:
mode:
authorMichael Brown2013-04-18 02:05:32 +0200
committerMichael Brown2013-04-19 01:45:13 +0200
commite42bc3aa37698941be20cccde599af39c69227e2 (patch)
tree4e6232b003056ad3ae52281407ff73a24e56c803 /src/include/errno.h
parent[efi] Remove obsolete EFI I/O implementation using EFI_CPU_IO_PROTOCOL (diff)
downloadipxe-e42bc3aa37698941be20cccde599af39c69227e2.tar.gz
ipxe-e42bc3aa37698941be20cccde599af39c69227e2.tar.xz
ipxe-e42bc3aa37698941be20cccde599af39c69227e2.zip
[libc] Use __einfo() tuple as first argument to EUNIQ()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/errno.h')
-rw-r--r--src/include/errno.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/include/errno.h b/src/include/errno.h
index bd4ddaf4..bb70136b 100644
--- a/src/include/errno.h
+++ b/src/include/errno.h
@@ -187,8 +187,8 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
/**
* Disambiguate a base error based on non-constant information
*
- * @v error_base Base error
- * @v uniq Error disambiguator
+ * @v einfo_base Base error information
+ * @v uniq Error disambiguator (0x00-0x1f)
* @v ... List of expected possible disambiguated errors
* @ret error Error
*
@@ -200,9 +200,10 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
* EUNIQ() should not be used for constant error disambiguators; use
* __einfo_uniqify() instead.
*/
-#define EUNIQ( errno, uniq, ... ) ( { \
- euniq_discard ( 0, ##__VA_ARGS__); \
- ( ( int ) ( (errno) | ( (uniq) << 8 ) ) ); } )
+#define EUNIQ( einfo_base, uniq, ... ) ( { \
+ euniq_discard ( 0, ##__VA_ARGS__ ); \
+ ( ( int ) ( __einfo_error ( einfo_base ) | \
+ ( (uniq) << 8 ) ) ); } )
static inline void euniq_discard ( int dummy __unused, ... ) {}
/**