diff options
author | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-11-26 23:09:44 (EST) |
---|---|---|
committer | graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2009-11-26 23:09:44 (EST) |
commit | 7ea0060e3b5c0f4d261cf4291bcd160ec94164c2 (patch) | |
tree | 303fef8983cf9cc707d34c231a6eedbb703d5ad9 /libopkg/opkg.c | |
parent | 65744fa1522751906c5cfb93e67137fc98103e91 (diff) |
Remove enum opkg_error.
The return codes aren't particularly useful and trying to have a useful one
for every error scenario would be like extending errno. Good error messages
via opkg_message() are far more appropriate.
git-svn-id: http://opkg.googlecode.com/svn/trunk@395 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/opkg.c')
-rw-r--r-- | libopkg/opkg.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/libopkg/opkg.c b/libopkg/opkg.c index 437beb1..50f8752 100644 --- a/libopkg/opkg.c +++ b/libopkg/opkg.c @@ -513,18 +513,7 @@ opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_call if (err) { opkg_package_free (pdata.package); - switch (err) - { - case OPKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR; - case OPKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED; - case OPKG_INSTALL_ERR_DEPENDENCIES: - case OPKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED; - case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED; - case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR; - case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR; - case OPKG_INSTALL_ERR_SHA256: return OPKG_SHA256_ERROR; - default: return OPKG_UNKNOWN_ERROR; - } + return OPKG_UNKNOWN_ERROR; } progress (pdata, 75); @@ -651,20 +640,8 @@ opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_call /* opkg_upgrade_pkg returns the error codes of opkg_install_pkg */ if (err) { - opkg_package_free (pdata.package); - switch (err) - { - case OPKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR; - case OPKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED; - case OPKG_INSTALL_ERR_DEPENDENCIES: - case OPKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED; - case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED; - case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR; - case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR; - case OPKG_INSTALL_ERR_SHA256: return OPKG_SHA256_ERROR; - default: return OPKG_UNKNOWN_ERROR; - } + return OPKG_UNKNOWN_ERROR; } progress (pdata, 75); |