From owner-svn-src-all@FreeBSD.ORG  Tue Jun  3 20:59:27 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 22D2B351;
 Tue,  3 Jun 2014 20:59:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1075829E2;
 Tue,  3 Jun 2014 20:59:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53KxQcq081244;
 Tue, 3 Jun 2014 20:59:26 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53KxQAp081243;
 Tue, 3 Jun 2014 20:59:26 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201406032059.s53KxQAp081243@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 3 Jun 2014 20:59:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267027 - head/usr.bin/users
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jun 2014 20:59:27 -0000

Author: gahr (ports committer)
Date: Tue Jun  3 20:59:26 2014
New Revision: 267027
URL: http://svnweb.freebsd.org/changeset/base/267027

Log:
  - Avoid calling a wrapper function around strcmp
  - Use sizeof(*array) instead of sizeof(element) everywhere
  
  CR:		D161
  Approved by:	cognet, bapt

Modified:
  head/usr.bin/users/users.c

Modified: head/usr.bin/users/users.c
==============================================================================
--- head/usr.bin/users/users.c	Tue Jun  3 20:58:11 2014	(r267026)
+++ head/usr.bin/users/users.c	Tue Jun  3 20:59:26 2014	(r267027)
@@ -50,9 +50,9 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <utmpx.h>
 
-typedef char   namebuf[sizeof(((struct utmpx *)0)->ut_user) + 1];
+typedef char namebuf[sizeof(((struct utmpx *)0)->ut_user) + 1];
+typedef int (*scmp)(const void *, const void *);
 
-int scmp(const void *, const void *);
 static void usage(void);
 
 int
@@ -91,7 +91,7 @@ main(int argc, char **argv)
 	}
 	endutxent();
 	if (ncnt > 0) {
-		qsort(names, ncnt, sizeof(namebuf), scmp);
+		qsort(names, ncnt, sizeof(*names), (scmp)strcmp);
 		printf("%s", names[0]);
 		for (cnt = 1; cnt < ncnt; ++cnt)
 			if (strcmp(names[cnt], names[cnt - 1]) != 0)
@@ -107,10 +107,3 @@ usage(void)
 	fprintf(stderr, "usage: users\n");
 	exit(1);
 }
-	
-int
-scmp(const void *p, const void *q)
-{
-
-	return (strcmp(p, q));
-}