diff options
| author | DJ Delorie <dj@redhat.com> | 2012-04-10 17:07:35 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2012-04-10 17:07:35 +0000 |
| commit | b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94 (patch) | |
| tree | f550ac103a3bdbf60f410fce463379436838e1d5 /libiberty | |
| parent | 9a82b8ff879eb1e69e4050c2d79f299443a2b613 (diff) | |
| download | gdb-b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94.zip gdb-b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94.tar.gz gdb-b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/pex-unix.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 4a3f803..4f8bc3f 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2012-04-04 Tristan Gingold <gingold@adacore.com> + + * pex-unix.c (to_ptr32): Fix style. + 2012-04-02 Tristan Gingold <gingold@adacore.com> * stack-limit.c: Includes ansidecl.h. diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c index 8d5145c..addf8ee 100644 --- a/libiberty/pex-unix.c +++ b/libiberty/pex-unix.c @@ -85,13 +85,15 @@ to_ptr32 (char **ptr64) int argc; __char_ptr_char_ptr32 short_argv; - for (argc=0; ptr64[argc]; argc++); + /* Count number of arguments. */ + for (argc = 0; ptr64[argc] != NULL; argc++) + ; /* Reallocate argv with 32 bit pointers. */ short_argv = (__char_ptr_char_ptr32) decc$malloc (sizeof (__char_ptr32) * (argc + 1)); - for (argc=0; ptr64[argc]; argc++) + for (argc = 0; ptr64[argc] != NULL; argc++) short_argv[argc] = (__char_ptr32) decc$strdup (ptr64[argc]); short_argv[argc] = (__char_ptr32) 0; |