mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-29 16:01:38 +00:00
Invocation fixups
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16412 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b3bd3dc830
commit
898deae09b
3 changed files with 20 additions and 10 deletions
|
@ -674,7 +674,7 @@ callframe_build_return (NSInvocation *inv,
|
|||
{
|
||||
/* Step through all the arguments, finding the ones that were
|
||||
passed by reference. */
|
||||
for (tmptype = objc_skip_argspec (tmptype), argnum = 0;
|
||||
for (tmptype = objc_skip_argspec (tmptype), argnum = 0;
|
||||
*tmptype != '\0';
|
||||
tmptype = objc_skip_argspec (tmptype), argnum++)
|
||||
{
|
||||
|
@ -694,9 +694,10 @@ callframe_build_return (NSInvocation *inv,
|
|||
ctxt->flags = flags;
|
||||
|
||||
if (*tmptype == _C_PTR
|
||||
&& ((flags & _F_OUT) || !(flags & _F_IN)))
|
||||
&& ((flags & _F_OUT) || !(flags & _F_IN)))
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
/* The argument is a pointer (to a non-char), and
|
||||
the pointer's value is qualified as an OUT
|
||||
parameter, or it not explicitly qualified as an
|
||||
|
@ -705,11 +706,12 @@ callframe_build_return (NSInvocation *inv,
|
|||
tmptype++;
|
||||
ctxt->type = tmptype;
|
||||
|
||||
(*decoder) (ctxt);
|
||||
/* Copy the pointed-to data back to the original
|
||||
pointer */
|
||||
/* Use the original pointer to find the buffer
|
||||
* to store the returned data */
|
||||
[inv getArgument: &ptr atIndex: argnum];
|
||||
memcpy(ptr, datum, objc_sizeof_type(tmptype));
|
||||
ctxt->datum = ptr;
|
||||
|
||||
(*decoder) (ctxt);
|
||||
}
|
||||
else if (*tmptype == _C_CHARPTR
|
||||
&& ((flags & _F_OUT) || !(flags & _F_IN)))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue