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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
