diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/solib-svr4.c | 34 |
2 files changed, 20 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 00552fed0e8..931fb05f025 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-10-02 Jan Kratochvil <jan.kratochvil@redhat.com> + + Code cleanup. + * solib-svr4.c (svr4_default_sos): Remove variables head and link_ptr. + Rearrange the code for it. + 2011-10-02 Joel Brobecker <brobecker@adacore.com> * breakpoint.c (bkpt_print_recreate): Add call to diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index d58ca1a26e0..11ecf874e00 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -949,32 +949,26 @@ static struct so_list * svr4_default_sos (void) { struct svr4_info *info = get_svr4_info (); + struct so_list *new; - struct so_list *head = NULL; - struct so_list **link_ptr = &head; - - if (info->debug_loader_offset_p) - { - struct so_list *new = XZALLOC (struct so_list); + if (!info->debug_loader_offset_p) + return NULL; - new->lm_info = xmalloc (sizeof (struct lm_info)); + new = XZALLOC (struct so_list); - /* Nothing will ever check the cached copy of the link - map if we set l_addr. */ - new->lm_info->l_addr = info->debug_loader_offset; - new->lm_info->lm_addr = 0; - new->lm_info->lm = NULL; + new->lm_info = xmalloc (sizeof (struct lm_info)); - strncpy (new->so_name, info->debug_loader_name, - SO_NAME_MAX_PATH_SIZE - 1); - new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; - strcpy (new->so_original_name, new->so_name); + /* Nothing will ever check the cached copy of the link + map if we set l_addr. */ + new->lm_info->l_addr = info->debug_loader_offset; + new->lm_info->lm_addr = 0; + new->lm_info->lm = NULL; - *link_ptr = new; - link_ptr = &new->next; - } + strncpy (new->so_name, info->debug_loader_name, SO_NAME_MAX_PATH_SIZE - 1); + new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; + strcpy (new->so_original_name, new->so_name); - return head; + return new; } /* Implement the "current_sos" target_so_ops method. */ |