|
From: Richard R. <fl...@us...> - 2005-07-06 22:48:11
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31362/libntfs Modified Files: attrib.c attrlist.c collate.c compat.c device.c dir.c index.c inode.c logfile.c mft.c mst.c runlist.c unistr.c unix_io.c volume.c Log Message: got bored. don't read the diffs. Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.166 retrieving revision 1.167 diff -u -p -r1.166 -r1.167 --- attrib.c 5 Jul 2005 16:34:16 -0000 1.166 +++ attrib.c 6 Jul 2005 22:47:16 -0000 1.167 @@ -264,7 +264,7 @@ static __inline__ void __ntfs_attr_init( * @na: * @non_resident: * @compressed: - * @ecnrypted: + * @encrypted: * @sparse: * @allocated_size: * @data_size: @@ -1105,7 +1105,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons /* The buffer is non zero, instantiate the hole. */ cur_vcn = rl->vcn; from_vcn = rl->vcn + (ofs >> vol->cluster_size_bits); - Dprintf("%s(): Isntantiate the hole with vcn 0x%llx.\n", + Dprintf("%s(): Instantiate the hole with vcn 0x%llx.\n", __FUNCTION__, cur_vcn); /* * Search backwards to find the best lcn to start @@ -1154,7 +1154,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons if (ntfs_cluster_free_from_rl(vol, rlc)) { Dprintf("%s(): Failed to free just " "allocated clusters. Leaving " - "inconsist metadata. " + "inconstant metadata. " "Run chkdsk", __FUNCTION__); } errno = eo; @@ -1167,7 +1167,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons /* * It's definitely a BUG, if we failed to find * @cur_vcn, because we missed it during - * instatiating of the hole. + * instantiating of the hole. */ Dprintf("%s(): BUG! Failed to find run after " "instantiating. Please report to the " @@ -1179,7 +1179,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons /* If leaved part of the hole go to the next run. */ if (rl->lcn < 0) rl++; - /* Now LCN should shoudn't be lesser than 0. */ + /* Now LCN shoudn't be less than 0. */ if (rl->lcn < 0) { Dprintf("%s(): BUG! LCN is lesser than 0. " "Please report to the " @@ -1494,7 +1494,7 @@ s64 ntfs_attr_mst_pwrite(ntfs_attr *na, * but not AT_UNNAMED search for a named attribute matching @name. Otherwise, * match both named and unnamed attributes. * - * If @ic is IGNORE_CASE, the @name comparisson is not case sensitive and + * If @ic is IGNORE_CASE, the @name comparison is not case sensitive and * @ctx->ntfs_ino must be set to the ntfs inode to which the mft record * @ctx->mrec belongs. This is so we can get at the ntfs volume and hence at * the upcase table. If @ic is CASE_SENSITIVE, the comparison is case @@ -2260,7 +2260,7 @@ void ntfs_attr_put_search_ctx(ntfs_attr_ * @type in the $AttrDef system file. * * Return the attribute type definition record if found and NULL if not found - * or an error occured. On error the error code is stored in errno. The + * or an error occurred. On error the error code is stored in errno. The * following error codes are defined: * ENOENT - The attribute @type is not specified in $AttrDef. * EINVAL - Invalid parameters (e.g. @vol is not valid). @@ -2299,7 +2299,7 @@ ATTR_DEF *ntfs_attr_find_in_attrdef(cons * Check whether the @size in bytes is valid for an attribute of @type on the * ntfs volume @vol. This information is obtained from $AttrDef system file. * - * Return 0 if valid and -1 if not valid or an error occured. On error the + * Return 0 if valid and -1 if not valid or an error occurred. On error the * error code is stored in errno. The following error codes are defined: * ERANGE - @size is not valid for the attribute @type. * ENOENT - The attribute @type is not specified in $AttrDef. @@ -2348,7 +2348,7 @@ int ntfs_attr_size_bounds_check(const nt * be non-resident. This information is obtained from $AttrDef system file. * * Return 0 if the attribute is allowed to be non-resident and -1 if not or an - * error occured. On error the error code is stored in errno. The following + * error occurred. On error the error code is stored in errno. The following * error codes are defined: * EPERM - The attribute is not allowed to be non-resident. * ENOENT - The attribute @type is not specified in $AttrDef. @@ -2382,7 +2382,7 @@ int ntfs_attr_can_be_non_resident(const * allocation and extended attribute attributes. * * Return 0 if the attribute is allowed to be resident and -1 if not or an - * error occured. On error the error code is stored in errno. The following + * error occurred. On error the error code is stored in errno. The following * error codes are defined: * EPERM - The attribute is not allowed to be resident. * EINVAL - Invalid parameters (e.g. @vol is not valid). @@ -2425,7 +2425,7 @@ int ntfs_make_room_for_attr(MFT_RECORD * Dprintf("%s(): Entering for pos 0x%d, size %u.\n", __FUNCTION__, (int)(pos - (u8*)m), (unsigned) size); - /* Make size 8-byte aligment. */ + /* Make size 8-byte alignment. */ size = (size + 7) & ~7; /* Rigorous consistency checks. */ @@ -2467,9 +2467,9 @@ int ntfs_make_room_for_attr(MFT_RECORD * * Return offset to attribute from the beginning of the mft record on success * and -1 on error. On error the error code is stored in errno. * Possible error codes are: - * EINVAL - Invalid argumets passed to function. + * EINVAL - Invalid arguments passed to function. * EEXIST - Attribute of such type and with same name already exists. - * EIO - I/O error occured or damaged filesystem. + * EIO - I/O error occurred or damaged filesystem. */ int ntfs_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type, ntfschar *name, u8 name_len, ATTR_FLAGS flags) @@ -2502,7 +2502,7 @@ int ntfs_resident_attr_record_add(ntfs_i return -1; } - /* Locate place where record shoud be. */ + /* Locate place where record should be. */ ctx = ntfs_attr_get_search_ctx(NULL, ni->mrec); if (!ctx) return -1; @@ -2580,10 +2580,10 @@ put_err_out: * Return offset to attribute from the beginning of the mft record on success * and -1 on error. On error the error code is stored in errno. * Possible error codes are: - * EINVAL - Invalid argumets passed to function. + * EINVAL - Invalid arguments passed to function. * EEXIST - Attribute of such type, with same lowest vcn and with same * name already exists. - * EIO - I/O error occured or damaged filesystem. + * EIO - I/O error occurred or damaged filesystem. */ int ntfs_non_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type, ntfschar *name, u8 name_len, VCN lowest_vcn, int dataruns_size, @@ -2618,7 +2618,7 @@ int ntfs_non_resident_attr_record_add(nt return -1; } - /* Locate place where record shoud be. */ + /* Locate place where record should be. */ ctx = ntfs_attr_get_search_ctx(NULL, ni->mrec); if (!ctx) return -1; @@ -2699,7 +2699,7 @@ int ntfs_non_resident_attr_record_add(nt lowest_vcn, NULL, 0, ctx)) { err = errno; Dprintf("%s(): Attribute lookup failed. Probably leaving " - "inconsist metadata.\n", __FUNCTION__); + "inconstant metadata.\n", __FUNCTION__); ntfs_attr_put_search_ctx(ctx); errno = err; return -1; @@ -2716,15 +2716,15 @@ put_err_out: /** * ntfs_attr_record_rm - remove attribute extent - * @ctx: search context describing the attrubute which should be removed + * @ctx: search context describing the attribute which should be removed * * If this function succeed, user should reinit search context if he/she wants * use it anymore. * * Return 0 on success and -1 on error. On error the error code is stored in * errno. Possible error codes are: - * EINVAL - Invalid argumets passed to function. - * EIO - I/O error occured or damaged filesystem. + * EINVAL - Invalid arguments passed to function. + * EIO - I/O error occurred or damaged filesystem. */ int ntfs_attr_record_rm(ntfs_attr_search_ctx *ctx) { @@ -2749,12 +2749,12 @@ int ntfs_attr_record_rm(ntfs_attr_search /* Remove attribute itself. */ if (ntfs_attr_record_resize(ctx->mrec, ctx->attr, 0)) { - Dprintf("%s(): Coudn't remove attribute record. Bug or " + Dprintf("%s(): Couldn't remove attribute record. Bug or " "damaged MFT record.\n", __FUNCTION__); if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST) if (ntfs_attrlist_entry_add(ni, ctx->attr)) Dprintf("%s(): Rollback failed. Leaving " - "inconsist metadata.\n", __FUNCTION__); + "inconstant metadata.\n", __FUNCTION__); err = EIO; return -1; } @@ -2767,7 +2767,7 @@ int ntfs_attr_record_rm(ntfs_attr_search if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST) { if (ntfs_attrlist_entry_rm(ctx)) { err = errno; - Dprintf("%s(): Coudn't delete record from " + Dprintf("%s(): Couldn't delete record from " "$ATTRIBUTE_LIST.\n", __FUNCTION__); errno = err; return -1; @@ -2788,7 +2788,7 @@ int ntfs_attr_record_rm(ntfs_attr_search le16_to_cpu(ctx->mrec->attrs_offset) == 8) { if (ntfs_mft_record_free(ni->vol, ni)) { // FIXME: We need rollback here. - Dprintf("%s(): Coudn't free MFT record.\n", + Dprintf("%s(): Couldn't free MFT record.\n", __FUNCTION__); errno = EIO; return -1; @@ -2811,7 +2811,7 @@ int ntfs_attr_record_rm(ntfs_attr_search * goes wrong because NInoAttrList(base_ni) returned * that we have got attribute list. */ - Dprintf("%s(): Coudn't find attribute list. Succeed " + Dprintf("%s(): Couldn't find attribute list. Succeed " "anyway.\n", __FUNCTION__); return 0; } @@ -2842,7 +2842,7 @@ int ntfs_attr_record_rm(ntfs_attr_search * complain if it find MFT record with attribute list, * but without extents. */ - Dprintf("%s(): Coudn't remove attribute list. Succeed " + Dprintf("%s(): Couldn't remove attribute list. Succeed " "anyway.\n", __FUNCTION__); return 0; } @@ -2855,10 +2855,10 @@ int ntfs_attr_record_rm(ntfs_attr_search * @ni: opened ntfs inode to which add attribute * @type: type of the new attribute * @name: name in unicode of the new attribute - * @name_len: name length in unicode charcters of the new attribute + * @name_len: name length in unicode characters of the new attribute * @size: size of the new attribute * - * If inode haven't got enogh space to add attribute, add attribute to one of it + * If inode haven't got enough space to add attribute, add attribute to one of it * extents, if no extents present or no one of them have enough space, than * allocate new extent and add attribute to it. * @@ -3013,7 +3013,7 @@ add_attr_record: __FUNCTION__); if (ntfs_attr_rm(na)) { Dprintf("%s(): Failed to remove just added attribute. " - "Probably leaving inconsist metadata.\n", + "Probably leaving inconstant metadata.\n", __FUNCTION__); } goto err_out; @@ -3034,7 +3034,7 @@ free_err_out: le32_to_cpu(attr_ni->mrec->attrs_offset) == 8) { if (ntfs_mft_record_free(attr_ni->vol, attr_ni)) { Dprintf("%s(): Failed to free MFT record. Leaving " - "inconsist metadata.\n", __FUNCTION__); + "inconstant metadata.\n", __FUNCTION__); } } err_out: @@ -3071,7 +3071,7 @@ int ntfs_attr_rm(ntfs_attr *na) return -1; if (ntfs_cluster_free(na->ni->vol, na, 0, -1) < 0) { Dprintf("%s(): Failed to free cluster allocation. " - "Leaving inconsist metadata.\n", __FUNCTION__); + "Leaving inconstant metadata.\n", __FUNCTION__); ret = -1; } } @@ -3084,14 +3084,14 @@ int ntfs_attr_rm(ntfs_attr *na) CASE_SENSITIVE, 0, NULL, 0, ctx)) { if (ntfs_attr_record_rm(ctx)) { Dprintf("%s(): Failed to remove attribute extent. " - "Leaving inconsist metadata.\n", __FUNCTION__); + "Leaving inconstant metadata.\n", __FUNCTION__); ret = -1; } ntfs_attr_reinit_search_ctx(ctx); } if (errno != ENOENT) { Dprintf("%s(): Attribute lookup failed. Probably leaving " - "inconsist metadata.\n", __FUNCTION__); + "inconstant metadata.\n", __FUNCTION__); ret = -1; } @@ -3165,7 +3165,7 @@ int ntfs_resident_attr_value_resize(MFT_ { /* * Check that the attribute name hasn't been placed after the - * attribute valuy. Chkdsk treat this as corruption. + * attribute value. Chkdsk treat this as corruption. */ if (a->name_length && le16_to_cpu(a->name_offset) >= le16_to_cpu(a->value_offset)) { @@ -3201,7 +3201,7 @@ int ntfs_resident_attr_value_resize(MFT_ /** * ntfs_attr_record_move_to - move attribute record to target inode - * @ctx: attribute search context describing the attrubute record + * @ctx: attribute search context describing the attribute record * @ni: opened ntfs inode to which move attribute record * * If this function succeed, user should reinit search context if he/she wants @@ -3292,8 +3292,8 @@ put_err_out: /** * ntfs_attr_record_move_away - move away attribute record from it's mft record - * @ctx: attribute search context describing the attrubute record - * @extra: minimum amount of free spase in the new holder of record + * @ctx: attribute search context describing the attribute record + * @extra: minimum amount of free space in the new holder of record * * New attribute record holder must have free @extra bytes after moving * attribute record to it. @@ -3419,7 +3419,7 @@ static int ntfs_attr_make_non_resident(n /* * Check that the attribute name hasn't been placed after the - * attribute valuy. Chkdsk treat this as corruption. + * attribute value. Chkdsk treat this as corruption. */ if (a->name_length && le16_to_cpu(a->name_offset) >= le16_to_cpu(a->value_offset)) { @@ -3580,7 +3580,7 @@ cluster_free_err_out: * The following error codes are defined: * ENOMEM - Not enough memory to complete operation. * ERANGE - @newsize is not valid for the attribute type of @na. - * ENOSPC - There is no enogh space in base mft to resize $ATTRIBUTE_LIST. + * ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST. */ static int ntfs_resident_attr_resize(ntfs_attr *na, const s64 newsize) { @@ -3689,7 +3689,7 @@ static int ntfs_resident_attr_resize(ntf ntfs_attr_put_search_ctx(ctx); return ntfs_resident_attr_resize(na, newsize); } - /* Check whether error occured. */ + /* Check whether error occurred. */ if (errno != ENOENT) { err = errno; Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__); @@ -3921,7 +3921,7 @@ static int ntfs_attr_make_resident(ntfs_ if (bytes_read < 0) err = errno; Dprintf("%s(): Eeek! Failed to read attribute data. " - "Leaving inconsist metadata. Run chkdsk. " + "Leaving inconstant metadata. Run chkdsk. " "Aborting...\n", __FUNCTION__); errno = err; return -1; @@ -3975,7 +3975,7 @@ static int ntfs_attr_make_resident(ntfs_ * On success return 0 and on error return -1 with errno set to the error code. * The following error codes are defined: * ENOMEM - Not enough memory to complete operation. - * ENOSPC - There is no enogh space in base mft to resize $ATTRIBUTE_LIST. + * ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST. */ int ntfs_attr_update_mapping_pairs(ntfs_attr *na) { @@ -4177,7 +4177,7 @@ retry: /* * Mapping pairs of $ATTRIBUTE_LIST attribute must fit * in the base mft record. Try to move out other - * attibutes and try again. + * attributes and try again. */ if (na->type == AT_ATTRIBUTE_LIST) { ntfs_attr_put_search_ctx(ctx); @@ -4201,7 +4201,7 @@ retry: ntfs_attr_put_search_ctx(ctx); if (ntfs_inode_add_attrlist(base_ni)) { err = errno; - Dprintf("%s(): Eeek! Coudn't add " + Dprintf("%s(): Eeek! Couldn't add " "attribute list.\n", __FUNCTION__); errno = err; @@ -4264,7 +4264,7 @@ retry: } a->highest_vcn = cpu_to_sle64(stop_vcn - 1); } - /* Check whether error occured. */ + /* Check whether error occurred. */ if (errno != ENOENT) { err = errno; Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__); @@ -4283,7 +4283,7 @@ retry: /* Remove unused attribute record. */ if (ntfs_attr_record_rm(ctx)) { err = errno; - Dprintf("%s(): Coudn't remove unused attribute " + Dprintf("%s(): Couldn't remove unused attribute " "record.\n", __FUNCTION__); goto put_err_out; } @@ -4323,7 +4323,7 @@ retry: } m = ni->mrec; /* - * If mapping size exceed avaible space, set them to + * If mapping size exceed available space, set them to * possible maximum. */ cur_max_mp_size = le32_to_cpu(m->bytes_allocated) - @@ -4334,7 +4334,7 @@ retry: ((sizeof(ntfschar) * na->name_len + 7) & ~7); if (mp_size > cur_max_mp_size) mp_size = cur_max_mp_size; - /* Add atribute extent to new record. */ + /* Add attribute extent to new record. */ err = ntfs_non_resident_attr_record_add(ni, na->type, na->name, na->name_len, stop_vcn, mp_size, 0); if (err == -1) { @@ -4342,7 +4342,7 @@ retry: Dprintf("%s(): Couldn't add attribute extent " "into the MFT record.\n", __FUNCTION__); if (ntfs_mft_record_free(na->ni->vol, ni)) { - Dprintf("%s(): Coudn't free MFT record.\n", + Dprintf("%s(): Couldn't free MFT record.\n", __FUNCTION__); } goto put_err_out; @@ -4361,7 +4361,7 @@ retry: "lin...@li....\n", __FUNCTION__); if (ntfs_mft_record_free(na->ni->vol, ni)) - Dprintf("%s(): Coudn't free MFT record.\n", + Dprintf("%s(): Couldn't free MFT record.\n", __FUNCTION__); goto put_err_out; } @@ -4466,7 +4466,7 @@ static int ntfs_non_resident_attr_shrink if (ntfs_attr_update_mapping_pairs(na)) { err = errno; Dprintf("%s(): Eeek! Mapping pairs update failed. " - "Leaving inconsist metadata. Run chkdsk.\n", + "Leaving inconstant metadata. Run chkdsk.\n", __FUNCTION__); errno = err; return -1; @@ -4479,10 +4479,10 @@ static int ntfs_non_resident_attr_shrink err = errno; if ((na->allocated_size >> vol->cluster_size_bits) != first_free_vcn) - Dprintf("%s(): Coudn't get attribute search context. " - "Leaving inconsist metadata.\n", __FUNCTION__); + Dprintf("%s(): Couldn't get attribute search context. " + "Leaving inconstant metadata.\n", __FUNCTION__); else - Dprintf("%s(): Coudn't get attribute search context.\n", + Dprintf("%s(): Couldn't get attribute search context.\n", __FUNCTION__); errno = err; return -1; @@ -4493,7 +4493,7 @@ static int ntfs_non_resident_attr_shrink if (err == ENOENT) err = EIO; Dprintf("%s(): Eeek! Lookup of first attribute extent failed. " - "Leaving inconsist metadata.\n", __FUNCTION__); + "Leaving inconstant metadata.\n", __FUNCTION__); goto put_err_out; } a = ctx->attr; @@ -4511,7 +4511,7 @@ static int ntfs_non_resident_attr_shrink new_compr_size = ntfs_rl_get_compressed_size(vol, na->rl); if (new_compr_size == -1) { err = errno; - Dprintf("%s(): BUG! Leaving inconsist metadata.\n", + Dprintf("%s(): BUG! Leaving inconstant metadata.\n", __FUNCTION__); goto put_err_out; } @@ -4561,7 +4561,7 @@ put_err_out: * The following error codes are defined: * ENOMEM - Not enough memory to complete operation. * ERANGE - @newsize is not valid for the attribute type of @na. - * ENOSPC - There is no enogh space in base mft to resize $ATTRIBUTE_LIST. + * ENOSPC - There is no enough space in base mft to resize $ATTRIBUTE_LIST. */ static int ntfs_non_resident_attr_expand(ntfs_attr *na, const s64 newsize) { @@ -4611,7 +4611,7 @@ static int ntfs_non_resident_attr_expand /* * If we extend $DATA attribute on NTFS 3+ volume, we can add - * sparse runs instead of real alloction of clusters. + * sparse runs instead of real allocation of clusters. */ if (na->type == AT_DATA && vol->major_ver >= 3) { rl = malloc(0x1000); @@ -4643,7 +4643,7 @@ static int ntfs_non_resident_attr_expand for (rl = na->rl; (rl + 1)->length; rl++) ; /* - * If the last LCN is a hole or simillar seek + * If the last LCN is a hole or similar seek * back to last valid LCN. */ while (rl->lcn < 0 && rl != na->rl) @@ -4733,7 +4733,7 @@ static int ntfs_non_resident_attr_expand new_compr_size = ntfs_rl_get_compressed_size(vol, na->rl); if (new_compr_size == -1) { err = errno; - Dprintf("%s(): BUG! Leaving inconsist metadata.\n", + Dprintf("%s(): BUG! Leaving inconstant metadata.\n", __FUNCTION__); goto put_err_out; } @@ -4766,12 +4766,12 @@ rollback: */ free(na->rl); na->rl = NULL; - Dprintf("%s(): Eeek! Coudn't truncate runlist. Rollback " + Dprintf("%s(): Eeek! Couldn't truncate runlist. Rollback " "failed.\n", __FUNCTION__); } else { - /* Retore mapping pairs. */ + /* Restore mapping pairs. */ if (ntfs_attr_update_mapping_pairs(na)) { - Dprintf("%s(): Eeek! Coudn't restore old mapping " + Dprintf("%s(): Eeek! Couldn't restore old mapping " "pairs. Rollback failed.\n", __FUNCTION__); } } @@ -4818,7 +4818,7 @@ int ntfs_attr_truncate(ntfs_attr *na, co if (!na || newsize < 0 || (na->ni->mft_no == FILE_MFT && na->type == AT_DATA)) { - Dprintf("%s(): Invalid aruments passed.\n", __FUNCTION__); + Dprintf("%s(): Invalid arguments passed.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -4852,8 +4852,8 @@ int ntfs_attr_truncate(ntfs_attr *na, co NInoFileNameSetDirty(na->ni); na->ni->data_size = na->data_size; /* - * If attribute sparse or commpreseed then allocated size in - * index should be euqal to compressed size, not to allocated + * If attribute sparse or compressed then allocated size in + * index should be equal to compressed size, not to allocated * size. */ if (NAttrCompressed(na) || NAttrSparse(na)) Index: attrlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrlist.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- attrlist.c 2 Jul 2005 13:47:29 -0000 1.25 +++ attrlist.c 6 Jul 2005 22:47:16 -0000 1.26 @@ -37,13 +37,13 @@ * ntfs_attrlist_need - check whether attribute need attribute list * @ni: opened ntfs inode for which perform check * - * Check whether all are atributes belong to one MFT record, in that case + * Check whether all are attributes belong to one MFT record, in that case * attribute list is not needed. * * Return 1 if inode need attribute list, 0 if not, -1 on error with errno set * to the error code. If function succeed errno set to 0. The following error * codes are defined: - * EINVAL - Invalid argumets passed to function or attribute haven't got + * EINVAL - Invalid arguments passed to function or attribute haven't got * attribute list. */ int ntfs_attrlist_need(ntfs_inode *ni) @@ -51,7 +51,7 @@ int ntfs_attrlist_need(ntfs_inode *ni) ATTR_LIST_ENTRY *ale; if (!ni) { - Dprintf("%s(): Invalid argumets.\n", __FUNCTION__); + Dprintf("%s(): Invalid arguments.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -67,7 +67,7 @@ int ntfs_attrlist_need(ntfs_inode *ni) } if (!ni->attr_list) { - Dprintf("%s(): Corrput in-memory struct.\n", __FUNCTION__); + Dprintf("%s(): Corrupt in-memory struct.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -89,9 +89,9 @@ int ntfs_attrlist_need(ntfs_inode *ni) * * Return 0 on success and -1 on error with errno set to the error code. The * following error codes are defined: - * EINVAL - Invalid argumets passed to function. + * EINVAL - Invalid arguments passed to function. * ENOMEM - Not enough memory to allocate necessary buffers. - * EIO - I/O error occured or damaged filesystem. + * EIO - I/O error occurred or damaged filesystem. */ int ntfs_attrlist_entry_add(ntfs_inode *ni, ATTR_RECORD *attr) { @@ -106,7 +106,7 @@ int ntfs_attrlist_entry_add(ntfs_inode * (unsigned) le32_to_cpu(attr->type)); if (!ni || !attr) { - Dprintf("%s(): Invalid argumets.\n", __FUNCTION__); + Dprintf("%s(): Invalid arguments.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -172,7 +172,7 @@ int ntfs_attrlist_entry_add(ntfs_inode * entry_offset = ((u8 *)ale - ni->attr_list); /* Set pointer to new entry. */ ale = (ATTR_LIST_ENTRY *)(new_al + entry_offset); - /* Zero it to fix valgrid warning. */ + /* Zero it to fix valgrind warning. */ memset(ale, 0, entry_len); /* Form new entry. */ ale->type = attr->type; @@ -226,7 +226,7 @@ err_out: /** * ntfs_attrlist_entry_rm - remove an attribute list attribute entry - * @ctx: attribute search context describing the attrubute list entry + * @ctx: attribute search context describing the attribute list entry * * Remove the attribute list entry @ctx->al_entry from the attribute list. * @@ -242,7 +242,7 @@ int ntfs_attrlist_entry_rm(ntfs_attr_sea int err; if (!ctx || !ctx->ntfs_ino || !ctx->al_entry) { - Dprintf("%s(): Invalid argumets.\n", __FUNCTION__); + Dprintf("%s(): Invalid arguments.\n", __FUNCTION__); errno = EINVAL; return -1; } Index: collate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- collate.c 20 Jun 2005 14:23:50 -0000 1.6 +++ collate.c 6 Jul 2005 22:47:17 -0000 1.7 @@ -124,7 +124,7 @@ static ntfs_collate_func_t ntfs_do_colla * For speed we use the collation rule @cr as an index into two tables of * function pointers to call the appropriate collation function. * - * Return NTFS_COLLATION_ERROR if error occured. + * Return NTFS_COLLATION_ERROR if error occurred. */ int ntfs_collate(ntfs_volume *vol, COLLATION_RULES cr, const void *data1, const int data1_len, Index: compat.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/compat.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- compat.c 20 Feb 2004 14:44:16 -0000 1.6 +++ compat.c 6 Jul 2005 22:47:17 -0000 1.7 @@ -1,5 +1,5 @@ /* - * compat.c - Tweaks for Windows compatability + * compat.c - Tweaks for Windows compatibility * * Copyright (c) 2002 Richard Russon * Copyright (c) 2002-2004 Anton Altaparmakov Index: device.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/device.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- device.c 11 Jan 2005 20:28:28 -0000 1.16 +++ device.c 6 Jul 2005 22:47:17 -0000 1.17 @@ -307,7 +307,7 @@ s64 ntfs_mst_pread(struct ntfs_device *d * @dev at position @pos. * * On success, return the number of successfully written blocks. If this number - * is lower than @count this means that the write has been interrutped or that + * is lower than @count this means that the write has been interrupted or that * an error was encountered during the write so that the write is partial. 0 * means nothing was written (also return 0 when @count or @bksize are 0). * Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- dir.c 21 Jun 2005 09:55:15 -0000 1.17 +++ dir.c 6 Jul 2005 22:47:17 -0000 1.18 @@ -910,7 +910,7 @@ skip_index_root: if (br != bmp_buf_size) { if (br != -1) errno = EIO; - Dperror("Failed to read from inde bitmap attribute"); + Dperror("Failed to read from index bitmap attribute"); goto err_out; } @@ -933,7 +933,7 @@ find_next_index_buffer: if (br != bmp_buf_size) { if (br != -1) errno = EIO; - Dperror("Failed to read from inde bitmap attribute"); + Dperror("Failed to read from index bitmap attribute"); goto err_out; } } Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- index.c 21 Jun 2005 09:55:15 -0000 1.6 +++ index.c 6 Jul 2005 22:47:17 -0000 1.7 @@ -228,7 +228,7 @@ done: break; /* * A match should never happen as the memcmp() call should have - * cought it, but we still treat it correctly. + * caught it, but we still treat it correctly. */ if (!rc) goto ir_done; @@ -356,7 +356,7 @@ ia_done: break; /* * A match should never happen as the memcmp() call should have - * cought it, but we still treat it correctly. + * caught it, but we still treat it correctly. */ if (!rc) goto ia_done; Index: inode.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- inode.c 2 Jul 2005 17:48:59 -0000 1.60 +++ inode.c 6 Jul 2005 22:47:17 -0000 1.61 @@ -256,7 +256,7 @@ int ntfs_inode_close(ntfs_inode *ni) } /* * ElectricFence is unhappy with realloc(x,0) as free(x) - * thus we explicitely separate these two cases. + * thus we explicitly separate these two cases. */ if (base_ni->nr_extents) { /* Resize the memory buffer. */ @@ -375,8 +375,8 @@ err_out: } /** - * ntfs_inode_attach_all_extents - atach all extents for target inode - * @ni: opened ntfs inode for which perform atach + * ntfs_inode_attach_all_extents - attach all extents for target inode + * @ni: opened ntfs inode for which perform attach * * Return 0 on success and -1 on error with errno set to the error code. */ @@ -386,7 +386,7 @@ int ntfs_inode_attach_all_extents(ntfs_i u64 prev_attached = 0; if (!ni) { - Dprintf("%s(): Invalid argumets.\n", __FUNCTION__); + Dprintf("%s(): Invalid arguments.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -402,7 +402,7 @@ int ntfs_inode_attach_all_extents(ntfs_i return 0; if (!ni->attr_list) { - Dprintf("%s(): Corrput in-memory struct.\n", __FUNCTION__); + Dprintf("%s(): Corrupt in-memory struct.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -427,7 +427,7 @@ int ntfs_inode_attach_all_extents(ntfs_i } /** - * ntfs_inode_sync_standard_information - update standard informaiton attribute + * ntfs_inode_sync_standard_information - update standard information attribute * @ni: ntfs inode to update standard information * * Return 0 on success or -1 on error with errno set to the error code. @@ -499,7 +499,7 @@ static int ntfs_inode_sync_file_name(ntf if (MREF_LE(fn->parent_directory) == ni->mft_no) { /* * WARNING: We cheater here and obtain 2 attribute - * search contextes for one inode (first we obtained + * search contexts for one inode (first we obtained * above, second will be obtained inside * ntfs_index_lookup), it's acceptable for library, * but will lock kernel. @@ -558,7 +558,7 @@ static int ntfs_inode_sync_file_name(ntf ntfs_index_ctx_put(ictx); ntfs_inode_close(index_ni); } - /* Check for real error occured. */ + /* Check for real error occurred. */ if (errno != ENOENT) { err = errno; Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__); @@ -723,9 +723,9 @@ int ntfs_inode_sync(ntfs_inode *ni) * Return 0 on success or -1 on error with errno set to the error code. * The following error codes are defined: * EINVAL - Invalid arguments were passed to the function. - * EEXIST - Attibute list already exist. - * EIO - Input/Ouput error occured. - * ENOMEM - Not enogh memory to perform add. + * EEXIST - Attribute list already exist. + * EIO - Input/Ouput error occurred. + * ENOMEM - Not enough memory to perform add. */ int ntfs_inode_add_attrlist(ntfs_inode *ni) { @@ -737,7 +737,7 @@ int ntfs_inode_add_attrlist(ntfs_inode * ntfs_attr *na; if (!ni) { - Dprintf("%s(): Invalid argumets.\n", __FUNCTION__); + Dprintf("%s(): Invalid arguments.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -766,7 +766,7 @@ int ntfs_inode_add_attrlist(ntfs_inode * ctx = ntfs_attr_get_search_ctx(ni, NULL); if (!ctx) { err = errno; - Dprintf("%s(): Coudn't get search context.\n", __FUNCTION__); + Dprintf("%s(): Couldn't get search context.\n", __FUNCTION__); goto err_out; } /* Walk through all attributes. */ @@ -811,7 +811,7 @@ int ntfs_inode_add_attrlist(ntfs_inode * ctx->attr->name_length * sizeof(ntfschar)); ale = (ATTR_LIST_ENTRY *)(al + al_len); } - /* Check for real error occured. */ + /* Check for real error occurred. */ if (errno != ENOENT) { err = errno; Dprintf("%s(): Attribute lookup failed.\n", __FUNCTION__); @@ -885,7 +885,7 @@ remove_attrlist_record: Dprintf("%s(): Rollback failed. Failed to remove " "attribute list record.\n", __FUNCTION__); } else - Dprintf("%s(): Rollback failed. Coudn't find attribute list " + Dprintf("%s(): Rollback failed. Couldn't find attribute list " "record.\n", __FUNCTION__); /* Setup back in-memory runlist. */ ni->attr_list = al; @@ -944,7 +944,7 @@ int ntfs_inode_free_space(ntfs_inode *ni int freed, err; if (!ni || size < 0) { - Dprintf("%s(): Invalid argumets.\n", __FUNCTION__); + Dprintf("%s(): Invalid arguments.\n", __FUNCTION__); errno = EINVAL; return -1; } @@ -968,9 +968,9 @@ int ntfs_inode_free_space(ntfs_inode *ni } /* - * Chkdsk complain if $STANDART_INFORMATION is not in the base MFT + * Chkdsk complain if $STANDARD_INFORMATION is not in the base MFT * record. FIXME: I'm not sure in this, need to recheck. For now simply - * do not move $STANDART_INFORMATION at all. + * do not move $STANDARD_INFORMATION at all. * * Also we can't move $ATTRIBUTE_LIST from base MFT_RECORD, so position * search context on first attribute after $STANDARD_INFORMATION and @@ -1033,7 +1033,7 @@ int ntfs_inode_free_space(ntfs_inode *ni } /* - * Repostion to first attribute after $STANDARD_INFORMATION and + * Reposition to first attribute after $STANDARD_INFORMATION and * $ATTRIBUTE_LIST (see comments upwards). */ ntfs_attr_reinit_search_ctx(ctx); Index: logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- logfile.c 20 Jun 2005 14:31:58 -0000 1.4 +++ logfile.c 6 Jul 2005 22:47:18 -0000 1.5 @@ -222,7 +222,7 @@ static BOOL ntfs_check_restart_area(REST "inconsistent log record header length."); return FALSE; } - /* Dito for the log page data offset. */ + /* Ditto for the log page data offset. */ if (((le16_to_cpu(ra->log_page_data_offset) + 7) & ~7) != le16_to_cpu(ra->log_page_data_offset)) { ntfs_error(vi->i_sb, "$LogFile restart area specifies " @@ -378,7 +378,7 @@ err_out: } /** - * ntfs_ckeck_logfile - check in the journal if the volume is consistent + * ntfs_check_logfile - check in the journal if the volume is consistent * @log_na: ntfs attribute of loaded journal $LogFile to check * * Check the $LogFile journal for consistency and return TRUE if it is @@ -442,7 +442,7 @@ BOOL ntfs_check_logfile(ntfs_attr *log_n * page header is at the beginning of a page we only need to search at * what could be the beginning of a page (for each page size) rather * than scanning the whole file byte by byte. If all potential places - * contain empty and uninitialzed records, the log file can be assumed + * contain empty and uninitialized records, the log file can be assumed * to be empty. */ for (pos = 0; pos < size; pos <<= 1) { @@ -573,7 +573,7 @@ err_out: * of cases where we think that a volume is dirty when in fact it is clean. * This should only affect volumes that have not been shutdown cleanly but did * not have any pending, non-check-pointed i/o, i.e. they were completely idle - * at least for the five seconds preceeding the unclean shutdown. + * at least for the five seconds preceding the unclean shutdown. * * This function assumes that the $LogFile journal has already been consistency * checked by a call to ntfs_check_logfile() and in particular if the $LogFile Index: mft.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- mft.c 19 Jun 2005 21:09:40 -0000 1.30 +++ mft.c 6 Jul 2005 22:47:18 -0000 1.31 @@ -400,7 +400,7 @@ static inline unsigned int ntfs_ffz(unsi * * Return the free mft record on success and -1 on error with errno set to the * error code. An error code of ENOSPC means that there are no free mft - * records in the currently initialized mft bitmal. + * records in the currently initialized mft bitmap. */ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *vol, ntfs_inode *base_ni) { @@ -607,7 +607,7 @@ static int ntfs_mft_bitmap_extend_alloca ntfs_error(vol->sb, "Failed to merge runlists for mft " "bitmap."); if (ntfs_cluster_free_from_rl(vol, rl2)) - ntfs_error(vol->sb, "Failed to dealocate " + ntfs_error(vol->sb, "Failed to deallocate " "cluster.%s", es); free(rl2); errno = ret; @@ -665,7 +665,7 @@ static int ntfs_mft_bitmap_extend_alloca // TODO: Deal with this by moving this extent to a new mft // record or by starting a new extent in a new mft record. ntfs_error(vol->sb, "Not enough space in this mft record to " - "accomodate extended mft bitmap attribute " + "accommodate extended mft bitmap attribute " "extent. Cannot handle this yet."); errno = ENOTSUP; goto undo_alloc; @@ -931,7 +931,7 @@ static int ntfs_mft_data_extend_allocati ntfs_error(vol->sb, "Failed to merge runlists for mft data " "attribute."); if (ntfs_cluster_free_from_rl(vol, rl2)) - ntfs_error(vol->sb, "Failed to dealocate clusters " + ntfs_error(vol->sb, "Failed to deallocate clusters " "from the mft data attribute.%s", es); free(rl2); errno = err; @@ -987,7 +987,7 @@ static int ntfs_mft_data_extend_allocati // this extent is not required to find the mft record in // question. ntfs_error(vol->sb, "Not enough space in this mft record to " - "accomodate extended mft data attribute " + "accommodate extended mft data attribute " "extent. Cannot handle this yet."); errno = ENOTSUP; goto undo_alloc; @@ -1133,7 +1133,7 @@ undo_alloc: * extend the initialized size (and data size) by 8 bytes, allocating another * cluster if required. The bitmap data size has to be at least equal to the * number of mft records in the mft, but it can be bigger, in which case the - * superflous bits are padded with zeroes. + * superfluous bits are padded with zeroes. * * Thus, when we return successfully (return value non-zero), we will have: * - initialized / extended the mft bitmap if necessary, @@ -1144,7 +1144,7 @@ undo_alloc: * - return the ntfs_inode. * * On error (return value zero), nothing will have changed. If we had changed - * anything before the error occured, we will have reverted back to the + * anything before the error occurred, we will have reverted back to the * starting state before returning to the caller. Thus, except for bugs, we * should always leave the volume in a consistent state when returning from * this function. @@ -1241,7 +1241,7 @@ ntfs_inode *ntfs_mft_record_alloc(ntfs_v bit = mftbmp_na->initialized_size << 3; if (ntfs_mft_bitmap_extend_initialized(vol)) goto err_out; - ntfs_debug("Status of mftbmp after initialized extention: " + ntfs_debug("Status of mftbmp after initialized extension: " "allocated_size 0x%llx, data_size 0x%llx, " "initialized_size 0x%llx.", (long long)mftbmp_na->allocated_size, @@ -1289,7 +1289,7 @@ found_free_rec: old_data_size = mft_na->data_size; /* * Extend mft data initialized size (and data size of course) to reach - * the allocated mft record, formatting the mft records allong the way. + * the allocated mft record, formatting the mft records along the way. * Note: We only modify the ntfs_attr structure as that is all that is * needed by ntfs_mft_record_format(). We will update the attribute * record itself in one fell swoop later on. Index: mst.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mst.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- mst.c 11 Jan 2005 20:28:28 -0000 1.11 +++ mst.c 6 Jul 2005 22:47:18 -0000 1.12 @@ -37,7 +37,7 @@ * Return 0 on success and -1 on error, with errno set to the error code. The * following error codes are defined: * EINVAL Invalid arguments or invalid NTFS record in buffer @b. - * EIO Mulit sector transfer error was detected. Magic of the NTFS + * EIO Multi sector transfer error was detected. Magic of the NTFS * record in @b will have been set to "BAAD". */ int ntfs_mst_post_read_fixup(NTFS_RECORD *b, const u32 size) @@ -63,7 +63,7 @@ int ntfs_mst_post_read_fixup(NTFS_RECORD * u16 values before they are fixed up. Note no need to care for * endianness since we are comparing and moving data for on disk * structures which means the data is consistent. - If it is - * consistenty the wrong endianness it doesn't make any difference. + * consistency the wrong endianness it doesn't make any difference. */ usn = *usa_pos; /* Index: runlist.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- runlist.c 21 Jun 2005 09:55:15 -0000 1.51 +++ runlist.c 6 Jul 2005 22:47:18 -0000 1.52 @@ -1261,7 +1261,7 @@ int ntfs_get_size_for_mapping_pairs(cons return -1; } prev_lcn = 0; - /* Always need the termining zero byte. */ + /* Always need the terminating zero byte. */ rls = 1; /* Do the first partial run if present. */ if (start_vcn > rl->vcn) { @@ -1331,7 +1331,7 @@ err_out: * write. * * This is used when building the mapping pairs array of a runlist to compress - * a given logical cluster number (lcn) or a specific run length to the minumum + * a given logical cluster number (lcn) or a specific run length to the minimum * size possible. * * Return the number of bytes written on success. On error, i.e. the Index: unistr.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- unistr.c 20 Sep 2004 14:46:38 -0000 1.19 +++ unistr.c 6 Jul 2005 22:47:18 -0000 1.20 @@ -69,7 +69,7 @@ const u8 legal_ansi_char_array[0x40] = { * * Compare the names @s1 and @s2 and return TRUE (1) if the names are * identical, or FALSE (0) if they are not identical. If @ic is IGNORE_CASE, - * the @upcase table is used to performa a case insensitive comparison. + * the @upcase table is used to perform a case insensitive comparison. */ BOOL ntfs_names_are_equal(const ntfschar *s1, size_t s1_len, const ntfschar *s2, size_t s2_len, Index: unix_io.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- unix_io.c 9 Mar 2004 11:06:54 -0000 1.3 +++ unix_io.c 6 Jul 2005 22:47:18 -0000 1.4 @@ -1,5 +1,5 @@ /* - * unix_io.c - Unix stule disk io functions. Part of the Linux-NTFS project. + * unix_io.c - Unix style disk io functions. Part of the Linux-NTFS project. * * Copyright (c) 2000-2003 Anton Altaparmakov * @@ -64,7 +64,7 @@ static int ntfs_device_unix_io_open(stru /* Setup our read-only flag. */ if ((flags & O_RDWR) != O_RDWR) NDevSetReadOnly(dev); - /* Acquire exlusive (mandatory) lock on the whole device. */ + /* Acquire exclusive (mandatory) lock on the whole device. */ memset(&flk, 0, sizeof(flk)); if (NDevReadOnly(dev)) flk.l_type = F_RDLCK; @@ -103,7 +103,7 @@ static int ntfs_device_unix_io_close(str } if (NDevDirty(dev)) fsync(DEV_FD(dev)); - /* Release exlusive (mandatory) lock on the whole device. */ + /* Release exclusive (mandatory) lock on the whole device. */ memset(&flk, 0, sizeof(flk)); flk.l_type = F_UNLCK; flk.l_whence = SEEK_SET; Index: volume.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- volume.c 19 Jun 2005 21:09:40 -0000 1.45 +++ volume.c 6 Jul 2005 22:47:18 -0000 1.46 @@ -199,7 +199,7 @@ static int ntfs_mft_load(ntfs_volume *vo goto io_error_exit; } if (l != vol->mft_ni->attr_list_size) { - Dputs("Error: got unexepected amount of data when reading " + Dputs("Error: got unexpected amount of data when reading " "$MFT/$ATTRIBUTE_LIST."); goto io_error_exit; } @@ -1288,7 +1288,7 @@ static int ntfs_mntent_check(const char * Finally, check if the file system is mounted read-only, and if so set the * NTFS_MF_READONLY flag in *@mnt_flags. * - * On sucess return 0 with *@mnt_flags set to the ntfs mount flags. + * On success return 0 with *@mnt_flags set to the ntfs mount flags. * * On error return -1 with errno set to the error code. */ |
