$NetBSD: patch-ag,v 1.9 2011/12/16 22:32:06 asau Exp $ --- registry/regfio.c.orig 2011-08-09 15:17:47.000000000 +0400 +++ registry/regfio.c 2011-08-23 16:02:29.000000000 +0400 @@ -521,7 +521,7 @@ /* remember that the record_size is in the 4 bytes preceeding the record itself */ if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE-sizeof(uint32) ) ) - return False; + return NULL; record_size = 0; header = 0; @@ -544,12 +544,12 @@ } if ( !prs_set_offset( &hbin->ps, curr_off) ) - return False; + return NULL; if ( !prs_uint32( "rec_size", &hbin->ps, 0, &record_size ) ) - return False; + return NULL; if ( !prs_uint32( "header", &hbin->ps, 0, &header ) ) - return False; + return NULL; SMB_ASSERT( record_size != 0 ); @@ -573,7 +573,7 @@ DEBUG(10,("read_hbin_block: free space offset == 0x%x\n", hbin->free_off)); if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE ) ) - return False; + return NULL; return hbin; } @@ -1598,7 +1598,7 @@ for the record */ if ( !prs_uint32("allocated_size", &hbin->ps, 0, &size) ) - return False; + return NULL; update_free_space( hbin, size ); @@ -1811,7 +1811,7 @@ TYPESAFE_QSORT(parent->subkeys.hashes, parent->subkey_index, hashrec_cmp); if ( !hbin_prs_lf_records( "lf_rec", parent->subkeys.hbin, 0, parent ) ) - return False; + return NULL; } /* write the security descriptor */ @@ -1963,11 +1963,11 @@ prs_set_offset( &nk->hbin->ps, nk->hbin_off ); if ( !prs_nk_rec( "nk_rec", &nk->hbin->ps, 0, nk ) ) - return False; + return NULL; if ( nk->num_values ) { if ( !hbin_prs_vk_records( "vk_records", vlist_hbin, 0, nk, file ) ) - return False; + return NULL; }