aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hayward <alan.hayward@arm.com>2019-01-31 09:48:39 +0000
committerAlan Hayward <alan.hayward@arm.com>2019-01-31 17:25:06 +0000
commit16bfc2f9705b40a11052f465b83fea2ec0904ce5 (patch)
tree8638920c33139a191a40b3b7f36b4cb7454ff8d1
parentfc60b8c806a641cc2260c8b26f389f2abdc99dda (diff)
downloadgdb-16bfc2f9705b40a11052f465b83fea2ec0904ce5.zip
gdb-16bfc2f9705b40a11052f465b83fea2ec0904ce5.tar.gz
gdb-16bfc2f9705b40a11052f465b83fea2ec0904ce5.tar.bz2
Readline: Cleanup some warnings
Cleanup the readline warnings that gdb buildbot complains about. To prevent wcwidth missing declaration warnings, add the SOURCE / EXTENSION macros to config.in that have already checked for in configure. Ensure pid is a long before printing as one. Also fix GNU style. Check the return value of write the same way as history_do_write (). These changes are consistent with upstream readline. readline/ChangeLog.gdb: * config.h.in: Add SOURCE/EXTENSION macros. * histfile.c (history_truncate_file): Check return of write. * util.c (_rl_tropen): Ensure pid is long.
-rw-r--r--readline/ChangeLog.gdb6
-rw-r--r--readline/config.h.in10
-rw-r--r--readline/histfile.c3
-rw-r--r--readline/util.c6
4 files changed, 21 insertions, 4 deletions
diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index f05b9dc..c59329e 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,9 @@
+2019-01-31 Alan Hayward <alan.hayward@arm.com>
+
+ * config.h.in: Add SOURCE/EXTENSION macros.
+ * histfile.c (history_truncate_file): Check return of write.
+ * util.c (_rl_tropen): Ensure pid is long.
+
2017-05-19 Eli Zaretskii <eliz@gnu.org>
* input.c [_WIN32]: Include <conio.h> to avoid compiler warning on
diff --git a/readline/config.h.in b/readline/config.h.in
index 86d86cf..c194e76 100644
--- a/readline/config.h.in
+++ b/readline/config.h.in
@@ -1,5 +1,15 @@
/* config.h.in. Maintained by hand. */
+/* Template definitions for autoconf */
+#undef __EXTENSIONS__
+#undef _ALL_SOURCE
+#undef _GNU_SOURCE
+#undef _POSIX_SOURCE
+#undef _POSIX_1_SOURCE
+#undef _POSIX_PTHREAD_SEMANTICS
+#undef _TANDEM_SOURCE
+#undef _MINIX
+
/* Define NO_MULTIBYTE_SUPPORT to not compile in support for multibyte
characters, even if the OS supports them. */
#undef NO_MULTIBYTE_SUPPORT
diff --git a/readline/histfile.c b/readline/histfile.c
index fffeb3f..56cbbf0 100644
--- a/readline/histfile.c
+++ b/readline/histfile.c
@@ -407,7 +407,8 @@ history_truncate_file (fname, lines)
truncate to. */
if (bp > buffer && ((file = open (filename, O_WRONLY|O_TRUNC|O_BINARY, 0600)) != -1))
{
- write (file, bp, chars_read - (bp - buffer));
+ if (write (file, bp, chars_read - (bp - buffer)) < 0)
+ rv = errno;
#if defined (__BEOS__)
/* BeOS ignores O_TRUNC. */
diff --git a/readline/util.c b/readline/util.c
index d402fce..13bd00c 100644
--- a/readline/util.c
+++ b/readline/util.c
@@ -515,11 +515,11 @@ _rl_tropen ()
(sh_get_env_value ("TEMP")
? sh_get_env_value ("TEMP")
: "."),
- getpid());
+ getpid ());
#else
- sprintf (fnbuf, "/var/tmp/rltrace.%ld", getpid());
+ sprintf (fnbuf, "/var/tmp/rltrace.%ld", (long) getpid ());
#endif
- unlink(fnbuf);
+ unlink (fnbuf);
_rl_tracefp = fopen (fnbuf, "w+");
return _rl_tracefp != 0;
}