projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update licensing info
[lttng-modules.git]
/
ltt-context.c
diff --git
a/ltt-context.c
b/ltt-context.c
index 89e54bf80dd7980647018e63075b8692629ed601..8f00bb1bd0067437170efa7aaecd23df8768212e 100644
(file)
--- a/
ltt-context.c
+++ b/
ltt-context.c
@@
-4,6
+4,8
@@
* Copyright 2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* LTTng trace/channel/event context management.
* Copyright 2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* LTTng trace/channel/event context management.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
*/
#include <linux/module.h>
*/
#include <linux/module.h>
@@
-28,12
+30,12
@@
struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
if (ctx->nr_fields + 1 > ctx->allocated_fields) {
struct lttng_ctx_field *new_fields;
if (ctx->nr_fields + 1 > ctx->allocated_fields) {
struct lttng_ctx_field *new_fields;
- ctx->allocated_fields = m
in
_t(size_t, 1, 2 * ctx->allocated_fields);
+ ctx->allocated_fields = m
ax
_t(size_t, 1, 2 * ctx->allocated_fields);
new_fields = kzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
if (!new_fields)
return NULL;
if (ctx->fields)
new_fields = kzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
if (!new_fields)
return NULL;
if (ctx->fields)
- memcpy(new_fields, ctx->fields, ctx->nr_fields);
+ memcpy(new_fields, ctx->fields,
sizeof(*ctx->fields) *
ctx->nr_fields);
kfree(ctx->fields);
ctx->fields = new_fields;
}
kfree(ctx->fields);
ctx->fields = new_fields;
}
@@
-47,6
+49,8
@@
void lttng_destroy_context(struct lttng_ctx *ctx)
{
int i;
{
int i;
+ if (!ctx)
+ return;
for (i = 0; i < ctx->nr_fields; i++) {
if (ctx->fields[i].destroy)
ctx->fields[i].destroy(&ctx->fields[i]);
for (i = 0; i < ctx->nr_fields; i++) {
if (ctx->fields[i].destroy)
ctx->fields[i].destroy(&ctx->fields[i]);
This page took
0.023692 seconds
and
4
git commands to generate.