Wibble

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5574

diff --git a/memcheck/tests/wrap1.c b/memcheck/tests/wrap1.c
index 1401cee7ad1c56646178f3776b0e80c6a73c8220..3746e826316575e7c762e5d681b1de991360cfea 100644 (file)
--- a/memcheck/tests/wrap1.c
+++ b/memcheck/tests/wrap1.c
@@ -17,10 +17,10 @@ void actual ( void )
    as if its soname was "NONE". */
 void I_WRAP_SONAME_FNNAME_ZU(NONE,actual) ( void )
 {
-   OrigFn orig;
-   VALGRIND_GET_ORIG_FN(orig);
+   OrigFn fn;
+   VALGRIND_GET_ORIG_FN(fn);
    printf("wrapper-pre\n");
-   CALL_FN_v_v(orig);
+   CALL_FN_v_v(fn);
    printf("wrapper-post\n");
 }
 

diff --git a/memcheck/tests/wrap2.c b/memcheck/tests/wrap2.c
index d5e79db04659801c707bc621a0e4ad0b7306e981..3ad8b93f7f5dc551c34025323ff279a4da0d9986 100644 (file)
--- a/memcheck/tests/wrap2.c
+++ b/memcheck/tests/wrap2.c
@@ -16,10 +16,10 @@ int fact ( int n )
 int I_WRAP_SONAME_FNNAME_ZU(NONE,fact) ( int n )
 {
    int    r;
-   OrigFn orig;
-   VALGRIND_GET_ORIG_FN(orig);
+   OrigFn fn;
+   VALGRIND_GET_ORIG_FN(fn);
    printf("in wrapper1-pre:  fact(%d)\n", n);
-   CALL_FN_W_W(r, orig, n);
+   CALL_FN_W_W(r, fn, n);
    printf("in wrapper1-post: fact(%d) = %d\n", n, r);
    return r;
 }

diff --git a/memcheck/tests/wrap7.c b/memcheck/tests/wrap7.c
index 5d76f3f192d109a73c180bbcb17a3fb60c07893c..cbb4e50f7d26e063d26b2232d4c45590b957ac1d 100644 (file)
--- a/memcheck/tests/wrap7.c
+++ b/memcheck/tests/wrap7.c
@@ -13,10 +13,10 @@ extern void actual ( void );
    "wrap7so.so". */
 void I_WRAP_SONAME_FNNAME_ZU(wrap7soZdso,actual) ( void )
 {
-   OrigFn orig;
-   VALGRIND_GET_ORIG_FN(orig);
+   OrigFn fn;
+   VALGRIND_GET_ORIG_FN(fn);
    printf("wrapper-pre\n");
-   CALL_FN_v_v(orig);
+   CALL_FN_v_v(fn);
    printf("wrapper-post\n");
 }