projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename: bt_put(), bt_get() -> bt_object_put_ref(), bt_object_get_ref()
[babeltrace.git]
/
lib
/
ctf-writer
/
resolve.c
diff --git
a/lib/ctf-writer/resolve.c
b/lib/ctf-writer/resolve.c
index 90ace158d325ed8b4a581d8d10f398e6b88924bc..c0388cd7ff8eab7bfe36795adf3684ed3ef4157a 100644
(file)
--- a/
lib/ctf-writer/resolve.c
+++ b/
lib/ctf-writer/resolve.c
@@
-38,7
+38,7
@@
#include <babeltrace/ctf-writer/resolve-internal.h>
#include <babeltrace/ctf-writer/stream-class.h>
#include <babeltrace/ctf-writer/utils-internal.h>
#include <babeltrace/ctf-writer/resolve-internal.h>
#include <babeltrace/ctf-writer/stream-class.h>
#include <babeltrace/ctf-writer/utils-internal.h>
-#include <babeltrace/
ref
.h>
+#include <babeltrace/
object
.h>
#include <babeltrace/types.h>
#include <babeltrace/values.h>
#include <glib.h>
#include <babeltrace/types.h>
#include <babeltrace/values.h>
#include <glib.h>
@@
-115,7
+115,7
@@
void type_stack_destroy_notify(gpointer data)
{
struct type_stack_frame *frame = data;
{
struct type_stack_frame *frame = data;
- BT_
PU
T(frame->type);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(frame->type);
g_free(frame);
}
g_free(frame);
}
@@
-165,7
+165,7
@@
int type_stack_push(type_stack *stack, struct bt_ctf_field_type_common *type)
BT_LOGV("Pushing field type on context's stack: "
"ft-addr=%p, stack-size-before=%u", type, stack->len);
BT_LOGV("Pushing field type on context's stack: "
"ft-addr=%p, stack-size-before=%u", type, stack->len);
- frame->type = bt_
get
(type);
+ frame->type = bt_
object_get_ref
(type);
g_ptr_array_add(stack, frame);
end:
g_ptr_array_add(stack, frame);
end:
@@
-402,7
+402,7
@@
int ptokens_to_field_path(GList *ptokens, struct bt_ctf_field_path *field_path,
bt_bool first_level_done = BT_FALSE;
/* Get our own reference */
bt_bool first_level_done = BT_FALSE;
/* Get our own reference */
- bt_
get
(type);
+ bt_
object_get_ref
(type);
/* Locate target */
while (cur_ptoken) {
/* Locate target */
while (cur_ptoken) {
@@
-460,12
+460,12
@@
int ptokens_to_field_path(GList *ptokens, struct bt_ctf_field_path *field_path,
}
/* Move child type to current type */
}
/* Move child type to current type */
- bt_
get
(child_type);
- BT_
MOVE
(type, child_type);
+ bt_
object_get_ref
(child_type);
+ BT_
OBJECT_MOVE_REF
(type, child_type);
}
end:
}
end:
- bt_
put
(type);
+ bt_
object_put_ref
(type);
return ret;
}
return ret;
}
@@
-617,7
+617,7
@@
int relative_ptokens_to_field_path(GList *ptokens,
}
end:
}
end:
- BT_
PU
T(tail_field_path);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(tail_field_path);
return ret;
}
return ret;
}
@@
-704,7
+704,7
@@
struct bt_ctf_field_path *pathstr_to_field_path(const char *pathstr,
end:
if (ret) {
end:
if (ret) {
- BT_
PU
T(field_path);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(field_path);
}
ptokens_destroy(ptokens);
}
ptokens_destroy(ptokens);
@@
-727,7
+727,7
@@
struct bt_ctf_field_type_common *field_path_to_field_type(
/* Start with root type */
type = get_type_from_ctx(ctx, field_path->root);
/* Start with root type */
type = get_type_from_ctx(ctx, field_path->root);
- bt_
get
(type);
+ bt_
object_get_ref
(type);
if (!type) {
/* Error: root type is not available */
BT_LOGW("Root field type is not available: root-scope=%s",
if (!type) {
/* Error: root type is not available */
BT_LOGW("Root field type is not available: root-scope=%s",
@@
-751,14
+751,14
@@
struct bt_ctf_field_type_common *field_path_to_field_type(
}
/* Move child type to current type */
}
/* Move child type to current type */
- bt_
get
(child_type);
- BT_
MOVE
(type, child_type);
+ bt_
object_get_ref
(child_type);
+ BT_
OBJECT_MOVE_REF
(type, child_type);
}
return type;
error:
}
return type;
error:
- BT_
PU
T(type);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(type);
return type;
}
return type;
}
@@
-792,7
+792,7
@@
struct bt_ctf_field_path *get_ctx_stack_field_path(struct resolve_context *ctx)
return field_path;
error:
return field_path;
error:
- BT_
PU
T(field_path);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(field_path);
return field_path;
}
return field_path;
}
@@
-988,7
+988,7
@@
int validate_target_field_path(struct bt_ctf_field_path *target_field_path,
}
end:
}
end:
- BT_
PU
T(ctx_field_path);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(ctx_field_path);
return ret;
}
return ret;
}
@@
-1104,8
+1104,8
@@
end:
g_string_free(target_field_path_pretty, TRUE);
}
g_string_free(target_field_path_pretty, TRUE);
}
- BT_
PU
T(target_field_path);
- BT_
PU
T(target_type);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(target_field_path);
+ BT_
OBJECT_PUT_REF_AND_RESE
T(target_type);
return ret;
}
return ret;
}
This page took
0.02597 seconds
and
4
git commands to generate.