From 2021ad3a8c483c6dbd58652c9d72777712472fe7 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Mon, 14 Mar 2011 16:55:04 +0000 Subject: [PATCH] Fix ARI warning about function names in first column. Put prototype declaration on same line as return type. * objc-exp.y: Ditto. * p-exp.y: Ditto. * python/py-stopevent.h: Ditto. For long function names, split parameters to allow function name on same line as return type. * solib-pa64.c: Ditto. * varobj.c: Ditto. * varobj.h: Ditto. For long function declaration, use single line. * hppa-tdep.h: Ditto. * inferior.h: Ditto. --- gdb/ChangeLog | 16 ++++++++++++++++ gdb/hppa-tdep.h | 3 +-- gdb/inferior.h | 3 +-- gdb/objc-exp.y | 12 ++++-------- gdb/p-exp.y | 6 ++---- gdb/python/py-stopevent.h | 6 ++---- gdb/solib-pa64.c | 4 ++-- gdb/varobj.c | 5 +++-- gdb/varobj.h | 4 ++-- 9 files changed, 33 insertions(+), 26 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4662422dd14..32294ebac47 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,19 @@ +2011-03-14 Pierre Muller + + Fix ARI warning about function names in first column. + Put prototype declaration on same line as return type. + * objc-exp.y: Ditto. + * p-exp.y: Ditto. + * python/py-stopevent.h: Ditto. + For long function names, split parameters to + allow function name on same line as return type. + * solib-pa64.c: Ditto. + * varobj.c: Ditto. + * varobj.h: Ditto. + For long function declaration, use single line. + * hppa-tdep.h: Ditto. + * inferior.h: Ditto. + 2011-03-14 Phil Muldoon * python/python.h: Declare gdbpy_should_stop and diff --git a/gdb/hppa-tdep.h b/gdb/hppa-tdep.h index 4afb0302aa5..f961258899a 100644 --- a/gdb/hppa-tdep.h +++ b/gdb/hppa-tdep.h @@ -240,8 +240,7 @@ extern struct minimal_symbol * hppa_lookup_stub_minimal_symbol (const char *name, enum unwind_stub_types stub_type); -extern struct hppa_objfile_private * -hppa_init_objfile_priv_data (struct objfile *objfile); +extern struct hppa_objfile_private * hppa_init_objfile_priv_data (struct objfile *objfile); extern int hppa_in_solib_call_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, char *name); diff --git a/gdb/inferior.h b/gdb/inferior.h index 13a06d902e6..9f33ae8e4b0 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -366,8 +366,7 @@ extern int debug_displaced; void displaced_step_dump_bytes (struct ui_file *file, const gdb_byte *buf, size_t len); -struct displaced_step_closure* -get_displaced_step_closure_by_addr (CORE_ADDR addr); +struct displaced_step_closure* get_displaced_step_closure_by_addr (CORE_ADDR addr); /* Possible values for gdbarch_call_dummy_location. */ #define ON_STACK 1 diff --git a/gdb/objc-exp.y b/gdb/objc-exp.y index c1e26321b46..d2f193a97b9 100644 --- a/gdb/objc-exp.y +++ b/gdb/objc-exp.y @@ -107,14 +107,11 @@ #define YYDEBUG 0 /* Default to no yydebug support. */ #endif -int -yyparse (void); +int yyparse (void); -static int -yylex (void); +static int yylex (void); -void -yyerror (char *); +void yyerror (char *); %} @@ -150,8 +147,7 @@ yyerror (char *); %{ /* YYSTYPE gets defined by %union. */ -static int -parse_number (char *, int, int, YYSTYPE *); +static int parse_number (char *, int, int, YYSTYPE *); %} %type exp exp1 type_exp start variable qualified_name lcurly diff --git a/gdb/p-exp.y b/gdb/p-exp.y index e0dba8f1589..183f001335d 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -117,8 +117,7 @@ int yyparse (void); static int yylex (void); -void -yyerror (char *); +void yyerror (char *); static char * uptok (char *, int); %} @@ -154,8 +153,7 @@ static char * uptok (char *, int); %{ /* YYSTYPE gets defined by %union */ -static int -parse_number (char *, int, int, YYSTYPE *); +static int parse_number (char *, int, int, YYSTYPE *); static struct type *current_type; static struct internalvar *intvar; diff --git a/gdb/python/py-stopevent.h b/gdb/python/py-stopevent.h index 690cbbd05f7..52f3511df39 100644 --- a/gdb/python/py-stopevent.h +++ b/gdb/python/py-stopevent.h @@ -28,10 +28,8 @@ extern void stop_evpy_dealloc (PyObject *self); extern int emit_stop_event (struct bpstats *bs, enum target_signal stop_signal); -extern PyObject * -create_breakpoint_event_object (PyObject *breakpoint); +extern PyObject *create_breakpoint_event_object (PyObject *breakpoint); -extern PyObject * -create_signal_event_object (enum target_signal stop_signal); +extern PyObject *create_signal_event_object (enum target_signal stop_signal); #endif /* GDB_PY_STOPEVENT_H */ diff --git a/gdb/solib-pa64.c b/gdb/solib-pa64.c index f7d7b6f9ac9..cd387287e53 100644 --- a/gdb/solib-pa64.c +++ b/gdb/solib-pa64.c @@ -76,8 +76,8 @@ dld_cache_t; static dld_cache_t dld_cache; -static int -read_dynamic_info (asection *dyninfo_sect, dld_cache_t *dld_cache_p); +static int read_dynamic_info (asection *dyninfo_sect, + dld_cache_t *dld_cache_p); static void pa64_relocate_section_addresses (struct so_list *so, diff --git a/gdb/varobj.c b/gdb/varobj.c index 12b0b160125..103ee99266e 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -296,8 +296,9 @@ static int is_root_p (struct varobj *var); #if HAVE_PYTHON -static struct varobj * -varobj_add_child (struct varobj *var, const char *name, struct value *value); +static struct varobj * varobj_add_child (struct varobj *var, + const char *name, + struct value *value); #endif /* HAVE_PYTHON */ diff --git a/gdb/varobj.h b/gdb/varobj.h index 81ba05eb7ad..ef984c8cb99 100644 --- a/gdb/varobj.h +++ b/gdb/varobj.h @@ -167,8 +167,8 @@ extern int varobj_editable_p (struct varobj *var); extern int varobj_floating_p (struct varobj *var); -extern void -varobj_set_visualizer (struct varobj *var, const char *visualizer); +extern void varobj_set_visualizer (struct varobj *var, + const char *visualizer); extern void varobj_enable_pretty_printing (void); -- 2.30.2