[tracker/tracker-0.10] tracker-extract, text: Do not doubly close the FD
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-0.10] tracker-extract, text: Do not doubly close the FD
- Date: Fri, 25 Nov 2011 19:32:11 +0000 (UTC)
commit cc5201d486f5ee616f512e4b3b9a4d1b74585659
Author: Carlos Garnacho <carlos lanedo com>
Date: Fri Nov 25 15:28:13 2011 +0100
tracker-extract,text: Do not doubly close the FD
tracker_read_text_from_fd() already takes care of closing it.
src/tracker-extract/tracker-extract-text.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index 74dce9f..0d83e7b 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -84,12 +84,13 @@ get_file_content (const gchar *uri,
g_debug (" Starting to read '%s' up to %" G_GSIZE_FORMAT " bytes...",
uri, n_bytes);
- /* Read up to n_bytes from stream. Output is always, always valid UTF-8 */
+ /* Read up to n_bytes from stream. Output is always, always valid UTF-8,
+ * this function closes the FD.
+ */
text = tracker_read_text_from_fd (fd,
n_bytes,
TRY_LOCALE_TO_UTF8_CONVERSION);
-
- close (fd);
+ g_free (uri);
g_free (path);
return text;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]