From fe978cb071b460b2d4aed2f9a71d895f84efce0e Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 27 Feb 2015 16:33:07 +0000 Subject: C++ keyword cleanliness, mostly auto-generated This patch renames symbols that happen to have names which are reserved keywords in C++. Most of this was generated with Tromey's cxx-conversion.el script. Some places where later hand massaged a bit, to fix formatting, etc. And this was rebased several times meanwhile, along with re-running the script, so re-running the script from scratch probably does not result in the exact same output. I don't think that matters anyway. gdb/ 2015-02-27 Tom Tromey Pedro Alves Rename symbols whose names are reserved C++ keywords throughout. gdb/gdbserver/ 2015-02-27 Tom Tromey Pedro Alves Rename symbols whose names are reserved C++ keywords throughout. --- gdb/solib-darwin.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gdb/solib-darwin.c') diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c index d742f82..f96841f 100644 --- a/gdb/solib-darwin.c +++ b/gdb/solib-darwin.c @@ -271,7 +271,7 @@ darwin_current_sos (void) char *file_path; int errcode; struct darwin_so_list *dnew; - struct so_list *new; + struct so_list *newobj; struct cleanup *old_chain; /* Read image info from inferior. */ @@ -302,22 +302,22 @@ darwin_current_sos (void) /* Create and fill the new so_list element. */ dnew = XCNEW (struct darwin_so_list); - new = &dnew->sl; + newobj = &dnew->sl; old_chain = make_cleanup (xfree, dnew); - new->lm_info = &dnew->li; + newobj->lm_info = &dnew->li; - strncpy (new->so_name, file_path, SO_NAME_MAX_PATH_SIZE - 1); - new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; - strcpy (new->so_original_name, new->so_name); + strncpy (newobj->so_name, file_path, SO_NAME_MAX_PATH_SIZE - 1); + newobj->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; + strcpy (newobj->so_original_name, newobj->so_name); xfree (file_path); - new->lm_info->lm_addr = load_addr; + newobj->lm_info->lm_addr = load_addr; if (head == NULL) - head = new; + head = newobj; else - tail->next = new; - tail = new; + tail->next = newobj; + tail = newobj; discard_cleanups (old_chain); } -- cgit v1.1