CVS update: /ccvs/windows-NT/

User: conradpino
Date: 05/05/26 02:40:42

Modified:
 /ccvs/windows-NT/
  ChangeLog, filesubr.c

Log:
 * filesubr.c: Remove "wnt_lstat" function.  Collapse static function
 "check_statbuf" logic into "wnt_stat" function body.

File Changes:

Directory: /ccvs/windows-NT/
============================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/windows-NT/ChangeLog?r1=1.304&r2=1.305
Delta lines:  +5 -0
-------------------
--- ChangeLog	26 May 2005 08:52:30 -0000	1.304
+++ ChangeLog	26 May 2005 09:40:40 -0000	1.305
@@ -1,5 +1,10 @@
 2005-05-26  Conrad T. Pino  <[email protected]>
 
+	* filesubr.c: Remove "wnt_lstat" function.  Collapse static function
+	"check_statbuf" logic into "wnt_stat" function body.
+
+2005-05-26  Conrad T. Pino  <[email protected]>
+
 	* config.h, config.h.in, stamp-chi: Regenerated on Solaris for updates
 	to config.h.in.footer and config.h.in.in committed on Windows.
 

File [changed]: filesubr.c
Url: https://ccvs.cvshome.org/source/browse/ccvs/windows-NT/filesubr.c?r1=1.56&r2=1.57
Delta lines:  +18 -30
---------------------
--- filesubr.c	23 May 2005 22:56:16 -0000	1.56
+++ filesubr.c	26 May 2005 09:40:40 -0000	1.57
@@ -944,8 +944,20 @@
     *pargv = new_argv;
 }
 
-static void check_statbuf (const char *file, struct stat *sb)
+/* undo config.h stat macro */
+#undef stat
+extern int stat (const char *file, struct wnt_stat *sb);
+
+/* see config.h stat macro */
+int
+wnt_stat (const char *file, struct wnt_stat *sb)
 {
+    int retval;
+
+    retval = stat (file, sb);
+    if (retval < 0)
+		return retval;
+
     /* Win32 processes file times in a 64 bit format
        (see Win32 functions SetFileTime and GetFileTime).
        If the file time on a file doesn't fit into the
@@ -968,30 +980,6 @@
 
     if (!GetUTCFileModTime (file, &sb->st_mtime))
 	error (1, 0, "Failed to retrieve modification time for %s", file);
-}
-
-/* see CVS_STAT */
-int
-wnt_stat (const char *file, struct stat *sb)
-{
-    int retval;
 
-    retval = stat (file, sb);
-    if (retval < 0)
-	return retval;
-    check_statbuf (file, sb);
-    return retval;
-}
-
-/* see CVS_LSTAT */
-int
-wnt_lstat (const char *file, struct stat *sb)
-{
-    int retval;
-
-    retval = lstat (file, sb);
-    if (retval < 0)
-	return retval;
-    check_statbuf (file, sb);
     return retval;
 }