|
From: Anton A. <an...@us...> - 2002-07-08 06:23:31
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv26864/libntfs
Modified Files:
attrib.c dir.c disk_io.c inode.c mft.c unistr.c
Log Message:
Don't use string concatenation with __FUNCTION__ as gcc-3.x don't like it.
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/attrib.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -U2 -r1.52 -r1.53
--- attrib.c 8 Jul 2002 00:09:41 -0000 1.52
+++ attrib.c 8 Jul 2002 06:23:22 -0000 1.53
@@ -468,5 +468,5 @@
int err;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x.\n",
+ Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x.\n", __FUNCTION__,
(unsigned long long)ni->mft_no, type);
if (!ni || !ni->vol || !ni->mrec) {
@@ -1114,5 +1114,6 @@
}
if (!drl) {
- Dperror(__FUNCTION__ "(): Merge failed");
+ Dprintf("%s(): Merge failed: %s\n", __FUNCTION__,
+ strerror(errno));
return drl;
}
@@ -1233,5 +1234,5 @@
u8 b; /* Current byte offset in buf. */
- Dprintf(__FUNCTION__ "(): Entering for attr 0x%x.\n",
+ Dprintf("%s(): Entering for attr 0x%x.\n", __FUNCTION__,
le32_to_cpu(attr->type));
/* Make sure attr exists and is non-resident. */
@@ -1445,6 +1446,6 @@
int err;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x, "
- "vcn 0x%Lx.\n", (unsigned long long)na->ni->mft_no,
+ Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, vcn 0x%Lx.\n",
+ __FUNCTION__, (unsigned long long)na->ni->mft_no,
na->type, (long long)vcn);
@@ -1789,6 +1790,6 @@
int f;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x, pos "
- "0x%Lx, count 0x%Lx.\n",
+ Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, pos 0x%Lx, "
+ "count 0x%Lx.\n", __FUNCTION__,
(unsigned long long)na->ni->mft_no, na->type,
(long long)pos, (long long)count);
@@ -1904,6 +1905,6 @@
ofs);
retry:
- Dprintf(__FUNCTION__ "(): Reading 0x%Lx bytes from vcn "
- "0x%Lx, lcn 0x%Lx, ofs 0x%Lx.\n", to_read,
+ Dprintf("%s(): Reading 0x%Lx bytes from vcn 0x%Lx, lcn 0x%Lx, "
+ "ofs 0x%Lx.\n", __FUNCTION__, to_read,
rl->vcn, rl->lcn, ofs);
br = ntfs_pread(f, (rl->lcn << vol->cluster_size_bits) + ofs,
@@ -1967,7 +1968,7 @@
} need_to_undo = { 0 };
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr 0x%x, pos "
- "0x%Lx, count 0x%Lx.\n", na->ni->mft_no, na->type,
- (long long)pos, (long long)count);
+ Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, pos 0x%Lx, "
+ "count 0x%Lx.\n", __FUNCTION__, na->ni->mft_no,
+ na->type, (long long)pos, (long long)count);
if (!na || !na->ni || !na->ni->vol || !b || pos < 0 || count < 0) {
errno = EINVAL;
@@ -2166,6 +2167,6 @@
ofs);
retry:
- Dprintf(__FUNCTION__ "(): Writing 0x%Lx bytes to vcn "
- "0x%Lx, lcn 0x%Lx, ofs 0x%Lx.\n", to_write,
+ Dprintf("%s(): Writing 0x%Lx bytes to vcn 0x%Lx, lcn 0x%Lx, "
+ "ofs 0x%Lx.\n", __FUNCTION__, to_write,
rl->vcn, rl->lcn, ofs);
written = ntfs_pwrite(f, (rl->lcn << vol->cluster_size_bits) +
@@ -2278,6 +2279,6 @@
void *end;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr type 0x%x, "
- "pos 0x%Lx.\n", (unsigned long long)na->ni->mft_no,
+ Dprintf("%s(): Entering for inode 0x%Lx, attr type 0x%x, pos 0x%Lx.\n",
+ __FUNCTION__, (unsigned long long)na->ni->mft_no,
na->type, (long long)pos);
if (bk_cnt < 0 || bk_size % NTFS_SECTOR_SIZE) {
@@ -2330,6 +2331,6 @@
s64 written, i;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx, attr type 0x%x, "
- "pos 0x%Lx.\n", (unsigned long long)na->ni->mft_no,
+ Dprintf("%s(): Entering for inode 0x%Lx, attr type 0x%x, pos 0x%Lx.\n",
+ __FUNCTION__, (unsigned long long)na->ni->mft_no,
na->type, (long long)pos);
if (bk_cnt < 0 || bk_size % NTFS_SECTOR_SIZE) {
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/dir.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- dir.c 2 Jul 2002 23:47:10 -0000 1.4
+++ dir.c 8 Jul 2002 06:23:22 -0000 1.5
@@ -914,5 +914,5 @@
err_out:
eo = errno;
- Dputs(__FUNCTION__ "() failed.");
+ Dprintf("%s() failed.\n", __FUNCTION__);
if (ctx)
ntfs_put_attr_search_ctx(ctx);
Index: disk_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/disk_io.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- disk_io.c 2 Jul 2002 23:47:10 -0000 1.28
+++ disk_io.c 8 Jul 2002 06:23:22 -0000 1.29
@@ -56,5 +56,5 @@
s64 br, total;
- Dprintf(__FUNCTION__ "(): Entering for pos 0x%Lx, count 0x%Lx.\n",
+ Dprintf("%s(): Entering for pos 0x%Lx, count 0x%Lx.\n", __FUNCTION__,
pos, count);
if (!b || count < 0 || pos < 0) {
@@ -109,5 +109,5 @@
s64 written, total;
- Dprintf(__FUNCTION__ "(): Entering for pos 0x%Lx, count 0x%Lx.\n",
+ Dprintf("%s(): Entering for pos 0x%Lx, count 0x%Lx.\n", __FUNCTION__,
pos, count);
if (!b || count < 0 || pos < 0) {
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/inode.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- inode.c 7 Jul 2002 19:44:57 -0000 1.11
+++ inode.c 8 Jul 2002 06:23:22 -0000 1.12
@@ -93,5 +93,5 @@
int err = 0;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx.\n", MREF(mref));
+ Dprintf("%s(): Entering for inode 0x%Lx.\n", __FUNCTION__, MREF(mref));
if (!vol) {
errno = EINVAL;
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/mft.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -U2 -r1.30 -r1.31
--- mft.c 7 Jul 2002 19:44:57 -0000 1.30
+++ mft.c 8 Jul 2002 06:23:22 -0000 1.31
@@ -55,5 +55,5 @@
VCN m;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx.\n", MREF(mref));
+ Dprintf("%s(): Entering for inode 0x%Lx.\n", __FUNCTION__, MREF(mref));
if (!vol || !vol->mft_na || !b || count < 0) {
errno = EINVAL;
@@ -107,5 +107,5 @@
int cnt = 0, res = 0;
- Dprintf(__FUNCTION__ "(): Entering for inode 0x%Lx.\n", MREF(mref));
+ Dprintf("%s(): Entering for inode 0x%Lx.\n", __FUNCTION__, MREF(mref));
if (!vol || !vol->mft_na || !b || count < 0) {
errno = EINVAL;
Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/unistr.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- unistr.c 5 Jul 2002 21:15:31 -0000 1.17
+++ unistr.c 8 Jul 2002 06:23:22 -0000 1.18
@@ -449,5 +449,5 @@
goto err_out;
if (cnt < -1) {
- Dprintf(__FUNCTION__ "(): Eeek. cnt = %i\n", cnt);
+ Dprintf("%s(): Eeek. cnt = %i\n", __FUNCTION__, cnt);
errno = EINVAL;
goto err_out;
@@ -464,5 +464,6 @@
/* Make sure we are back in the initial state. */
if (!mbsinit(&mbstate)) {
- Dputs(__FUNCTION__ "(): Eeek. mbstate not in initial state!");
+ Dprintf("%s(): Eeek. mbstate not in initial state!\n",
+ __FUNCTION__);
errno = EILSEQ;
goto err_out;
|
