Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/stat KNF, and since this gets compiled as a tool, av...



details:   https://anonhg.NetBSD.org/src/rev/b91853efbb93
branches:  trunk
changeset: 826668:b91853efbb93
user:      kre <kre%NetBSD.org@localhost>
date:      Thu Sep 21 18:50:08 2017 +0000

description:
KNF, and since this gets compiled as a tool, avoid C99 declarations.

diffstat:

 usr.bin/stat/stat.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 7697f1f2c6e3 -r b91853efbb93 usr.bin/stat/stat.c
--- a/usr.bin/stat/stat.c       Thu Sep 21 18:19:44 2017 +0000
+++ b/usr.bin/stat/stat.c       Thu Sep 21 18:50:08 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stat.c,v 1.41 2017/09/20 17:45:25 kre Exp $ */
+/*     $NetBSD: stat.c,v 1.42 2017/09/21 18:50:08 kre Exp $ */
 
 /*
  * Copyright (c) 2002-2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: stat.c,v 1.41 2017/09/20 17:45:25 kre Exp $");
+__RCSID("$NetBSD: stat.c,v 1.42 2017/09/21 18:50:08 kre Exp $");
 #endif
 
 #if ! HAVE_NBTOOL_CONFIG_H
@@ -569,6 +569,7 @@
 {
        struct tm tm;
        char *fmt2;
+
        if (localtime_r(&secs, &tm) == NULL) {
                secs = 0;
                (void)localtime_r(&secs, &tm);
@@ -576,10 +577,13 @@
        if ((fmt2 = strstr(fmt, "%f")) != NULL) {
                size_t flen = strlen(fmt) + 1024;
                size_t o = (size_t)(fmt2 - fmt);
+
                fmt2 = calloc(flen, 1);
                if (fmt2 != NULL) {
+                       int sl;
+
                        memcpy(fmt2, fmt, o);
-                       int sl = snprintf(fmt2 + o, flen - o, "%.9ld", nsecs);
+                       sl = snprintf(fmt2 + o, flen - o, "%.9ld", nsecs);
                        if (sl == -1)
                                sl = 0;
                        strcpy(fmt2 + sl + o, fmt + o + 2);



Home | Main Index | Thread Index | Old Index