[gnome-builder] pipeline: only clear intercept once
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] pipeline: only clear intercept once
- Date: Tue, 23 Jan 2018 10:49:29 +0000 (UTC)
commit c1b9629c6240f9734c27e59a719f1fae1d24ce5a
Author: Christian Hergert <chergert redhat com>
Date: Tue Jan 23 02:49:06 2018 -0800
pipeline: only clear intercept once
Fixes a warning caused by PTY_IS_INTERCEPT() being called a second time.
src/libide/buildsystem/ide-build-pipeline.c | 4 +++-
src/libide/util/ptyintercept.c | 2 --
src/libide/util/ptyintercept.h | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/libide/buildsystem/ide-build-pipeline.c b/src/libide/buildsystem/ide-build-pipeline.c
index 9fa4b063f..77d299740 100644
--- a/src/libide/buildsystem/ide-build-pipeline.c
+++ b/src/libide/buildsystem/ide-build-pipeline.c
@@ -1106,9 +1106,11 @@ ide_build_pipeline_dispose (GObject *object)
g_clear_pointer (&self->message, g_free);
g_clear_object (&self->pty);
- pty_intercept_clear (&self->intercept);
fd = pty_fd_steal (&self->pty_slave);
+ if (PTY_IS_INTERCEPT (&self->intercept))
+ pty_intercept_clear (&self->intercept);
+
G_OBJECT_CLASS (ide_build_pipeline_parent_class)->dispose (object);
IDE_EXIT;
diff --git a/src/libide/util/ptyintercept.c b/src/libide/util/ptyintercept.c
index a85886cdd..ad92b8141 100644
--- a/src/libide/util/ptyintercept.c
+++ b/src/libide/util/ptyintercept.c
@@ -39,8 +39,6 @@
*/
#define CHANNEL_BUFFER_SIZE (4096 * 4)
-#define PTY_INTERCEPT_MAGIC (0x81723647)
-#define PTY_IS_INTERCEPT(s) ((s) != NULL && (s)->magic == PTY_INTERCEPT_MAGIC)
static void _pty_intercept_side_close (pty_intercept_side_t *side);
static gboolean _pty_intercept_in_cb (GIOChannel *channel,
diff --git a/src/libide/util/ptyintercept.h b/src/libide/util/ptyintercept.h
index 0f41e5dec..b4637cf9e 100644
--- a/src/libide/util/ptyintercept.h
+++ b/src/libide/util/ptyintercept.h
@@ -24,6 +24,8 @@
G_BEGIN_DECLS
#define PTY_FD_INVALID (-1)
+#define PTY_INTERCEPT_MAGIC (0x81723647)
+#define PTY_IS_INTERCEPT(s) ((s) != NULL && (s)->magic == PTY_INTERCEPT_MAGIC)
typedef int pty_fd_t;
typedef struct _pty_intercept_t pty_intercept_t;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]