Fix two "return" issues in x86/ffi64.c (#431)

tromey · atgreen · commit 4c2206ace07f · 2018-04-28T06:46:10.000-04:00
Issue #70 pointed out that at least one compiler didn't like:

    return ffi_call_efi64(cif, fn, rvalue, avalue);

... where the return type is "void".  This patch splits the statement
into two.

I also noticed that ffi_call_go here seems to do a double call.  I
suspect a "return" is missing here, so this patch adds it as well.
diff --git a/src/x86/ffi64.c b/src/x86/ffi64.c
@@ -678,7 +678,10 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
 {
 #ifndef __ILP32__
   if (cif->abi == FFI_EFI64)
-    return ffi_call_efi64(cif, fn, rvalue, avalue);
+    {
+      ffi_call_efi64(cif, fn, rvalue, avalue);
+      return;
+    }
 #endif
   ffi_call_int (cif, fn, rvalue, avalue, NULL);
 }
@@ -695,7 +698,10 @@ ffi_call_go (ffi_cif *cif, void (*fn)(void), void *rvalue,
 {
 #ifndef __ILP32__
   if (cif->abi == FFI_EFI64)
-    ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);
+    {
+      ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);
+      return;
+    }
 #endif
   ffi_call_int (cif, fn, rvalue, avalue, closure);
 }

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,10 @@ ffi_call (ffi_cif cif, void (fn)(void), void rvalue, void *avalue)`
`678`	`678`	`{`
`679`	`679`	`#ifndef __ILP32__`
`680`	`680`	`if (cif->abi == FFI_EFI64)`
`681`		`- return ffi_call_efi64(cif, fn, rvalue, avalue);`
	`681`	`+ {`
	`682`	`+ ffi_call_efi64(cif, fn, rvalue, avalue);`
	`683`	`+ return;`
	`684`	`+ }`
`682`	`685`	`#endif`
`683`	`686`	`ffi_call_int (cif, fn, rvalue, avalue, NULL);`
`684`	`687`	`}`
`@@ -695,7 +698,10 @@ ffi_call_go (ffi_cif cif, void (fn)(void), void *rvalue,`
`695`	`698`	`{`
`696`	`699`	`#ifndef __ILP32__`
`697`	`700`	`if (cif->abi == FFI_EFI64)`
`698`		`- ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);`
	`701`	`+ {`
	`702`	`+ ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);`
	`703`	`+ return;`
	`704`	`+ }`
`699`	`705`	`#endif`
`700`	`706`	`ffi_call_int (cif, fn, rvalue, avalue, closure);`
`701`	`707`	`}`