diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2021-12-13 12:31:13 -0600 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2021-12-14 18:48:18 +0000 |
| commit | 6df9f0ed59e051c8a9d96e1a33e4a9880f761969 (patch) | |
| tree | 00ed166ccbd69a17bac27ba29cb5087548cadd2a | |
| parent | 46a2049d46fb90a09221dd8f257252c2cc5dcded (diff) | |
| download | apk-tools-6df9f0ed59e051c8a9d96e1a33e4a9880f761969.tar.gz apk-tools-6df9f0ed59e051c8a9d96e1a33e4a9880f761969.tar.bz2 apk-tools-6df9f0ed59e051c8a9d96e1a33e4a9880f761969.tar.xz apk-tools-6df9f0ed59e051c8a9d96e1a33e4a9880f761969.zip | |
defines: provide APKE_REMOTE_IO as portable alternative to EREMOTEIO
| -rw-r--r-- | src/apk_defines.h | 1 | ||||
| -rw-r--r-- | src/io_url.c | 2 | ||||
| -rw-r--r-- | src/print.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/apk_defines.h b/src/apk_defines.h index fb8b682..27f31ef 100644 --- a/src/apk_defines.h +++ b/src/apk_defines.h @@ -65,6 +65,7 @@ enum { APKE_UVOL_NOT_AVAILABLE, APKE_UVOL_ERROR, APKE_UVOL_ROOT, + APKE_REMOTE_IO, }; static inline void *ERR_PTR(long error) { return (void*) error; } diff --git a/src/io_url.c b/src/io_url.c index 3cfc27a..036d997 100644 --- a/src/io_url.c +++ b/src/io_url.c @@ -52,7 +52,7 @@ static int fetch_maperror(int ec) /* [FETCH_OK] = , */ [FETCH_PROTO] = -EPROTO, [FETCH_RESOLV] = -APKE_DNS, - [FETCH_SERVER] = -EREMOTEIO, + [FETCH_SERVER] = -APKE_REMOTE_IO, [FETCH_TEMP] = -EAGAIN, [FETCH_TIMEOUT] = -ETIMEDOUT, [FETCH_UNAVAIL] = -ENOENT, diff --git a/src/print.c b/src/print.c index a177cd5..ba9d90f 100644 --- a/src/print.c +++ b/src/print.c @@ -27,7 +27,6 @@ const char *apk_error_str(int error) case ECONNABORTED: return "network connection aborted"; case ECONNREFUSED: return "could not connect to server (check repositories file)"; case ENETUNREACH: return "network error (check Internet connection and firewall)"; - case EREMOTEIO: return "remote server returned error (try 'apk update')"; case EAGAIN: return "temporary error (try again later)"; case APKE_EOF: return "unexpected end of file"; case APKE_DNS: return "DNS error (try again later)"; @@ -60,6 +59,7 @@ const char *apk_error_str(int error) case APKE_UVOL_NOT_AVAILABLE: return "uvol manager not available"; case APKE_UVOL_ERROR: return "uvol error"; case APKE_UVOL_ROOT: return "uvol not supported with --root"; + case APKE_REMOTE_IO: return "remote server returned error (try 'apk update')"; default: return strerror(error); } |