From owner-svn-src-stable@FreeBSD.ORG  Sat Jul 17 07:59:53 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EF56E106566B;
	Sat, 17 Jul 2010 07:59:53 +0000 (UTC)
	(envelope-from keramida@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DDD698FC16;
	Sat, 17 Jul 2010 07:59:53 +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 o6H7xrBe066039;
	Sat, 17 Jul 2010 07:59:53 GMT
	(envelope-from keramida@svn.freebsd.org)
Received: (from keramida@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6H7xrG6066037;
	Sat, 17 Jul 2010 07:59:53 GMT
	(envelope-from keramida@svn.freebsd.org)
Message-Id: <201007170759.o6H7xrG6066037@svn.freebsd.org>
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Sat, 17 Jul 2010 07:59:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210190 - stable/7/usr.sbin/fifolog/lib
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: Sat, 17 Jul 2010 07:59:54 -0000

Author: keramida (doc committer)
Date: Sat Jul 17 07:59:53 2010
New Revision: 210190
URL: http://svn.freebsd.org/changeset/base/210190

Log:
    MFC r209871 from /head
  
      Fix reading of empty fifolog files.  When we don't have anything
      to inflate, skip the rest of the fifolog reader code to avoid
      hitting the assert about Z_OK a bit further down.

Modified:
  stable/7/usr.sbin/fifolog/lib/fifolog_reader.c
Directory Properties:
  stable/7/usr.sbin/fifolog/   (props changed)

Modified: stable/7/usr.sbin/fifolog/lib/fifolog_reader.c
==============================================================================
--- stable/7/usr.sbin/fifolog/lib/fifolog_reader.c	Sat Jul 17 07:56:01 2010	(r210189)
+++ stable/7/usr.sbin/fifolog/lib/fifolog_reader.c	Sat Jul 17 07:59:53 2010	(r210190)
@@ -299,8 +299,10 @@ fifolog_reader_process(struct fifolog_re
 			if (i == Z_STREAM_END) {
 				i = inflateReset(zs);
 			}
-			if (i != Z_OK)
+			if (i != Z_OK) {
 				fprintf(stderr, "inflate = %d\n", i);
+				exit (250);
+			}
 			assert(i == Z_OK);
 			if (zs->avail_out != fr->olen) {
 				q = fr->obuf + (fr->olen - zs->avail_out);