From owner-p4-projects@FreeBSD.ORG  Mon Jan 31 16:15:02 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F9871065673; Mon, 31 Jan 2011 16:15:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 514521065672
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 16:15:02 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 3923E8FC14
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 16:15:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0VGF2bO066744
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 16:15:02 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0VGF2Ze066741
	for perforce@freebsd.org; Mon, 31 Jan 2011 16:15:02 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 31 Jan 2011 16:15:02 GMT
Message-Id: <201101311615.p0VGF2Ze066741@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 188380 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Jan 2011 16:15:03 -0000

http://p4web.freebsd.org/@@188380?ac=10

Change 188380 by trasz@trasz_victim on 2011/01/31 16:14:22

	Fix build on i386.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#3 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#3 (text+ko) ====

@@ -42,6 +42,7 @@
 #include <grp.h>
 #include <libutil.h>
 #include <pwd.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -143,7 +144,7 @@
 static char *
 expand_amount(char *rule)
 {
-	int64_t num;
+	uint64_t num;
 	const char *subject, *subject_id, *resource, *action, *amount, *per;
 	char *copy, *expanded;
 
@@ -172,9 +173,9 @@
 		err(1, "expand_number");
 
 	if (per == NULL)
-		asprintf(&expanded, "%s:%s:%s:%s=%ld", subject, subject_id, resource, action, num);
+		asprintf(&expanded, "%s:%s:%s:%s=%ju", subject, subject_id, resource, action, (uintmax_t)num);
 	else
-		asprintf(&expanded, "%s:%s:%s:%s=%ld/%s", subject, subject_id, resource, action, num, per);
+		asprintf(&expanded, "%s:%s:%s:%s=%ju/%s", subject, subject_id, resource, action, (uintmax_t)num, per);
 
 	if (expanded == NULL)
 		err(1, "asprintf");