From owner-svn-src-stable@FreeBSD.ORG  Fri Aug 24 13:11:31 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0CB65106566B;
	Fri, 24 Aug 2012 13:11:31 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB4AC8FC16;
	Fri, 24 Aug 2012 13:11:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7ODBU4W041938;
	Fri, 24 Aug 2012 13:11:30 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7ODBUnE041936;
	Fri, 24 Aug 2012 13:11:30 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201208241311.q7ODBUnE041936@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 24 Aug 2012 13:11:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239648 - stable/9/sbin/shutdown
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 13:11:31 -0000

Author: des
Date: Fri Aug 24 13:11:30 2012
New Revision: 239648
URL: http://svn.freebsd.org/changeset/base/239648

Log:
  MFH (r238968): restore a piece of BSD history

Modified:
  stable/9/sbin/shutdown/shutdown.c
Directory Properties:
  stable/9/sbin/shutdown/   (props changed)

Modified: stable/9/sbin/shutdown/shutdown.c
==============================================================================
--- stable/9/sbin/shutdown/shutdown.c	Fri Aug 24 11:44:47 2012	(r239647)
+++ stable/9/sbin/shutdown/shutdown.c	Fri Aug 24 13:11:30 2012	(r239648)
@@ -93,7 +93,7 @@ static char mbuf[BUFSIZ];
 static const char *nosync, *whom;
 
 static void badtime(void);
-static void perform_shutdown(void);
+static void die_you_gravy_sucking_pig_dog(void);
 static void finish(int);
 static void getoffset(char *);
 static void loop(void);
@@ -282,7 +282,7 @@ loop(void)
 		if (!tp->timeleft)
 			break;
 	}
-	perform_shutdown();
+	die_you_gravy_sucking_pig_dog();
 }
 
 static jmp_buf alarmbuf;
@@ -349,7 +349,7 @@ timeout(int signo __unused)
 }
 
 static void
-perform_shutdown(void)
+die_you_gravy_sucking_pig_dog(void)
 {
 	char *empty_environ[] = { NULL };