From 334bf95f53651fb040c541a972284def694377e7 Mon Sep 17 00:00:00 2001 From: Justin Seyster Date: Wed, 27 Oct 2010 17:02:52 -0400 Subject: [PATCH] Changed aop_capture_return_value to aop_capture_call_return_value --- src/aop-doxy-main.c | 12 ++++++------ src/aop-pc-fun-call.c | 13 +++++++------ src/aop-weave.c | 4 ++-- src/aop.h | 5 +++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/aop-doxy-main.c b/src/aop-doxy-main.c index 5a81972..3e06d0f 100644 --- a/src/aop-doxy-main.c +++ b/src/aop-doxy-main.c @@ -167,18 +167,18 @@ * * An aop_dynval serves as a placeholder during compile time for a * value that will not be known until runtime. An aop_dynval gets - * returned by a capture function, such as aop_capture_return_value(), - * and can be passed to an advice function inserted with - * aop_insert_advice(). + * returned by a capture function, such as + * aop_capture_call_return_value(), and can be passed to an advice + * function inserted with aop_insert_advice(). * * Internally, every aop_dynval has its own type, which is determined * by how it was captured. For example, an aop_dynval created with - * aop_capture_return_value() will have its type set based on how the - * corresponding pointcut was filtered using + * aop_capture_call_return_value() will have its type set based on how + * the corresponding pointcut was filtered using * aop_filter_call_pc_by_return_type(). (It is an error to capture * the return value of a function call when the corresponding pointcut * was not filtered by type. You must use - * aop_capture_return_value_by_type() instead.) + * aop_capture_call_return_value_by_type() instead.) * * At runtime, the advice function itself simply gets the captured * value; it will never see the original aop_dynval object. diff --git a/src/aop-pc-fun-call.c b/src/aop-pc-fun-call.c index 8e094f8..16e3d8a 100644 --- a/src/aop-pc-fun-call.c +++ b/src/aop-pc-fun-call.c @@ -401,8 +401,8 @@ op_get_return_value (struct aop_dynval *dv) /** * Filter a function call pointcut to only include calls to functions * with a specified return type. Note that you must filter a pointcut - * by return type in order to call aop_capture_return_value() on any - * of its join points. + * by return type in order to call aop_capture_call_return_value() on + * any of its join points. * \param pc The function call pointcut to filter. Function call * pointcuts are created with aop_match_function_call(). * \param type The return type to filter by. @@ -443,7 +443,8 @@ aop_capture_called_function_name(struct aop_joinpoint *jp) /** * Get a dynval representing a function call's return value. Note * that you must filter with aop_filter_call_pc_by_return_type() in - * order to capture the return value using aop_capture_return_value(). + * order to capture the return value using + * aop_capture_call_return_value(). * * Note that it is illegal to pass the resulting aop_dynval to * aop_insert_advice() with #AOP_INSERT_BEFORE, as that would require @@ -454,7 +455,7 @@ aop_capture_called_function_name(struct aop_joinpoint *jp) * aop_filter_call_pc_by_return_type(). */ struct aop_dynval * -aop_capture_return_value (struct aop_joinpoint *jp) +aop_capture_call_return_value (struct aop_joinpoint *jp) { struct aop_pointcut *pc; struct aop_dynval *dv; @@ -490,8 +491,8 @@ aop_capture_return_value (struct aop_joinpoint *jp) * NULL if the return value does not match the specified type. */ struct aop_dynval * -aop_capture_return_value_by_type (struct aop_joinpoint *jp, - const struct aop_type *type) +aop_capture_call_return_value_by_type (struct aop_joinpoint *jp, + const struct aop_type *type) { struct aop_pointcut *pc; struct aop_dynval *dv; diff --git a/src/aop-weave.c b/src/aop-weave.c index 64bf740..8f45418 100644 --- a/src/aop-weave.c +++ b/src/aop-weave.c @@ -115,8 +115,8 @@ verify_legal_in_before_advice (struct aop_dynval *dv) switch (dv->kind) { case ADV_FUN_RETVAL: - fatal_error("(InterAspect) Attempt to capture return value in" - " before advice (see aop_capture_return_value()" + fatal_error("(InterAspect) Attempt to capture return value in before" + " advice (see aop_capture_call_return_value()" " documentation)."); default: break; /* Permitted. */ diff --git a/src/aop.h b/src/aop.h index c0108e9..cac5fec 100644 --- a/src/aop.h +++ b/src/aop.h @@ -354,8 +354,9 @@ extern void aop_filter_call_pc_by_return_type (struct aop_pointcut *pc, const struct aop_type *type); extern const char *aop_capture_called_function_name(struct aop_joinpoint *jp); -extern struct aop_dynval *aop_capture_return_value (struct aop_joinpoint *jp); -extern struct aop_dynval *aop_capture_return_value_by_type ( +extern struct aop_dynval *aop_capture_call_return_value ( + struct aop_joinpoint *jp); +extern struct aop_dynval *aop_capture_call_return_value_by_type ( struct aop_joinpoint *jp, const struct aop_type *type); extern struct aop_dynval *aop_capture_call_param (struct aop_joinpoint *jp, int param_index); -- 2.34.1