diff options
author | Tom Tromey <tom@tromey.com> | 2018-09-14 06:57:05 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2018-09-14 07:11:50 -0600 |
commit | b4b08fa2aa25f245c77921ad2405c15d30e421ed (patch) | |
tree | cad0ec90effe59ce27b927f314080800dd9e669f /gdb/infcall.c | |
parent | fe75f42ee15944a0d14d3d42b242676fc2417352 (diff) | |
download | gdb-b4b08fa2aa25f245c77921ad2405c15d30e421ed.zip gdb-b4b08fa2aa25f245c77921ad2405c15d30e421ed.tar.gz gdb-b4b08fa2aa25f245c77921ad2405c15d30e421ed.tar.bz2 |
Remove an unnecessary block in call_function_by_hand_dummy
I noticed that call_function_by_hand_dummy has a block that only
exists to declare a variable, like:
{
int i;
for (i = ...0)
...
}
This patch removes the unnecessary and the extra indentation by moving
the declaration into the "for".
gdb/ChangeLog
2018-09-14 Tom Tromey <tom@tromey.com>
* infcall.c (call_function_by_hand_dummy): Remove unnecessary
block.
Diffstat (limited to 'gdb/infcall.c')
-rw-r--r-- | gdb/infcall.c | 74 |
1 files changed, 35 insertions, 39 deletions
diff --git a/gdb/infcall.c b/gdb/infcall.c index b2d1205..7b1d44c 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -970,50 +970,46 @@ call_function_by_hand_dummy (struct value *function, if (nargs < TYPE_NFIELDS (ftype)) error (_("Too few arguments in function call.")); - { - int i; - - for (i = nargs - 1; i >= 0; i--) - { - int prototyped; - struct type *param_type; + for (int i = nargs - 1; i >= 0; i--) + { + int prototyped; + struct type *param_type; - /* FIXME drow/2002-05-31: Should just always mark methods as - prototyped. Can we respect TYPE_VARARGS? Probably not. */ - if (TYPE_CODE (ftype) == TYPE_CODE_METHOD) + /* FIXME drow/2002-05-31: Should just always mark methods as + prototyped. Can we respect TYPE_VARARGS? Probably not. */ + if (TYPE_CODE (ftype) == TYPE_CODE_METHOD) + prototyped = 1; + if (TYPE_TARGET_TYPE (ftype) == NULL && TYPE_NFIELDS (ftype) == 0 + && default_return_type != NULL) + { + /* Calling a no-debug function with the return type + explicitly cast. Assume the function is prototyped, + with a prototype matching the types of the arguments. + E.g., with: + float mult (float v1, float v2) { return v1 * v2; } + This: + (gdb) p (float) mult (2.0f, 3.0f) + Is a simpler alternative to: + (gdb) p ((float (*) (float, float)) mult) (2.0f, 3.0f) + */ prototyped = 1; - if (TYPE_TARGET_TYPE (ftype) == NULL && TYPE_NFIELDS (ftype) == 0 - && default_return_type != NULL) - { - /* Calling a no-debug function with the return type - explicitly cast. Assume the function is prototyped, - with a prototype matching the types of the arguments. - E.g., with: - float mult (float v1, float v2) { return v1 * v2; } - This: - (gdb) p (float) mult (2.0f, 3.0f) - Is a simpler alternative to: - (gdb) p ((float (*) (float, float)) mult) (2.0f, 3.0f) - */ - prototyped = 1; - } - else if (i < TYPE_NFIELDS (ftype)) - prototyped = TYPE_PROTOTYPED (ftype); - else - prototyped = 0; + } + else if (i < TYPE_NFIELDS (ftype)) + prototyped = TYPE_PROTOTYPED (ftype); + else + prototyped = 0; - if (i < TYPE_NFIELDS (ftype)) - param_type = TYPE_FIELD_TYPE (ftype, i); - else - param_type = NULL; + if (i < TYPE_NFIELDS (ftype)) + param_type = TYPE_FIELD_TYPE (ftype, i); + else + param_type = NULL; - args[i] = value_arg_coerce (gdbarch, args[i], - param_type, prototyped, &sp); + args[i] = value_arg_coerce (gdbarch, args[i], + param_type, prototyped, &sp); - if (param_type != NULL && language_pass_by_reference (param_type)) - args[i] = value_addr (args[i]); - } - } + if (param_type != NULL && language_pass_by_reference (param_type)) + args[i] = value_addr (args[i]); + } /* Reserve space for the return structure to be written on the stack, if necessary. Make certain that the value is correctly |