diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2018-10-09 15:06:46 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-10-09 15:06:46 +0000 |
| commit | 005f870e9145c83cba08cab71ed9c0de5bb08e2c (patch) | |
| tree | 24092813a3bc51a0549f2115239c80f287591877 /gcc/ada/adaint.c | |
| parent | ea891b439e876000d139e45f44c49b9436d195a4 (diff) | |
| download | gcc-005f870e9145c83cba08cab71ed9c0de5bb08e2c.zip gcc-005f870e9145c83cba08cab71ed9c0de5bb08e2c.tar.gz gcc-005f870e9145c83cba08cab71ed9c0de5bb08e2c.tar.bz2 | |
[Ada] Minor tweaks to suppress warnings
2018-10-09 Eric Botcazou <ebotcazou@adacore.com>
gcc/ada/
* adaint.c (__gnat_get_executable_suffix_ptr): Add new line.
(__gnat_locate_exec): Check that HOST_EXECUTABLE_SUFFIX is not
empty before doing a string search for it.
* socket.c (ATTRIBUTE_UNUSED): Define.
(__gnat_disable_sigpipe): Add ATTRIBUTE_UNUSED on parameter.
* terminals.c (ATTRIBUTE_UNUSED): Move around.
(__gnat_setup_child_communication): Add ATTRIBUTE_UNUSED on
parameter.
(__gnat_send_header): Add ATTRIBUTE_UNUSED on parameters.
From-SVN: r264982
Diffstat (limited to 'gcc/ada/adaint.c')
| -rw-r--r-- | gcc/ada/adaint.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 2bd033a..88500a6 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -662,6 +662,7 @@ void __gnat_get_executable_suffix_ptr (int *len, const char **value) { *value = HOST_EXECUTABLE_SUFFIX; + if (!*value) *len = 0; else @@ -2893,12 +2894,12 @@ __gnat_locate_regular_file (char *file_name, char *path_val) char * __gnat_locate_exec (char *exec_name, char *path_val) { + const unsigned int len = strlen (HOST_EXECUTABLE_SUFFIX); char *ptr; - if (!strstr (exec_name, HOST_EXECUTABLE_SUFFIX)) + + if (len > 0 && !strstr (exec_name, HOST_EXECUTABLE_SUFFIX)) { - char *full_exec_name = - (char *) alloca - (strlen (exec_name) + strlen (HOST_EXECUTABLE_SUFFIX) + 1); + char *full_exec_name = (char *) alloca (strlen (exec_name) + len + 1); strcpy (full_exec_name, exec_name); strcat (full_exec_name, HOST_EXECUTABLE_SUFFIX); |