]> granicus.if.org Git - procps-ng/commitdiff
top: eliminate every warning for '-Wformat-truncation'
authorJim Warner <james.warner@comcast.net>
Thu, 13 Jan 2022 19:13:13 +0000 (13:13 -0600)
committerCraig Small <csmall@dropbear.xyz>
Mon, 17 Jan 2022 09:27:21 +0000 (20:27 +1100)
Reference(s):
. 01/08/22, newlib branch equivalent commit
commit f05c78d174d3383afc3f71956c23e3e1e75bb2ed

Signed-off-by: Jim Warner <james.warner@comcast.net>
top/top.c
top/top.h

index 244a9dd37f80bee7e6a39a763ba77806364df8c1..891eaeba3fc5c2ad57b971c86ba648253b7f076b 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -139,7 +139,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] = "";
@@ -1017,7 +1017,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 d11217d1f4cafd5860b134051ffe923677c5946e..f4d1c70b8e9f34ba8175d93b249323db4f5bf168 100644 (file)
--- a/top/top.h
+++ b/top/top.h
@@ -150,7 +150,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
@@ -431,7 +431,7 @@ typedef struct WIN_t {
           capclr_msg [CLRBUFSIZ],      //   RCW_t colors (& rebuilt too),
           capclr_pmt [CLRBUFSIZ],      //   but NO recurring costs !
           capclr_hdr [CLRBUFSIZ],      //   note: sum, msg and pmt strs
-          capclr_rowhigh [CLRBUFSIZ],  //         are only used when this
+          capclr_rowhigh [SMLBUFSIZ],  //         are only used when this
           capclr_rownorm [CLRBUFSIZ],  //         window is the 'Curwin'!
           cap_bold [CAPBUFSIZ],        // support for View_NOBOLD toggle
           grpname [GRPNAMSIZ],         // window number:name, printable