From: Jérémie Galarneau Date: Tue, 7 Jul 2015 20:16:34 +0000 (-0400) Subject: Rename plugin-internal.h to component-internal.h X-Git-Tag: v2.0.0-pre1~863 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=2f3f2972fbd624c4c05cf44cf4b971e9c1cc74cc Rename plugin-internal.h to component-internal.h Signed-off-by: Jérémie Galarneau --- diff --git a/include/babeltrace/plugin/component-internal.h b/include/babeltrace/plugin/component-internal.h new file mode 100644 index 00000000..3fc85c85 --- /dev/null +++ b/include/babeltrace/plugin/component-internal.h @@ -0,0 +1,67 @@ +#ifndef BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H +#define BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H + +/* + * BabelTrace - Component internal + * + * Copyright 2015 Jérémie Galarneau + * + * Author: Jérémie Galarneau + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct bt_notification; + +struct bt_component { + struct bt_ctf_ref ref_count; + GString *name; + enum bt_plugin_type type; + /** No ownership taken */ + FILE *error_stream; + + void *user_data; + bt_plugin_destroy_cb user_data_destroy; + bt_plugin_destroy_cb destroy; +}; + +BT_HIDDEN +enum bt_component_status bt_component_init(struct bt_component *plugin, + const char *name, void *user_data, + bt_component_destroy_cb destroy_func, + enum bt_component_type component_type, + bt_component_destroy_cb component_destroy); + +#ifdef __cplusplus +} +#endif + +#endif /* BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H */ diff --git a/include/babeltrace/plugin/plugin-internal.h b/include/babeltrace/plugin/plugin-internal.h deleted file mode 100644 index 3fc85c85..00000000 --- a/include/babeltrace/plugin/plugin-internal.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H -#define BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H - -/* - * BabelTrace - Component internal - * - * Copyright 2015 Jérémie Galarneau - * - * Author: Jérémie Galarneau - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct bt_notification; - -struct bt_component { - struct bt_ctf_ref ref_count; - GString *name; - enum bt_plugin_type type; - /** No ownership taken */ - FILE *error_stream; - - void *user_data; - bt_plugin_destroy_cb user_data_destroy; - bt_plugin_destroy_cb destroy; -}; - -BT_HIDDEN -enum bt_component_status bt_component_init(struct bt_component *plugin, - const char *name, void *user_data, - bt_component_destroy_cb destroy_func, - enum bt_component_type component_type, - bt_component_destroy_cb component_destroy); - -#ifdef __cplusplus -} -#endif - -#endif /* BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H */