diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-03-10 13:15:58 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-03-10 13:15:58 +0200 |
| commit | 255fd81d79c49f6e5dbdb0df371d8ec7de600917 (patch) | |
| tree | a2e60a2e8048832c5b15afef86943505261c1ad4 /src/database.c | |
| parent | 2a6896b2b4809849441756046ee7d8ad34abab34 (diff) | |
| download | apk-tools-255fd81d79c49f6e5dbdb0df371d8ec7de600917.tar.gz apk-tools-255fd81d79c49f6e5dbdb0df371d8ec7de600917.tar.bz2 apk-tools-255fd81d79c49f6e5dbdb0df371d8ec7de600917.tar.xz apk-tools-255fd81d79c49f6e5dbdb0df371d8ec7de600917.zip | |
rework error handling for write streams
Diffstat (limited to 'src/database.c')
| -rw-r--r-- | src/database.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/database.c b/src/database.c index bbf5a9d..44d0b20 100644 --- a/src/database.c +++ b/src/database.c @@ -1187,8 +1187,7 @@ static int apk_db_index_write_nr_cache(struct apk_database *db) "installed", "installed.new", 0644); - if (os == NULL) - return -EIO; + if (IS_ERR_OR_NULL(os)) return PTR_ERR(os); ctx.os = os; list_for_each_entry(ipkg, &db->installed.packages, installed_pkgs_list) { @@ -1648,36 +1647,29 @@ int apk_db_write_config(struct apk_database *db) apk_world_file, apk_world_file_tmp, 0644); - if (os == NULL) - return -1; - + if (IS_ERR_OR_NULL(os)) return PTR_ERR(os); apk_deps_write(db, db->world, os, APK_BLOB_PTR_LEN("\n", 1)); os->write(os, "\n", 1); r = os->close(os); - if (r < 0) - return r; + if (r < 0) return r; os = apk_ostream_to_file(db->root_fd, apk_installed_file, apk_installed_file_tmp, 0644); - if (os == NULL) - return -1; + if (IS_ERR_OR_NULL(os)) return PTR_ERR(os); apk_db_write_fdb(db, os); r = os->close(os); - if (r < 0) - return r; + if (r < 0) return r; os = apk_ostream_to_file(db->root_fd, apk_scripts_file, apk_scripts_file_tmp, 0644); - if (os == NULL) - return -1; + if (IS_ERR_OR_NULL(os)) return PTR_ERR(os); apk_db_scriptdb_write(db, os); r = os->close(os); - if (r < 0) - return r; + if (r < 0) return r; apk_db_index_write_nr_cache(db); @@ -1685,12 +1677,10 @@ int apk_db_write_config(struct apk_database *db) apk_triggers_file, apk_triggers_file_tmp, 0644); - if (os == NULL) - return -1; + if (IS_ERR_OR_NULL(os)) return PTR_ERR(os); apk_db_triggers_write(db, os); r = os->close(os); - if (r < 0) - return r; + if (r < 0) return r; return 0; } |