fix format breaking new lines in error messages

N2009_11_14_FIXES
jpandre 2009-11-05 11:43:36 +00:00
parent 3af7bebe7b
commit af4f6a406a
3 changed files with 9 additions and 6 deletions

View File

@ -558,7 +558,7 @@ static int ntfs_ie_lookup(const void *key, const int key_len,
*vcn = ntfs_ie_get_vcn(ie);
if (*vcn < 0) {
errno = EINVAL;
ntfs_log_perror("Negative vcn in inode %llu\n",
ntfs_log_perror("Negative vcn in inode %llu",
(unsigned long long)icx->ni->mft_no);
return STATUS_ERROR;
}

View File

@ -182,7 +182,8 @@ ntfs_inode *ntfs_inode_open(ntfs_volume *vol, const MFT_REF mref)
/* Receive some basic information about inode. */
if (ntfs_attr_lookup(AT_STANDARD_INFORMATION, AT_UNNAMED,
0, CASE_SENSITIVE, 0, NULL, 0, ctx)) {
ntfs_log_perror("No STANDARD_INFORMATION in base record\n");
ntfs_log_perror("No STANDARD_INFORMATION in base record %lld",
(long long)MREF(mref));
goto put_err_out;
}
std_info = (STANDARD_INFORMATION *)((u8 *)ctx->attr +
@ -223,7 +224,8 @@ ntfs_inode *ntfs_inode_open(ntfs_volume *vol, const MFT_REF mref)
goto put_err_out;
if (l > 0x40000) {
errno = EIO;
ntfs_log_perror("Too large attrlist (%lld)\n", (long long)l);
ntfs_log_perror("Too large attrlist attribute (%lld), inode "
"%lld", (long long)l, (long long)MREF(mref));
goto put_err_out;
}
ni->attr_list_size = l;
@ -235,8 +237,9 @@ ntfs_inode *ntfs_inode_open(ntfs_volume *vol, const MFT_REF mref)
goto put_err_out;
if (l != ni->attr_list_size) {
errno = EIO;
ntfs_log_perror("Unexpected attrlist size (%lld <> %u)\n",
(long long)l, ni->attr_list_size);
ntfs_log_perror("Unexpected attrlist size (%lld <> %u), inode "
"%lld", (long long)l, ni->attr_list_size,
(long long)MREF(mref));
goto put_err_out;
}
get_size:

View File

@ -3254,7 +3254,7 @@ int ntfs_sd_add_everyone(ntfs_inode *ni)
ret = ntfs_attr_add(ni, AT_SECURITY_DESCRIPTOR, AT_UNNAMED, 0, (u8*)sd,
sd_len);
if (ret)
ntfs_log_perror("Failed to add initial SECURITY_DESCRIPTOR\n");
ntfs_log_perror("Failed to add initial SECURITY_DESCRIPTOR");
free(sd);
return ret;