From owner-svn-src-all@FreeBSD.ORG  Fri Jan 20 01:38:29 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0180310659E7;
	Fri, 20 Jan 2012 01:38:29 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E4AF28FC1E;
	Fri, 20 Jan 2012 01:38:28 +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 q0K1cSTK016741;
	Fri, 20 Jan 2012 01:38:28 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0K1cSou016739;
	Fri, 20 Jan 2012 01:38:28 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201201200138.q0K1cSou016739@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 20 Jan 2012 01:38:28 +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: r230354 - head/usr.sbin/makefs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 20 Jan 2012 01:38:29 -0000

Author: eadler
Date: Fri Jan 20 01:38:28 2012
New Revision: 230354
URL: http://svn.freebsd.org/changeset/base/230354

Log:
  Fix a variety of warnings when compiling with gcc46
  
  Approved by:	dim, cperciva (mentor, blanket for pre-mentorship already-approved commits)
  MFC after:	3 days

Modified:
  head/usr.sbin/makefs/cd9660.c

Modified: head/usr.sbin/makefs/cd9660.c
==============================================================================
--- head/usr.sbin/makefs/cd9660.c	Fri Jan 20 01:38:21 2012	(r230353)
+++ head/usr.sbin/makefs/cd9660.c	Fri Jan 20 01:38:28 2012	(r230354)
@@ -1049,7 +1049,7 @@ static cd9660node *
 cd9660_rename_filename(cd9660node *iter, int num, int delete_chars)
 {
 	int i = 0;
-	int numbts, dot, semi, digit, digits, temp, powers, multiplier, count;
+	int numbts, digit, digits, temp, powers, count;
 	char *naming;
 	int maxlength;
         char *tmp;
@@ -1071,7 +1071,6 @@ cd9660_rename_filename(cd9660node *iter,
 		powers = 1;
 		count = 0;
 		digits = 1;
-		multiplier = 1;
 		while (((int)(i / powers) ) >= 10) {
 			digits++;
 			powers = powers * 10;
@@ -1086,15 +1085,7 @@ cd9660_rename_filename(cd9660node *iter,
 		}
 		*/
 
-		dot = -1;
-		semi = -1;
 		while (count < maxlength) {
-			if (*naming == '.')
-				dot = count;
-			else if (*naming == ';') {
-				semi = count;
-				break;
-			}
 			naming++;
 			count++;
 		}