bin: compile lttng-consumerd as a C++

[lttng-tools.git] / src / lib / lttng-ctl / event.c

diff --git a/src/lib/lttng-ctl/event.c b/src/lib/lttng-ctl/event.c
index 5785345cd1bdb703da157f428da38733aefc582f..c153b9187397ccb930d36704570c9b3e80e639c7 100644 (file)
--- a/src/lib/lttng-ctl/event.c
+++ b/src/lib/lttng-ctl/event.c
@@ -3,24 +3,13 @@
  *
  * Linux Trace Toolkit Control Library
  *
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <stddef.h>
 
 #include <common/error.h>
@@ -51,38 +40,7 @@ end:
        return event;
 error:
        free(event);
-       goto end;
-}
-
-struct lttng_event *lttng_event_copy(const struct lttng_event *event)
-{
-       struct lttng_event *new_event;
-       struct lttng_event_extended *new_event_extended;
-
-       new_event = zmalloc(sizeof(*event));
-       if (!new_event) {
-               PERROR("Error allocating event structure");
-               goto end;
-       }
-
-       /* Copy the content of the old event. */
-       memcpy(new_event, event, sizeof(*event));
-
-       /*
-        * We need to create a new extended since the previous pointer is now
-        * invalid.
-        */
-       new_event_extended = zmalloc(sizeof(*new_event_extended));
-       if (!new_event_extended) {
-               PERROR("Error allocating event extended structure");
-               goto error;
-       }
-
-       new_event->extended.ptr = new_event_extended;
-end:
-       return new_event;
-error:
-       free(new_event);
+       event = NULL;
        goto end;
 }
 
@@ -228,7 +186,7 @@ int lttng_event_set_userspace_probe_location(struct lttng_event *event,
        }
 
        event_extended = (struct lttng_event_extended *) event->extended.ptr;
-       assert(event_extended);
+       LTTNG_ASSERT(event_extended);
        if (event_extended->probe_location) {
                lttng_userspace_probe_location_destroy(
                        event_extended->probe_location);