|
From: Richard R. <fl...@us...> - 2005-11-02 18:06:59
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3019/libntfs Modified Files: attrib.c collate.c dir.c index.c logfile.c volume.c Log Message: a few typos Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.192 retrieving revision 1.193 diff -u -p -r1.192 -r1.193 --- attrib.c 2 Nov 2005 17:34:08 -0000 1.192 +++ attrib.c 2 Nov 2005 18:06:48 -0000 1.193 @@ -2130,7 +2130,7 @@ not_found: * If @type is AT_END, seek to the end of the base mft record ignoring the * attribute list completely and return -1 with errno set to ENOENT. AT_END is * not a valid attribute, its length is zero for example, thus it is safer to - * return error instead of success in this case. It should never ne needed to + * return error instead of success in this case. It should never be needed to * do this, but we implement the functionality because it allows for simpler * code inside ntfs_external_attr_find(). * @@ -3000,7 +3000,7 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T /* Attribute can't be resident. */ is_resident = FALSE; } - /* Calculate atribute record size. */ + /* Calculate attribute record size. */ if (is_resident) attr_rec_size = offsetof(ATTR_RECORD, resident_end) + ((name_len * sizeof(ntfschar) + 7) & ~7) + Index: collate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/collate.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- collate.c 2 Nov 2005 17:34:08 -0000 1.13 +++ collate.c 2 Nov 2005 18:06:48 -0000 1.14 @@ -156,7 +156,7 @@ static ntfs_collate_func_t ntfs_do_colla * @data2_len: length in bytes of @data2 * * Collate the two data items @data1 and @data2 using the collation rule @cr - * and return -1, 0, ir 1 if @data1 is found, respectively, to collate before, + * and return -1, 0, or 1 if @data1 is found, respectively, to collate before, * to match, or to collate after @data2. * * For speed we use the collation rule @cr as an index into two tables of Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -p -r1.38 -r1.39 --- dir.c 2 Nov 2005 17:34:08 -0000 1.38 +++ dir.c 2 Nov 2005 18:06:48 -0000 1.39 @@ -1216,7 +1216,7 @@ err_out: ntfs_log_trace("Failed.\n"); if (ntfs_mft_record_free(ni->vol, ni)) ntfs_log_error("Failed to free MFT record. " - "Leaving inconsist metadata. Run chkdsk."); + "Leaving inconsistent metadata. Run chkdsk."); free(fn); free(si); errno = err; @@ -1386,20 +1386,20 @@ search: } if (errno != ENOENT) { err = errno; - ntfs_log_error("Atribute enumeration failed. " - "Probably leaving inconsist metadata."); + ntfs_log_error("Attribute enumeration failed. " + "Probably leaving inconsistent metadata."); } /* All extents should be attached after attribute walk. */ while (ni->nr_extents) if (ntfs_mft_record_free(ni->vol, *(ni->extent_nis))) { err = errno; ntfs_log_error("Failed to free extent MFT record. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); } if (ntfs_mft_record_free(ni->vol, ni)) { err = errno; ntfs_log_error("Failed to free base MFT record. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); } ni = NULL; out: @@ -1505,7 +1505,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode ntfs_log_trace("Done.\n"); return 0; rollback_failed: - ntfs_log_error("Rollback failed. Leaving inconsist metadata."); + ntfs_log_error("Rollback failed. Leaving inconsistent metadata."); err_out: ntfs_log_error("Failed.\n"); free(fn); Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- index.c 2 Nov 2005 17:34:08 -0000 1.22 +++ index.c 2 Nov 2005 18:06:49 -0000 1.23 @@ -109,7 +109,7 @@ void ntfs_index_ctx_put(ntfs_index_conte * ntfs_index_ctx_reinit - reinitialize an index context * @ictx: index context to reinitialize * - * Reintialize the index context @ictx so it can be used for ntfs_index_lookup. + * Reinitialize the index context @ictx so it can be used for ntfs_index_lookup. */ void ntfs_index_ctx_reinit(ntfs_index_context *ictx) { @@ -630,14 +630,14 @@ int ntfs_index_rm(ntfs_index_context *ic if (!na) { err = errno; ntfs_log_error("Failed to open INDEX_ROOT attribute. " - "Leaving inconsist metadata."); + "Leaving inconsistent metadata."); goto err_out; } if (ntfs_attr_truncate(na, new_index_length + offsetof( INDEX_ROOT, index))) { err = errno; ntfs_log_error("Failed to truncate INDEX_ROOT " - "attribute. Leaving inconsist " + "attribute. Leaving inconsistent " "metadata."); goto err_out; } Index: logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- logfile.c 27 Oct 2005 20:42:10 -0000 1.14 +++ logfile.c 2 Nov 2005 18:06:49 -0000 1.15 @@ -339,7 +339,7 @@ err_out: * copy of the complete multi sector transfer deprotected page. On failure, * *@wrp is undefined. * - * Simillarly, if @lsn is not NULL, on succes *@lsn will be set to the current + * Similarly, if @lsn is not NULL, on success *@lsn will be set to the current * logfile lsn according to this restart page. On failure, *@lsn is undefined. * * The following error codes are defined: Index: volume.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -r1.63 -r1.64 --- volume.c 2 Nov 2005 17:34:08 -0000 1.63 +++ volume.c 2 Nov 2005 18:06:49 -0000 1.64 @@ -626,8 +626,8 @@ exit: * ntfs_hiberfile_open - Find and open '/hiberfil.sys' * @vol: An ntfs volume obtained from ntfs_mount * - * Return: inode Success, hibefil.sys is valid - * NULL hibefil.sys doesn't exist or some other error occurred + * Return: inode Success, hiberfil.sys is valid + * NULL hiberfil.sys doesn't exist or some other error occurred */ static ntfs_inode *ntfs_hiberfile_open(ntfs_volume *vol) { |
