X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Fcallbacks.h;h=bc75769d5021b6f1bc1fe569b53cef6e0b843fa1;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=43d7af1caeeec9804bcb123ab64f843a7c21c7f3;hpb=8a4722b0ccf5cf30ee76a85bdf6bea2fa0515153;p=babeltrace.git

diff --git a/include/babeltrace/ctf/callbacks.h b/include/babeltrace/ctf/callbacks.h
index 43d7af1c..bc75769d 100644
--- a/include/babeltrace/ctf/callbacks.h
+++ b/include/babeltrace/ctf/callbacks.h
@@ -21,10 +21,22 @@
  *
  * 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 <babeltrace/format.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Forward declarations */
 struct bt_ctf_iter;
 struct bt_dependencies;
@@ -39,13 +51,13 @@ enum bt_cb_ret {
 /*
  * Receives a variable number of strings as parameter, ended with NULL.
  */
-struct bt_dependencies *babeltrace_dependencies_create(const char *first, ...);
+struct bt_dependencies *bt_dependencies_create(const char *first, ...);
 
 /*
  * struct bt_dependencies must be destroyed explicitly if not passed as
  * parameter to a bt_ctf_iter_add_callback().
  */
-void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
+void bt_dependencies_destroy(struct bt_dependencies *dep);
 
 /*
  * bt_ctf_iter_add_callback: Add a callback to iterator.
@@ -58,13 +70,13 @@ void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
  *            
  * @callback: function pointer to call
  * @depends: struct bt_dependency detailing the required computation results.
- *           Ends with 0.
+ *           Ends with 0. NULL is accepted as empty dependency.
  * @weak_depends: struct bt_dependency detailing the optional computation
  *                results that can be optionally consumed by this
- *                callback.
+ *                callback. NULL is accepted as empty dependency.
  * @provides: struct bt_dependency detailing the computation results
  *            provided by this callback.
- *            Ends with 0.
+ *            Ends with 0. NULL is accepted as empty dependency.
  *
  * "depends", "weak_depends" and "provides" memory is handled by the
  * babeltrace library after this call succeeds or fails. These objects
@@ -84,7 +96,7 @@ void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
  */
 int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter,
 		bt_intern_str event, void *private_data, int flags,
-		enum bt_cb_ret (*callback)(struct ctf_event_definition *ctf_data,
+		enum bt_cb_ret (*callback)(struct bt_ctf_event *ctf_data,
 					   void *caller_data),
 		struct bt_dependencies *depends,
 		struct bt_dependencies *weak_depends,
@@ -97,4 +109,8 @@ enum {
 	BT_FLAGS_FREE_PRIVATE_DATA	= (1 << 0),
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*_BABELTRACE_CTF_CALLBACKS_H */