Simplify some of the wide-character handling, inspired

in part by OpenBSD's not-quite-standard-compliant
standard libraries.  (No loss of functionality,
just minor recoding to not rely on certain "standard"
facilities that weren't actually needed.)

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/libarchive/archive_read_extract.c b/lib/libarchive/archive_read_extract.c
index 9f1b04c..aedd392 100644
--- a/lib/libarchive/archive_read_extract.c
+++ b/lib/libarchive/archive_read_extract.c
@@ -1453,16 +1453,16 @@ set_xattrs(struct archive *a, int fd, struct archive_entry *entry)
 				    name, value, size, 0);
 			}
 			if (e == -1) {
-				if (err == ENOTSUP) {
+				if (errno == ENOTSUP) {
 					if (!warning_done) {
 						warning_done = 1;
-						archive_set_error(a, err,
+						archive_set_error(a, errno,
 						    "Cannot restore extended "
 						    "attributes on this file "
 						    "system");
 					}
 				} else
-					archive_set_error(a, err,
+					archive_set_error(a, errno,
 					    "Failed to set extended attribute");
 				ret = ARCHIVE_WARN;
 			}