From owner-svn-src-head@FreeBSD.ORG  Thu Jan 13 16:29:27 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8EC0106566C;
	Thu, 13 Jan 2011 16:29:27 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D5008FC15;
	Thu, 13 Jan 2011 16:29:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0DGTR9u056400;
	Thu, 13 Jan 2011 16:29:27 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0DGTRMW056398;
	Thu, 13 Jan 2011 16:29:27 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201101131629.p0DGTRMW056398@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Thu, 13 Jan 2011 16:29:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217357 - head/sys/ufs/ufs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jan 2011 16:29:27 -0000

Author: pluknet
Date: Thu Jan 13 16:29:27 2011
New Revision: 217357
URL: http://svn.freebsd.org/changeset/base/217357

Log:
  Embed a quota error message (C string) into uprintf() fmt.
  While here, fix whitespaces.
  
  Approved by:	kib (mentor)

Modified:
  head/sys/ufs/ufs/ufs_quota.c

Modified: head/sys/ufs/ufs/ufs_quota.c
==============================================================================
--- head/sys/ufs/ufs/ufs_quota.c	Thu Jan 13 16:13:53 2011	(r217356)
+++ head/sys/ufs/ufs/ufs_quota.c	Thu Jan 13 16:29:27 2011	(r217357)
@@ -238,9 +238,9 @@ chkdq(struct inode *ip, ufs2_daddr_t cha
 		dq->dq_flags |= DQ_MOD;
 		DQI_UNLOCK(dq);
 		if (warn)
-			uprintf("\n%s: warning, %s %s\n",
-				ITOV(ip)->v_mount->mnt_stat.f_mntonname,
-				quotatypes[i], "disk quota exceeded");
+			uprintf("\n%s: warning, %s disk quota exceeded\n",
+			    ITOV(ip)->v_mount->mnt_stat.f_mntonname,
+			    quotatypes[i]);
 	}
 	return (0);
 }
@@ -289,10 +289,10 @@ chkdqchg(struct inode *ip, ufs2_daddr_t 
 			    ip->i_uid == cred->cr_uid) {
 				dq->dq_flags |= DQ_BLKS;
 				DQI_UNLOCK(dq);
-				uprintf("\n%s: write failed, %s %s\n",
+				uprintf("\n%s: write failed, %s "
+				    "disk quota exceeded for too long\n",
 				    ITOV(ip)->v_mount->mnt_stat.f_mntonname,
-				    quotatypes[type],
-				    "disk quota exceeded for too long");
+				    quotatypes[type]);
 				return (EDQUOT);
 			}
 			DQI_UNLOCK(dq);
@@ -384,9 +384,9 @@ chkiq(struct inode *ip, int change, stru
 		dq->dq_flags |= DQ_MOD;
 		DQI_UNLOCK(dq);
 		if (warn)
-			uprintf("\n%s: warning, %s %s\n",
-				ITOV(ip)->v_mount->mnt_stat.f_mntonname,
-				quotatypes[i], "inode quota exceeded");
+			uprintf("\n%s: warning, %s inode quota exceeded\n",
+			    ITOV(ip)->v_mount->mnt_stat.f_mntonname,
+			    quotatypes[i]);
 	}
 	return (0);
 }
@@ -434,10 +434,10 @@ chkiqchg(struct inode *ip, int change, s
 			    ip->i_uid == cred->cr_uid) {
 				dq->dq_flags |= DQ_INODS;
 				DQI_UNLOCK(dq);
-				uprintf("\n%s: write failed, %s %s\n",
-					ITOV(ip)->v_mount->mnt_stat.f_mntonname,
-					quotatypes[type],
-					"inode quota exceeded for too long");
+				uprintf("\n%s: write failed, %s "
+				    "inode quota exceeded for too long\n",
+				    ITOV(ip)->v_mount->mnt_stat.f_mntonname,
+				    quotatypes[type]);
 				return (EDQUOT);
 			}
 			DQI_UNLOCK(dq);