d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefs(8): use NULL instead of zero for pointers.

Browse Source
This commit is contained in:
pfg 2016-05-17 16:58:39 +00:00
parent 864a1457f8
commit c427a5ca80
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/makefs/cd9660.c
View File

@ -774,7 +774,7 @@ cd9660_setup_volume_descriptors(void)
temp->next = t; temp->next = t;
memset(t->volumeDescriptorData, 0, 2048); memset(t->volumeDescriptorData, 0, 2048);
t->volumeDescriptorData[0] = ISO_VOLUME_DESCRIPTOR_TERMINATOR; t->volumeDescriptorData[0] = ISO_VOLUME_DESCRIPTOR_TERMINATOR;
t->next = 0; t->next = NULL;
t->volumeDescriptorData[6] = 1; t->volumeDescriptorData[6] = 1;
t->sector = sector; t->sector = sector;
memcpy(t->volumeDescriptorData + 1, memcpy(t->volumeDescriptorData + 1,
@ -1403,7 +1403,7 @@ cd9660_convert_structure(fsnode *root, cd9660node *parent_node, int level,
this_node->level = this_node->level =
working_level - 1; working_level - 1;
if (cd9660_rrip_move_directory( if (cd9660_rrip_move_directory(
this_node) == 0) { this_node) == NULL) {
warnx("Failure in " warnx("Failure in "
"cd9660_rrip_" "cd9660_rrip_"
"move_directory" "move_directory"
@ -1416,7 +1416,7 @@ cd9660_convert_structure(fsnode *root, cd9660node *parent_node, int level,
} }
/* Do the recursive call on the children */ /* Do the recursive call on the children */
if (iterator->child != 0) { if (iterator->child != NULL) {
cd9660_convert_structure( cd9660_convert_structure(
iterator->child, this_node, iterator->child, this_node,
working_level, working_level,
@ -1445,7 +1445,7 @@ cd9660_convert_structure(fsnode *root, cd9660node *parent_node, int level,
} }
/*Allocate new temp_node */ /*Allocate new temp_node */
if (iterator->next != 0) { if (iterator->next != NULL) {
this_node = cd9660_allocate_cd9660node(); this_node = cd9660_allocate_cd9660node();
if (this_node == NULL) if (this_node == NULL)
CD9660_MEM_ALLOC_ERROR(__func__); CD9660_MEM_ALLOC_ERROR(__func__);
@ -1733,7 +1733,7 @@ cd9660_convert_filename(const char *oldname, char *newname, int is_file)
{ {
assert(1 <= diskStructure.isoLevel && diskStructure.isoLevel <= 2); assert(1 <= diskStructure.isoLevel && diskStructure.isoLevel <= 2);
/* NEW */ /* NEW */
cd9660_filename_conversion_functor conversion_function = 0; cd9660_filename_conversion_functor conversion_function = NULL;
if (diskStructure.isoLevel == 1) if (diskStructure.isoLevel == 1)
conversion_function = &cd9660_level1_convert_filename; conversion_function = &cd9660_level1_convert_filename;
else if (diskStructure.isoLevel == 2) else if (diskStructure.isoLevel == 2)