diff options
| author | Pedro Alves <palves@redhat.com> | 2015-02-27 16:33:07 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-02-27 16:33:07 +0000 |
| commit | fe978cb071b460b2d4aed2f9a71d895f84efce0e (patch) | |
| tree | 65d107663745fc7872e680feea9ec2fa6a4949ad /gdb/solib-spu.c | |
| parent | 3bc3d82a005466a66fa22f704c90f4486ca71344 (diff) | |
| download | gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.zip gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.tar.gz gdb-fe978cb071b460b2d4aed2f9a71d895f84efce0e.tar.bz2 | |
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 <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
Rename symbols whose names are reserved C++ keywords throughout.
gdb/gdbserver/
2015-02-27 Tom Tromey <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
Rename symbols whose names are reserved C++ keywords throughout.
Diffstat (limited to 'gdb/solib-spu.c')
| -rw-r--r-- | gdb/solib-spu.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c index 6145112..3c8cd1a 100644 --- a/gdb/solib-spu.c +++ b/gdb/solib-spu.c @@ -119,19 +119,19 @@ append_ocl_sos (struct so_list **link_ptr) byte_order); if (data != 0x0) { - struct so_list *new; + struct so_list *newobj; /* Allocate so_list structure. */ - new = XCNEW (struct so_list); + newobj = XCNEW (struct so_list); /* Encode FD and object ID in path name. */ - xsnprintf (new->so_name, sizeof new->so_name, "@%s <%d>", + xsnprintf (newobj->so_name, sizeof newobj->so_name, "@%s <%d>", hex_string (data), SPUADDR_SPU (*ocl_program_addr_base)); - strcpy (new->so_original_name, new->so_name); + strcpy (newobj->so_original_name, newobj->so_name); - *link_ptr = new; - link_ptr = &new->next; + *link_ptr = newobj; + link_ptr = &newobj->next; } } if (ex.reason < 0) @@ -195,7 +195,7 @@ spu_current_sos (void) for (i = 0; i < size; i += 4) { int fd = extract_unsigned_integer (buf + i, 4, byte_order); - struct so_list *new; + struct so_list *newobj; unsigned long long addr; char annex[32], id[100]; @@ -214,16 +214,16 @@ spu_current_sos (void) continue; /* Allocate so_list structure. */ - new = XCNEW (struct so_list); + newobj = XCNEW (struct so_list); /* Encode FD and object ID in path name. Choose the name so as not to conflict with any (normal) SVR4 library path name. */ - xsnprintf (new->so_name, sizeof new->so_name, "@%s <%d>", + xsnprintf (newobj->so_name, sizeof newobj->so_name, "@%s <%d>", hex_string (addr), fd); - strcpy (new->so_original_name, new->so_name); + strcpy (newobj->so_original_name, newobj->so_name); - *link_ptr = new; - link_ptr = &new->next; + *link_ptr = newobj; + link_ptr = &newobj->next; } /* Append OpenCL sos. */ |