[gnome-builder] clang: cleanup string usage
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] clang: cleanup string usage
- Date: Sat, 13 Jan 2018 11:35:28 +0000 (UTC)
commit f4ca3fd4f15682885ff3312c760404ffe2ce849e
Author: Christian Hergert <chergert redhat com>
Date: Sat Jan 13 03:32:55 2018 -0800
clang: cleanup string usage
src/plugins/clang/ide-clang-symbol-node.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/src/plugins/clang/ide-clang-symbol-node.c b/src/plugins/clang/ide-clang-symbol-node.c
index 42e4fcf55..3e20555df 100644
--- a/src/plugins/clang/ide-clang-symbol-node.c
+++ b/src/plugins/clang/ide-clang-symbol-node.c
@@ -22,6 +22,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
+#include "ide-clang-private.h"
#include "ide-clang-symbol-node.h"
struct _IdeClangSymbolNode
@@ -128,16 +129,18 @@ get_symbol_kind (CXCursor cursor,
return kind;
}
-IdeClangSymbolNode *
+IdeSymbolNode *
_ide_clang_symbol_node_new (IdeContext *context,
CXCursor cursor)
{
IdeClangSymbolNode *self;
IdeSymbolFlags flags = 0;
IdeSymbolKind kind;
- CXString cxname;
+ g_auto(CXString) cxname = {0};
const gchar *name;
+ g_assert (IDE_IS_CONTEXT (context));
+
kind = get_symbol_kind (cursor, &flags);
cxname = clang_getCursorSpelling (cursor);
name = clang_getCString (cxname);
@@ -151,9 +154,7 @@ _ide_clang_symbol_node_new (IdeContext *context,
self->cursor = cursor;
- clang_disposeString (cxname);
-
- return self;
+ return IDE_SYMBOL_NODE (self);
}
CXCursor
@@ -174,9 +175,9 @@ ide_clang_symbol_node_get_location_async (IdeSymbolNode *symbol_node,
g_autoptr(IdeFile) ifile = NULL;
g_autoptr(GFile) gfile = NULL;
g_autoptr(GTask) task = NULL;
+ g_auto(CXString) cxfilename = {0};
IdeContext *context;
const gchar *filename;
- CXString cxfilename;
CXSourceLocation cxloc;
CXFile file;
guint line = 0;
@@ -207,8 +208,6 @@ ide_clang_symbol_node_get_location_async (IdeSymbolNode *symbol_node,
g_task_return_pointer (task,
ide_source_location_new (ifile, line-1, line_offset-1, 0),
(GDestroyNotify)ide_source_location_unref);
-
- clang_disposeString (cxfilename);
}
static IdeSourceLocation *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]