summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2008-10-02 14:15:10 -0400
committerWilliam Jon McCann <jmccann@redhat.com>2008-10-02 14:15:10 -0400
commita58a4bff451dcf8a6019aed1b2fb276e9836b0f4 (patch)
tree8d769e150aa9f0f41a452371d60b8e48e615ec33
parent35794ece08bc678a537d0c2a680b79f9232dfe36 (diff)
don't close the log file fd twice
Fixes #17866
-rw-r--r--src/ck-event-logger.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/ck-event-logger.c b/src/ck-event-logger.c
index 92bf987..1e2165b 100644
--- a/src/ck-event-logger.c
+++ b/src/ck-event-logger.c
@@ -180,8 +180,10 @@ retry:
static void
reopen_file_stream (CkEventLogger *event_logger)
{
- close (event_logger->priv->fd);
- fclose (event_logger->priv->file);
+ /* fclose will also close the underlying fd */
+ if (event_logger->priv->file != NULL) {
+ fclose (event_logger->priv->file);
+ }
/* FIXME: retries */
open_log_file (event_logger);
@@ -420,8 +422,8 @@ ck_event_logger_finalize (GObject *object)
g_async_queue_unref (event_logger->priv->event_queue);
}
- if (event_logger->priv->fd != -1) {
- close (event_logger->priv->fd);
+ if (event_logger->priv->file != NULL) {
+ fclose (event_logger->priv->file);
}
g_free (event_logger->priv->log_filename);