]> granicus.if.org Git - procps-ng/commitdiff
top: eliminate every warning for '-Wformat-truncation'
authorJim Warner <james.warner@comcast.net>
Sat, 8 Jan 2022 06:00:00 +0000 (00:00 -0600)
committerCraig Small <csmall@dropbear.xyz>
Thu, 13 Jan 2022 08:34:39 +0000 (19:34 +1100)
Signed-off-by: Jim Warner <james.warner@comcast.net>
top/top.c
top/top.h

index f0682665331c1b5c54dfaa45699e22c98d911144..15f4ceee685123744b23ca1f8773aac86924a71b 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -129,7 +129,7 @@ static char  Cap_clr_eol    [CAPBUFSIZ] = "",    // global and/or static vars
              Cap_norm       [CAPBUFSIZ] = "",
              Cap_reverse    [CAPBUFSIZ] = "",
              Caps_off       [CAPBUFSIZ] = "",
-             Caps_endline   [CAPBUFSIZ] = "";
+             Caps_endline   [SMLBUFSIZ] = "";
 #ifndef RMAN_IGNORED
 static char  Cap_rmam       [CAPBUFSIZ] = "",
              Cap_smam       [CAPBUFSIZ] = "";
@@ -913,7 +913,7 @@ static void show_special (int interact, const char *glob) {
      ( However, such an approach was abandoned. As a result )
      ( this function is called only with a glob under top's )
      ( control and never containing any 'raw/binary' chars! ) */
-   char tmp[LRGBUFSIZ], lin[LRGBUFSIZ], row[ROWMAXSIZ];
+   char tmp[LRGBUFSIZ], lin[LRGBUFSIZ], row[ROWMINSIZ];
    char *rp, *lin_end, *sub_beg, *sub_end;
    int room;
 
index af31681e8ebdb967ad1c820badc0956a07545c21..20c4a7af51687ae304ca44530599d422e29ed629 100644 (file)
--- a/top/top.h
+++ b/top/top.h
@@ -137,7 +137,7 @@ char *strcasestr(const char *haystack, const char *needle);
 #define BIGBUFSIZ  2048
    /* in addition to the actual display data, our row might have to accommodate
       many termcap/color transitions - these definitions ensure we have room */
-#define ROWMINSIZ  ( SCREENMAX +  4 * (CAPBUFSIZ + CLRBUFSIZ) )
+#define ROWMINSIZ  ( SCREENMAX +  8 * (CAPBUFSIZ + CLRBUFSIZ) )
 #define ROWMAXSIZ  ( SCREENMAX + 16 * (CAPBUFSIZ + CLRBUFSIZ) )
    // minimum size guarantee for dynamically acquired 'readfile' buffer
 #define READMINSZ  2048