From: Julian Seward <jseward@acm.org>
Date: Fri, 20 Jan 2006 16:47:20 +0000 (+0000)
Subject: Wibble
X-Git-Tag: svn/VALGRIND_3_2_0~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e05481ea7acb6097b3b3430e6f0577769b0678f0;p=thirdparty%2Fvalgrind.git

Wibble


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

diff --git a/memcheck/tests/wrap1.c b/memcheck/tests/wrap1.c
index 1401cee7ad..3746e82631 100644
--- 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 d5e79db046..3ad8b93f7f 100644
--- 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 5d76f3f192..cbb4e50f7d 100644
--- 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");
 }