diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-09 15:45:03 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-09 15:45:03 +0200 |
| commit | 01da201420edfb2a57e384f109def05f25429305 (patch) | |
| tree | 1c3090f3b5200ba62613285553afa0f7a6d30b9a /src/libsystemd | |
| parent | 37b76fd3ee5a03d76786e7bd1e0f8596e6ce47d6 (diff) | |
| parent | 74ca738f6a01fb5fc19c5c3899f5cb1fdc1d7f68 (diff) | |
Merge pull request #1218 from poettering/safe-fclose
util: introduce safe_fclose() and port everything over to it
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-introspect.c | 3 | ||||
| -rw-r--r-- | src/libsystemd/sd-hwdb/sd-hwdb.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c index 3107d00092..3149a56397 100644 --- a/src/libsystemd/sd-bus/bus-introspect.c +++ b/src/libsystemd/sd-bus/bus-introspect.c @@ -204,8 +204,7 @@ int introspect_finish(struct introspect *i, sd_bus *bus, sd_bus_message *m, sd_b void introspect_free(struct introspect *i) { assert(i); - if (i->f) - fclose(i->f); + safe_fclose(i->f); free(i->introspection); zero(*i); diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c index 06c98314e8..f0316be659 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/sd-hwdb/sd-hwdb.c @@ -344,8 +344,7 @@ _public_ sd_hwdb *sd_hwdb_unref(sd_hwdb *hwdb) { if (hwdb && REFCNT_DEC(hwdb->n_ref) == 0) { if (hwdb->map) munmap((void *)hwdb->map, hwdb->st.st_size); - if (hwdb->f) - fclose(hwdb->f); + safe_fclose(hwdb->f); free(hwdb->modalias); ordered_hashmap_free(hwdb->properties); free(hwdb); |