Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-01-15 15:38:16 -0500
committerDave Reisner <d@falconindy.com>2011-03-09 15:22:32 -0500
commit8a58648471e3a5311529955cd91c1a082be10056 (patch)
tree73ac218ceddd87de4264d38afa922bc2c493edb9
parenta5b6a75787be01fc2a030b68eeaba07bc26db469 (diff)
handle error case for PM_ERR_LIBCURL
Add PM_ERR_LIBCURL to error enum and handle case in error.c by returning curl_easy_strerror() based on the error number carried by the gloabl alpm handle. Signed-off-by: Dave Reisner <d@falconindy.com>
-rw-r--r--lib/libalpm/alpm.h1
-rw-r--r--lib/libalpm/error.c8
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 0f3b7166..0b80506f 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -535,6 +535,7 @@ enum _pmerrno_t {
/* External library errors */
PM_ERR_LIBARCHIVE,
PM_ERR_LIBFETCH,
+ PM_ERR_LIBCURL,
PM_ERR_EXTERNAL_DOWNLOAD
};
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index aec97a1f..19c7d92c 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -39,6 +39,7 @@
/* libalpm */
#include "util.h"
#include "alpm.h"
+#include "handle.h"
const char SYMEXPORT *alpm_strerrorlast(void)
{
@@ -158,6 +159,13 @@ const char SYMEXPORT *alpm_strerror(int err)
/* obviously shouldn't get here... */
return _("download library error");
#endif
+ case PM_ERR_LIBCURL:
+#ifdef HAVE_LIBCURL
+ return(curl_easy_strerror(handle->curlerr));
+#else
+ /* obviously shouldn't get here... */
+ return _("download library error");
+#endif
case PM_ERR_EXTERNAL_DOWNLOAD:
return _("error invoking external downloader");
/* Unknown error! */