[Libsysio-commit] HEAD: libsysio/src chmod.c chown.c lseek.c open.c rw.c stat.c statvfs.c

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3762/src

Modified Files:
	chmod.c chown.c lseek.c open.c rw.c stat.c statvfs.c 
Log Message:
fix some formats for tracing, add stat buf to return macro

Index: chmod.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/chmod.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -b -B -p -r1.16 -r1.17
--- chmod.c	2 Jul 2007 18:58:16 -0000	1.16
+++ chmod.c	19 Sep 2007 16:01:33 -0000	1.17
@@ -75,7 +75,7 @@ SYSIO_INTERFACE_NAME(chmod)(const char *
 	struct pnode *pno;
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
-	SYSIO_INTERFACE_ENTER(chmod, "%s%mY", path, mode);
+	SYSIO_INTERFACE_ENTER(chmod, "%s%mZ", path, mode);
 	err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno);
 	if (err)
 		goto out;

Index: chown.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/chown.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -b -B -p -r1.15 -r1.16
--- chown.c	2 Jul 2007 18:58:16 -0000	1.15
+++ chown.c	19 Sep 2007 16:01:33 -0000	1.16
@@ -82,7 +82,7 @@ SYSIO_INTERFACE_NAME(chown)(const char *
 	struct pnode *pno;
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
-	SYSIO_INTERFACE_ENTER(chown, "%s%uY%gY", path, owner, group);
+	SYSIO_INTERFACE_ENTER(chown, "%s%u%u", path, owner, group);
 	err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno);
 	if (err)
 		goto out;
@@ -106,7 +106,7 @@ SYSIO_INTERFACE_NAME(fchown)(int fd, uid
 	struct file *fil;
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
-	SYSIO_INTERFACE_ENTER(fchown, "%d%uY%gY", fd, owner, group);
+	SYSIO_INTERFACE_ENTER(fchown, "%d%u%u", fd, owner, group);
 	err = 0;
 	fil = _sysio_fd_find(fd);
 	if (!fil) {

Index: lseek.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -b -B -p -r1.30 -r1.31
--- lseek.c	2 Jul 2007 18:58:16 -0000	1.30
+++ lseek.c	19 Sep 2007 16:01:33 -0000	1.31
@@ -128,16 +128,16 @@ SYSIO_INTERFACE_NAME(lseek64)(int fd, of
 	off64_t	off;
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
-	SYSIO_INTERFACE_ENTER(lseek64, "%d%loY%d", fd, offset, whence);
+	SYSIO_INTERFACE_ENTER(lseek64, "%d%loZ%d", fd, offset, whence);
 	fil = _sysio_fd_find(fd);
 	if (!fil)
 		SYSIO_INTERFACE_RETURN((off64_t )-1,
 				       -EBADF,
-				       lseek64, "%loY", 0);
+				       lseek64, "%loZ", 0);
 	off = _sysio_lseek(fil, offset, whence, _SEEK_MAX(fil));
 	SYSIO_INTERFACE_RETURN(off < 0 ? (off64_t )-1 : off,
 			       off < 0 ? (int )off : 0,
-			       lseek64, "%loY", 0);
+			       lseek64, "%loZ", 0);
 
 }
 #ifdef __GLIBC__
@@ -162,16 +162,16 @@ SYSIO_INTERFACE_NAME(lseek)(int fd, off_
 	off_t	rtn;
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
-	SYSIO_INTERFACE_ENTER(lseek, "%d%oY%d", fd, offset, whence);
+	SYSIO_INTERFACE_ENTER(lseek, "%d%oZ%d", fd, offset, whence);
 	fil = _sysio_fd_find(fd);
 	if (!fil)
-		SYSIO_INTERFACE_RETURN((off_t )-1, -EBADF, lseek, "%oY", 0);
+		SYSIO_INTERFACE_RETURN((off_t )-1, -EBADF, lseek, "%oZ", 0);
 	off = _sysio_lseek(fil, offset, whence, LONG_MAX);
 	if (off < 0)
-		SYSIO_INTERFACE_RETURN((off_t )-1, (int )off, lseek, "%oY", 0);
+		SYSIO_INTERFACE_RETURN((off_t )-1, (int )off, lseek, "%oZ", 0);
 	rtn = (off_t )off;
 	assert(rtn == off);
-	SYSIO_INTERFACE_RETURN(rtn, 0, lseek, "%oY", 0);
+	SYSIO_INTERFACE_RETURN(rtn, 0, lseek, "%oZ", 0);
 }
 
 #ifdef __GLIBC__

