2008-04-19 Dmitry V. Levin <ldv@altlinux.org>

	* file.c [LINUXSPARC] (printstatsol): Fix sprinttime()
	invocation.  The sprinttime() function takes a time_t argument,
	but timestruct_t argument was given.
	Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 8fd4063e6e8d60b298a24ef7680114520771af39..e59b000f334f78bcd78d3fb8fd3aed56b560e455 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-19  Dmitry V. Levin <ldv@altlinux.org>
 
+       * file.c [LINUXSPARC] (printstatsol): Fix sprinttime()
+       invocation.  The sprinttime() function takes a time_t argument,
+       but timestruct_t argument was given.
+       Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
        * file.c (sprinttime): Check localtime() return value, to avoid
        potential NULL dereference due to invalid time structures.
        Signed-off-by: Harald van Dijk <truedfx@gentoo.org>

diff --git a/file.c b/file.c
index 7128523a13b160cf4a4a46537953e4c8d12e411d..25fb5316476f2e6112604502b0bbe5e222f6be30 100644 (file)
--- a/file.c
+++ b/file.c
@@ -723,9 +723,7 @@ struct solstat {
 };
 
 static void
-printstatsol(tcp, addr)
-struct tcb *tcp;
-long addr;
+printstatsol(struct tcb *tcp, long addr)
 {
        struct solstat statbuf;
 
@@ -767,9 +765,9 @@ long addr;
                break;
        }
        if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
+               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
+               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
+               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
        }
        else
                tprintf("...}");