ffi.c (ffi_prep_incoming_args_SYSV): Remove avn here too.

2002-05-28  Bo Thorsen  <bo@suse.de>

	* src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove avn
	here too.

From-SVN: r53954

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index a18c688c705520be715ed026eb4311b797f0cb04..ae3c0d6a8bea16f022d940622caa0668a4c3dfa6 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Bo Thorsen  <bo@suse.de>
+
+       * src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove avn
+       here too.
+
 2002-05-27  Roger Sayle  <roger@eyesopen.com>
 
        * src/x86/ffi.c (ffi_prep_args): Remove reference to avn.

diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c
index ee676339c2e5cbc87702dca26ced803462fd5c7f..acc6529bb14e5f588391e7af4aa8d6ac303ded26 100644 (file)
--- a/libffi/src/x86/ffi.c
+++ b/libffi/src/x86/ffi.c
@@ -267,7 +267,6 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue,
 {
   register unsigned int i;
   register int tmp;
-  register unsigned int avn;
   register void **p_argv;
   register char *argp;
   register ffi_type **p_arg;
@@ -280,35 +279,26 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue,
     argp += 4;
   }
 
-  avn = cif->nargs;
   p_argv = avalue;
 
-  for (i = cif->nargs, p_arg = cif->arg_types;
-       (i != 0) && (avn != 0);
-       i--, p_arg++)
+  for (i = cif->nargs, p_arg = cif->arg_types; i != 0; i--, p_arg++)
     {
       size_t z;
 
       /* Align if necessary */
-      if (((*p_arg)->alignment - 1) & (unsigned) argp) {
+      if (((*p_arg)->alignment - 1) & (unsigned) argp)
        argp = (char *) ALIGN(argp, (*p_arg)->alignment);
-      }
 
-      if (avn != 0) 
-       {
-         avn--;
-         z = (*p_arg)->size;
+      z = (*p_arg)->size;
 
-         /* because we're little endian, this is 
-            what it turns into.   */
+      /* because we're little endian, this is what it turns into.   */
 
-         *p_argv = (void*) argp;
+      *p_argv = (void*) argp;
 
-         p_argv++;
-         argp += z;
-       }
+      p_argv++;
+      argp += z;
     }
-  
+
   return;
 }