[gnome-builder/gnome-builder-3-30: 1/2] build: fix various warnings when --buildtype=release



commit 21d8d9b21fc394487b68bfd6ec9944b10a8fa2b5
Author: Christian Hergert <chergert redhat com>
Date:   Mon Sep 10 20:16:31 2018 -0700

    build: fix various warnings when --buildtype=release

 src/libide/ide-context.c                          | 3 +--
 src/plugins/clang/ide-clang-completion-provider.c | 3 +--
 src/plugins/ctags/ide-ctags-completion-provider.c | 3 +--
 src/plugins/sysroot/gbp-sysroot-runtime.c         | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/libide/ide-context.c b/src/libide/ide-context.c
index 4743198e0..d8d0aba63 100644
--- a/src/libide/ide-context.c
+++ b/src/libide/ide-context.c
@@ -2134,12 +2134,11 @@ ide_context_unload_cb (GObject      *object,
                        GAsyncResult *result,
                        gpointer      user_data)
 {
-  IdeContext *self = (IdeContext *)object;
   IdeTask *unload_task = (IdeTask *)result;
   g_autoptr(IdeTask) task = user_data;
   g_autoptr(GError) error = NULL;
 
-  g_assert (IDE_IS_CONTEXT (self));
+  g_assert (IDE_IS_CONTEXT (object));
   g_assert (IDE_IS_TASK (unload_task));
   g_assert (IDE_IS_TASK (task));
 
diff --git a/src/plugins/clang/ide-clang-completion-provider.c 
b/src/plugins/clang/ide-clang-completion-provider.c
index 3601f6f0e..445a39190 100644
--- a/src/plugins/clang/ide-clang-completion-provider.c
+++ b/src/plugins/clang/ide-clang-completion-provider.c
@@ -124,7 +124,6 @@ ide_clang_completion_provider_activate_proposal (IdeCompletionProvider *provider
                                                  IdeCompletionProposal *proposal,
                                                  const GdkEventKey     *key)
 {
-  IdeClangCompletionProvider *self = (IdeClangCompletionProvider *)provider;
   IdeClangCompletionItem *item = (IdeClangCompletionItem *)proposal;
   g_autofree gchar *word = NULL;
   g_autoptr(IdeSnippet) snippet = NULL;
@@ -133,7 +132,7 @@ ide_clang_completion_provider_activate_proposal (IdeCompletionProvider *provider
   IdeFile *file;
   GtkTextIter begin, end;
 
-  g_assert (IDE_IS_CLANG_COMPLETION_PROVIDER (self));
+  g_assert (IDE_IS_CLANG_COMPLETION_PROVIDER (provider));
   g_assert (IDE_IS_COMPLETION_CONTEXT (context));
   g_assert (IDE_IS_CLANG_COMPLETION_ITEM (item));
 
diff --git a/src/plugins/ctags/ide-ctags-completion-provider.c 
b/src/plugins/ctags/ide-ctags-completion-provider.c
index 285f83b1c..11de06eef 100644
--- a/src/plugins/ctags/ide-ctags-completion-provider.c
+++ b/src/plugins/ctags/ide-ctags-completion-provider.c
@@ -325,7 +325,6 @@ ide_ctags_completion_provider_activate_proposal (IdeCompletionProvider *provider
                                                  IdeCompletionProposal *proposal,
                                                  const GdkEventKey     *key)
 {
-  IdeCtagsCompletionProvider *self = (IdeCtagsCompletionProvider *)provider;
   IdeCtagsCompletionItem *item = (IdeCtagsCompletionItem *)proposal;
   g_autofree gchar *slice = NULL;
   g_autoptr(IdeSnippet) snippet = NULL;
@@ -336,7 +335,7 @@ ide_ctags_completion_provider_activate_proposal (IdeCompletionProvider *provider
   GtkTextIter end;
   IdeFile *file;
 
-  g_assert (IDE_IS_CTAGS_COMPLETION_PROVIDER (self));
+  g_assert (IDE_IS_CTAGS_COMPLETION_PROVIDER (provider));
   g_assert (IDE_IS_CTAGS_COMPLETION_ITEM (item));
   g_assert (IDE_IS_COMPLETION_CONTEXT (context));
 
diff --git a/src/plugins/sysroot/gbp-sysroot-runtime.c b/src/plugins/sysroot/gbp-sysroot-runtime.c
index 4555f6b81..58d3eaeba 100644
--- a/src/plugins/sysroot/gbp-sysroot-runtime.c
+++ b/src/plugins/sysroot/gbp-sysroot-runtime.c
@@ -184,11 +184,11 @@ static gboolean
 gbp_sysroot_runtime_supports_toolchain (IdeRuntime   *runtime,
                                         IdeToolchain *toolchain)
 {
-  GbpSysrootRuntime *self = GBP_SYSROOT_RUNTIME(runtime);
   g_autoptr(IdeTriplet) host_triplet = NULL;
   g_autofree gchar *runtime_arch = NULL;
 
-  g_assert (GBP_IS_SYSROOT_RUNTIME (self));
+  g_assert (GBP_IS_SYSROOT_RUNTIME (runtime));
+  g_assert (IDE_IS_TOOLCHAIN (toolchain));
 
   runtime_arch = ide_runtime_get_arch (runtime);
   host_triplet = ide_toolchain_get_host_triplet (toolchain);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]