Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 21 May 2018 04:32:15 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r333961 - head/usr.bin/top
Message-ID:  <201805210432.w4L4WFsW098966@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: eadler
Date: Mon May 21 04:32:14 2018
New Revision: 333961
URL: https://svnweb.freebsd.org/changeset/base/333961

Log:
  top(1): clean up in prep for const poisoning
  
  - sprinkle "const" in a few obvious places
  - remove "(void)" in front of lack-of-error-checked functions

Modified:
  head/usr.bin/top/commands.c

Modified: head/usr.bin/top/commands.c
==============================================================================
--- head/usr.bin/top/commands.c	Mon May 21 04:02:45 2018	(r333960)
+++ head/usr.bin/top/commands.c	Mon May 21 04:32:14 2018	(r333961)
@@ -43,7 +43,7 @@ struct errs		/* structure for a system-call error */
     char *arg;		/* argument that caused the error */
 };
 
-char *err_string(void);
+static char *err_string(void);
 static int str_adderr(char *str, int len, int err);
 static int str_addarg(char *str, int len, char *arg, int first);
 
@@ -237,7 +237,7 @@ char *err_string()
 		{
 		    return(err_listem);
 		}
-		(void) strcat(string, "; ");	  /* we know there's more */
+		strcat(string, "; ");	  /* we know there's more */
 	    }
 	    currerr = errp->errnum;
 	    first = Yes;
@@ -262,15 +262,10 @@ char *err_string()
  */
 
 static int
-str_adderr(str, len, err)
-
-char *str;
-int len;
-int err;
-
+str_adderr(char *str, int len, int err)
 {
-    char *msg;
-    int  msglen;
+    const char *msg;
+    int msglen;
 
     msg = err == 0 ? "Not a number" : strerror(err);
     msglen = strlen(msg) + 2;
@@ -278,8 +273,8 @@ int err;
     {
 	return(0);
     }
-    (void) strcat(str, ": ");
-    (void) strcat(str, msg);
+    strcat(str, ": ");
+    strcat(str, msg);
     return(len - msglen);
 }
 
@@ -311,9 +306,9 @@ int  first;
     }
     if (!first)
     {
-	(void) strcat(str, ", ");
+	strcat(str, ", ");
     }
-    (void) strcat(str, arg);
+    strcat(str, arg);
     return(len - arglen);
 }
 
@@ -402,7 +397,7 @@ kill_procs(char *str)
 
 	if (isdigit(str[1]))
 	{
-	    (void) scanint(str + 1, &signum);
+	    scanint(str + 1, &signum);
 	    if (signum <= 0 || signum >= NSIG)
 	    {
 		return(" invalid signal number");

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805210432.w4L4WFsW098966>