From owner-svn-src-head@freebsd.org Fri Apr 7 02:31:56 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C19DD32ECB; Fri, 7 Apr 2017 02:31:56 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFDF7FC; Fri, 7 Apr 2017 02:31:56 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v372Vt4W094658; Fri, 7 Apr 2017 02:31:55 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v372VtiJ094656; Fri, 7 Apr 2017 02:31:55 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201704070231.v372VtiJ094656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 7 Apr 2017 02:31:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316597 - in head/usr.sbin/makefs: . cd9660 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Apr 2017 02:31:56 -0000 Author: emaste Date: Fri Apr 7 02:31:55 2017 New Revision: 316597 URL: https://svnweb.freebsd.org/changeset/base/316597 Log: makefs: Sync with NetBSD (fix unused variable warnings) NetBSD revs: cd9660.c 1.45 cd9660/cd9660_write.c 1.17 Obtained from: NetBSD Modified: head/usr.sbin/makefs/cd9660.c head/usr.sbin/makefs/cd9660/cd9660_write.c Modified: head/usr.sbin/makefs/cd9660.c ============================================================================== --- head/usr.sbin/makefs/cd9660.c Fri Apr 7 00:33:03 2017 (r316596) +++ head/usr.sbin/makefs/cd9660.c Fri Apr 7 02:31:55 2017 (r316597) @@ -815,15 +815,14 @@ static int cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode) { time_t tstamp = stampst.st_ino ? stampst.st_mtime : time(NULL); - int test; u_char flag; char temp[ISO_FILENAME_MAXLENGTH_WITH_PADDING]; /* Now populate the isoDirRecord structure */ memset(temp, 0, ISO_FILENAME_MAXLENGTH_WITH_PADDING); - test = cd9660_convert_filename(diskStructure, newnode->node->name, - temp, !(S_ISDIR(newnode->node->type))); + (void)cd9660_convert_filename(diskStructure, newnode->node->name, + temp, !(S_ISDIR(newnode->node->type))); flag = ISO_FLAG_CLEAR; if (S_ISDIR(newnode->node->type)) @@ -1111,7 +1110,7 @@ cd9660_rename_filename(iso9660_disk *dis * See if you can spot them all :) */ - /* +#if 0 if (diskStructure->isoLevel == 1) { numbts = 8 - digits - delete_chars; if (dot < 0) { @@ -1122,7 +1121,7 @@ cd9660_rename_filename(iso9660_disk *dis } } } - */ +#endif /* (copying just the filename before the '.' */ memcpy(tmp, (iter->o_name), numbts); Modified: head/usr.sbin/makefs/cd9660/cd9660_write.c ============================================================================== --- head/usr.sbin/makefs/cd9660/cd9660_write.c Fri Apr 7 00:33:03 2017 (r316596) +++ head/usr.sbin/makefs/cd9660/cd9660_write.c Fri Apr 7 02:31:55 2017 (r316597) @@ -143,10 +143,8 @@ static int cd9660_write_volume_descriptors(iso9660_disk *diskStructure, FILE *fd) { volume_descriptor *vd_temp = diskStructure->firstVolumeDescriptor; - int pos; while (vd_temp != NULL) { - pos = vd_temp->sector * diskStructure->sectorSize; cd9660_write_filedata(diskStructure, fd, vd_temp->sector, vd_temp->volumeDescriptorData, 1); vd_temp = vd_temp->next; @@ -267,7 +265,6 @@ cd9660_write_file(iso9660_disk *diskStru int ret; off_t working_sector; int cur_sector_offset; - int written; iso_directory_record_cd9660 temp_record; cd9660node *temp; int rv = 0; @@ -340,7 +337,7 @@ cd9660_write_file(iso9660_disk *diskStru err(1, "fseeko"); } /* Write out the basic ISO directory record */ - written = fwrite(&temp_record, 1, + (void)fwrite(&temp_record, 1, temp->isoDirRecord->length[0], fd); if (diskStructure->rock_ridge_enabled) { cd9660_write_rr(diskStructure, fd, temp,