From owner-svn-src-all@freebsd.org Tue May 17 16:58:41 2016 Return-Path: Delivered-To: svn-src-all@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 0D48AB3FD3E; Tue, 17 May 2016 16:58:41 +0000 (UTC) (envelope-from pfg@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 AFAA22C94; Tue, 17 May 2016 16:58:40 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4HGwdU4009363; Tue, 17 May 2016 16:58:39 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4HGwdYK009362; Tue, 17 May 2016 16:58:39 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201605171658.u4HGwdYK009362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 17 May 2016 16:58:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300064 - head/usr.sbin/makefs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2016 16:58:41 -0000 Author: pfg Date: Tue May 17 16:58:39 2016 New Revision: 300064 URL: https://svnweb.freebsd.org/changeset/base/300064 Log: makefs(8): use NULL instead of zero for pointers. Modified: head/usr.sbin/makefs/cd9660.c Modified: head/usr.sbin/makefs/cd9660.c ============================================================================== --- head/usr.sbin/makefs/cd9660.c Tue May 17 16:38:18 2016 (r300063) +++ head/usr.sbin/makefs/cd9660.c Tue May 17 16:58:39 2016 (r300064) @@ -774,7 +774,7 @@ cd9660_setup_volume_descriptors(void) temp->next = t; memset(t->volumeDescriptorData, 0, 2048); t->volumeDescriptorData[0] = ISO_VOLUME_DESCRIPTOR_TERMINATOR; - t->next = 0; + t->next = NULL; t->volumeDescriptorData[6] = 1; t->sector = sector; memcpy(t->volumeDescriptorData + 1, @@ -1403,7 +1403,7 @@ cd9660_convert_structure(fsnode *root, c this_node->level = working_level - 1; if (cd9660_rrip_move_directory( - this_node) == 0) { + this_node) == NULL) { warnx("Failure in " "cd9660_rrip_" "move_directory" @@ -1416,7 +1416,7 @@ cd9660_convert_structure(fsnode *root, c } /* Do the recursive call on the children */ - if (iterator->child != 0) { + if (iterator->child != NULL) { cd9660_convert_structure( iterator->child, this_node, working_level, @@ -1445,7 +1445,7 @@ cd9660_convert_structure(fsnode *root, c } /*Allocate new temp_node */ - if (iterator->next != 0) { + if (iterator->next != NULL) { this_node = cd9660_allocate_cd9660node(); if (this_node == NULL) CD9660_MEM_ALLOC_ERROR(__func__); @@ -1733,7 +1733,7 @@ cd9660_convert_filename(const char *oldn { assert(1 <= diskStructure.isoLevel && diskStructure.isoLevel <= 2); /* NEW */ - cd9660_filename_conversion_functor conversion_function = 0; + cd9660_filename_conversion_functor conversion_function = NULL; if (diskStructure.isoLevel == 1) conversion_function = &cd9660_level1_convert_filename; else if (diskStructure.isoLevel == 2)