From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: util-linux-owner@vger.kernel.org Received: from mail-wi0-f170.google.com ([209.85.212.170]:51802 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751573AbaL0RRv (ORCPT ); Sat, 27 Dec 2014 12:17:51 -0500 Received: by mail-wi0-f170.google.com with SMTP id bs8so20738306wib.5 for ; Sat, 27 Dec 2014 09:17:50 -0800 (PST) From: Sami Kerola To: util-linux@vger.kernel.org Cc: Sami Kerola Subject: [PATCH 21/22] script: replace strftime() workaround with CFLAGS = -Wno-format-y2k Date: Sat, 27 Dec 2014 17:17:34 +0000 Message-Id: <1419700655-19107-8-git-send-email-kerolasa@iki.fi> In-Reply-To: <1419700655-19107-1-git-send-email-kerolasa@iki.fi> References: <1419700655-19107-1-git-send-email-kerolasa@iki.fi> Sender: util-linux-owner@vger.kernel.org List-ID: Nowadays, gcc(1) provides the -Wno-format-y2k option to prevent the warning, so that the above workaround is no longer required. Reference: http://man7.org/linux/man-pages/man3/strftime.3.html Signed-off-by: Sami Kerola --- term-utils/Makemodule.am | 1 + term-utils/script.c | 11 +---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am index e7ac707..2bf916c 100644 --- a/term-utils/Makemodule.am +++ b/term-utils/Makemodule.am @@ -2,6 +2,7 @@ if BUILD_SCRIPT usrbin_exec_PROGRAMS += script dist_man_MANS += term-utils/script.1 script_SOURCES = term-utils/script.c +script_CFLAGS = $(AM_CFLAGS) -Wno-format-y2k script_LDADD = $(LDADD) if HAVE_UTIL script_LDADD += -lutil diff --git a/term-utils/script.c b/term-utils/script.c index c1a9f5d..7a992da 100644 --- a/term-utils/script.c +++ b/term-utils/script.c @@ -146,15 +146,6 @@ static void die_if_link(const struct script_control *ctl) "Program not started."), ctl->fname); } -/* - * Stop extremely silly gcc complaint on %c: - * warning: `%c' yields only last 2 digits of year in some locales - */ -static void my_strftime(char *buf, size_t len, const char *fmt, const struct tm *tm) -{ - strftime(buf, len, fmt, tm); -} - static void __attribute__((__noreturn__)) done(struct script_control *ctl) { if (ctl->isterm) @@ -288,7 +279,7 @@ static void do_io(struct script_control *ctl) pfd[2].fd = ctl->sigfd; pfd[2].events = POLLIN | POLLERR | POLLHUP; - my_strftime(buf, sizeof buf, "%c\n", localtime(&tvec)); + strftime(buf, sizeof buf, "%c\n", localtime(&tvec)); fprintf(ctl->typescriptfp, _("Script started on %s"), buf); while (!ctl->die) { -- 2.2.1