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_conf.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_conf.c')
-rw-r--r-- | libopkg/opkg_conf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c index df5b7b4..7405b48 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -149,7 +149,7 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args) if (opkg_conf_parse_file(conf, args->conf_file, &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) { /* Memory leakage from opkg_conf_parse-file */ - return OPKG_CONF_ERR_PARSE; + return -1; } } @@ -177,14 +177,14 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args) if ( opkg_conf_parse_file(conf, globbuf.gl_pathv[i], &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) { /* Memory leakage from opkg_conf_parse-file */ - return OPKG_CONF_ERR_PARSE; + return -1; } if (offline_root != conf->offline_root) { opkg_message(conf, OPKG_ERROR, "Config file %s, within an offline " "root contains option offline_root.\n", globbuf.gl_pathv[i]); - return OPKG_CONF_ERR_PARSE; + return -1; } } } @@ -215,7 +215,7 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args) opkg_message (conf, OPKG_ERROR, "Could not lock %s: %s\n", lock_file, strerror(errno_copy)); free(lock_file); - return OPKG_CONF_ERR_LOCK; + return -1; } free(lock_file); @@ -233,7 +233,7 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args) opkg_message(conf, OPKG_ERROR, "%s: Creating temp dir %s failed: %s\n", __FUNCTION__, tmp2, strerror(errno)); - return OPKG_CONF_ERR_TMP_DIR; + return -1; } pkg_hash_init("pkg-hash", &conf->pkg_hash, OPKG_CONF_DEFAULT_HASH_LEN); @@ -338,7 +338,7 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args) err = opkg_conf_set_default_dest(conf, args->dest); if (err) { nv_pair_list_deinit(&tmp_dest_nv_pair_list); - return OPKG_CONF_ERR_DEFAULT_DEST; + return -1; } } } |