Index: open.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/open.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -b -B -p -r1.30 -r1.31
--- open.c	2 Jul 2007 18:58:17 -0000	1.30
+++ open.c	19 Sep 2007 16:01:33 -0000	1.31
@@ -161,7 +161,7 @@ SYSIO_INTERFACE_NAME(open)(const char *p
 	if (flags & O_NOFOLLOW)
 		ndflags |= ND_NOFOLLOW;
 #endif
-	SYSIO_INTERFACE_ENTER(open, "%s%d%mY", path, flags, mode);
+	SYSIO_INTERFACE_ENTER(open, "%s%d%mZ", path, flags, mode);
 
 	/*
 	 * Find the file.

Index: rw.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/rw.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -b -B -p -r1.22 -r1.23
--- rw.c	2 Jul 2007 18:58:17 -0000	1.22
+++ rw.c	19 Sep 2007 16:01:33 -0000	1.23
@@ -307,7 +307,7 @@ _do_ireadx(int fd,
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
 	SYSIO_INTERFACE_ENTER(ireadx,
-			      "%d%*iY%*xZ",
+			      "%d%*iZ%*xY",
 			      fd,
 			      iov_count, iov,
 			      xtv_count, xtv);
@@ -357,7 +357,7 @@ _do_iwritex(int fd,
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
 	SYSIO_INTERFACE_ENTER(iwritex,
-			      "%d%*iY%*xZ",
+			      "%d%*iZ%*xY",
 			      fd,
 			      iov_count, iov,
 			      xtv_count, xtv);
@@ -877,9 +877,9 @@ _do_iiov(direction dir,
 	SYSIO_INTERFACE_DISPLAY_BLOCK;
 
 	if (dir == READ)
-		SYSIO_INTERFACE_ENTER(ireadv, "%d%*iY", fd, count, iov);
+		SYSIO_INTERFACE_ENTER(ireadv, "%d%*iZ", fd, count, iov);
 	else
-		SYSIO_INTERFACE_ENTER(iwritev, "%d%*iY", fd, count, iov);
+		SYSIO_INTERFACE_ENTER(iwritev, "%d%*iZ", fd, count, iov);
 	xtv = NULL;
 	err = 0;
 	do {

Index: stat.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/stat.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -b -B -p -r1.20 -r1.21
--- stat.c	2 Jul 2007 18:58:17 -0000	1.20
+++ stat.c	19 Sep 2007 16:01:33 -0000	1.21
@@ -84,10 +84,7 @@ _sysio_fxstat(int ver, int fildes, struc
 	 */
 	err = PNOP_GETATTR(fil->f_pno, stat_buf);
 out:
-	/*
-	 * Note: Pass the stat buffer to the tracing routines some day.
-	 */
-	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, fxstat, "%d", 0);
+	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, fxstat, "%d%sY", stat_buf);
 }
 
 static int
@@ -121,10 +118,7 @@ _sysio_xstatnd(int ver,
 		      sizeof(struct intnl_stat));
 	P_RELE(pno);
 out:
-	/*
-	 * Note: Pass the stat buffer to the tracing routines some day.
-	 */
-	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, xstatnd, "%d", 0);
+	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, xstatnd, "%d%sY", stat_buf);
 }
 
 #ifdef _LARGEFILE64_SOURCE

Index: statvfs.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/statvfs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -b -B -p -r1.17 -r1.18
--- statvfs.c	2 Jul 2007 18:58:17 -0000	1.17
+++ statvfs.c	19 Sep 2007 16:01:33 -0000	1.18
@@ -96,10 +96,7 @@ SYSIO_INTERFACE_NAME(statvfs64)(const ch
 
 	SYSIO_INTERFACE_ENTER(statvfs64, "%s", path);
 	err = _sysio_statvfs(path, buf);
-	/*
-	 * Note: Pass the statvfs buffer to the tracing routines some day.
-	 */
-	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, statvfs64, "%d", 0);
+	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, statvfs64, "%d%sY", buf);
 }
 
 #ifdef REDSTORM
@@ -116,10 +113,7 @@ SYSIO_INTERFACE_NAME(fstatvfs64)(int fd,
 
 	SYSIO_INTERFACE_ENTER(fstatvfs64, "%d", fd);
 	err = _sysio_fstatvfs(fd, buf);
-	/*
-	 * Note: Pass the statvfs buffer to the tracing routines some day.
-	 */
-	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, fstatvfs64, "%d", 0);
+	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, fstatvfs64, "%d%sY", buf);
 }
 
 #ifdef REDSTORM
@@ -169,10 +163,7 @@ SYSIO_INTERFACE_NAME(statvfs)(const char
 		convstatvfs(buf, _call_buf);
 #undef _call_buf
 #endif /* defined(_LARGEFILE64_SOURCE) */
-	/*
-	 * Note: Pass the statvfs buffer to the tracing routines some day.
-	 */
-	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, statvfs, "%d", 0);
+	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, statvfs, "%d%sY", buf);
 }
 
 #ifdef REDSTORM
@@ -200,10 +191,7 @@ SYSIO_INTERFACE_NAME(fstatvfs)(int fd, s
 		convstatvfs(buf, _call_buf);
 #undef _call_buf
 #endif
-	/*
-	 * Note: Pass the statvfs buffer to the tracing routines some day.
-	 */
-	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, fstatvfs, "%d", 0);
+	SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, fstatvfs, "%d%sY", buf);
 }
 
 #ifdef REDSTORM