You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/03/28 23:22:24 UTC
cvs commit: apache-2.0/src/lib/apr/misc/win32 timetest.c
stoddard 00/03/28 13:22:23
Modified: src/lib/apr aprlib.def aprlib.dsp aprlib.mak
src/lib/apr/file_io/win32 dir.c readwrite.c
src/lib/apr/include apr_winconfig.h
Removed: src/lib/apr/misc/win32 timetest.c
Log:
Get rid of WinTimeToUnixTime. Replace all instances of its use with
FileTimeToAprTime. Move timetest.c into the attic.
Revision Changes Path
1.13 +1 -1 apache-2.0/src/lib/apr/aprlib.def
Index: aprlib.def
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aprlib.def 2000/03/06 18:12:06 1.12
+++ aprlib.def 2000/03/28 21:22:17 1.13
@@ -122,7 +122,7 @@
canonical_filename @113
ap_create_context @114
ap_destroy_context @115
- WinTimeToUnixTime @116
+; WinTimeToUnixTime @116
ap_get_oslevel @117
ap_get_userdata @118
ap_set_userdata @119
1.9 +0 -4 apache-2.0/src/lib/apr/aprlib.dsp
Index: aprlib.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aprlib.dsp 2000/03/21 23:26:33 1.8
+++ aprlib.dsp 2000/03/28 21:22:17 1.9
@@ -244,10 +244,6 @@
SOURCE=.\time\win32\timestr.c
# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\timetest.c
-# End Source File
# End Group
# Begin Group "Header Files"
1.9 +2 -197 apache-2.0/src/lib/apr/aprlib.mak
Index: aprlib.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aprlib.mak 2000/03/21 23:26:33 1.8
+++ aprlib.mak 2000/03/28 21:22:18 1.9
@@ -83,7 +83,6 @@
-@erase "$(INTDIR)\threadpriv.obj"
-@erase "$(INTDIR)\time.obj"
-@erase "$(INTDIR)\timestr.obj"
- -@erase "$(INTDIR)\timetest.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(OUTDIR)\aprlib.dll"
-@erase "$(OUTDIR)\aprlib.exp"
@@ -145,8 +144,7 @@
"$(INTDIR)\threadcancel.obj" \
"$(INTDIR)\threadpriv.obj" \
"$(INTDIR)\time.obj" \
- "$(INTDIR)\timestr.obj" \
- "$(INTDIR)\timetest.obj"
+ "$(INTDIR)\timestr.obj"
"$(OUTDIR)\aprlib.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -207,7 +205,6 @@
-@erase "$(INTDIR)\threadpriv.obj"
-@erase "$(INTDIR)\time.obj"
-@erase "$(INTDIR)\timestr.obj"
- -@erase "$(INTDIR)\timetest.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\vc50.pdb"
-@erase "$(OUTDIR)\aprlib.dll"
@@ -273,8 +270,7 @@
"$(INTDIR)\threadcancel.obj" \
"$(INTDIR)\threadpriv.obj" \
"$(INTDIR)\time.obj" \
- "$(INTDIR)\timestr.obj" \
- "$(INTDIR)\timetest.obj"
+ "$(INTDIR)\timestr.obj"
"$(OUTDIR)\aprlib.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -329,11 +325,7 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\time\win32\atime.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_ACCES=\
- ".\include\apr.h"\
-
"$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -372,11 +364,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_APR_C=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
@@ -404,25 +391,10 @@
SOURCE=.\lib\apr_execve.c
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
-NODEP_CPP_APR_E=\
- ".\lib\apr_config.h"\
-
-
"$(INTDIR)\apr_execve.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
-
-"$(INTDIR)\apr_execve.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\lib\apr_fnmatch.c
!IF "$(CFG)" == "aprlib - Win32 Release"
@@ -436,12 +408,7 @@
".\include\apr_thread_proc.h"\
".\include\apr_time.h"\
".\include\apr_win.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_APR_F=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
-
"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -479,11 +446,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_APR_G=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
"$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
@@ -522,12 +484,7 @@
".\include\apr_thread_proc.h"\
".\include\apr_time.h"\
".\include\apr_win.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_APR_M=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
-
"$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -569,12 +526,6 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\misc\win32\misc.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_APR_P=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
"$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
@@ -617,13 +568,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_APR_S=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
- ".\lib\http_log.h"\
-
CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I\
"./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
"WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
@@ -671,11 +616,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_APR_SN=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"
@@ -717,12 +657,7 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\misc\win32\misc.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_APR_T=\
- ".\include\apr.h"\
- ".\lib\apr_config.h"\
-
"$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -768,11 +703,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_DIR_C=\
- ".\include\apr.h"\
"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
@@ -818,12 +748,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_FILEA=\
- ".\include\apr.h"\
-
"$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -865,11 +790,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_FILED=\
- ".\include\apr.h"\
"$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
@@ -912,12 +832,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_FILES=\
- ".\include\apr.h"\
-
"$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -956,10 +871,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\misc\win32\misc.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_GETOP=\
- ".\include\apr.h"\
"$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
@@ -1000,11 +911,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\locks\win32\locks.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_LOCKS=\
- ".\include\apr.h"\
-
"$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1045,11 +952,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_NAMES=\
- ".\include\apr.h"\
"$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
@@ -1093,12 +995,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_OPEN_=\
- ".\include\apr.h"\
-
"$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1143,11 +1040,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_PIPE_=\
- ".\include\apr.h"\
"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
@@ -1189,11 +1081,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\network_io\win32\networkio.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_POLL_=\
- ".\include\apr.h"\
-
"$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1238,11 +1126,6 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\threadproc\win32\threadproc.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_PROC_=\
- ".\include\apr.h"\
"$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
@@ -1275,20 +1158,6 @@
!ENDIF
SOURCE=.\file_io\win32\readdir.c
-
-!IF "$(CFG)" == "aprlib - Win32 Release"
-
-DEP_CPP_READD=\
- ".\file_io\win32\readdir.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-
-"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "aprlib - Win32 Debug"
-
DEP_CPP_READD=\
".\file_io\win32\readdir.h"\
@@ -1297,8 +1166,6 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ENDIF
-
SOURCE=.\file_io\win32\readwrite.c
!IF "$(CFG)" == "aprlib - Win32 Release"
@@ -1314,11 +1181,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_READW=\
- ".\include\apr.h"\
"$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
@@ -1361,12 +1223,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_SEEK_=\
- ".\include\apr.h"\
-
"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1410,11 +1267,6 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\network_io\win32\networkio.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_SENDR=\
- ".\include\apr.h"\
"$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
@@ -1460,12 +1312,7 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\threadproc\win32\threadproc.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_SIGNA=\
- ".\include\apr.h"\
-
"$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1507,10 +1354,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\network_io\win32\networkio.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_SOCKA=\
- ".\include\apr.h"\
"$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
@@ -1553,11 +1396,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\network_io\win32\networkio.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_SOCKE=\
- ".\include\apr.h"\
-
"$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1599,10 +1438,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\network_io\win32\networkio.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_SOCKO=\
- ".\include\apr.h"\
"$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
@@ -1645,11 +1480,7 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\misc\win32\misc.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_START=\
- ".\include\apr.h"\
-
"$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1694,10 +1525,6 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\threadproc\win32\threadproc.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_THREA=\
- ".\include\apr.h"\
"$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
@@ -1739,11 +1566,7 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\threadproc\win32\threadproc.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_THREAD=\
- ".\include\apr.h"\
-
"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1783,10 +1606,6 @@
".\include\apr_time.h"\
".\include\apr_win.h"\
".\threadproc\win32\threadproc.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_THREADP=\
- ".\include\apr.h"\
"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"
@@ -1832,11 +1651,7 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\time\win32\atime.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_TIME_=\
- ".\include\apr.h"\
-
"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -1881,10 +1696,6 @@
".\include\apr_win.h"\
".\include\apr_winconfig.h"\
".\time\win32\atime.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_TIMES=\
- ".\include\apr.h"\
"$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"
@@ -1912,12 +1723,6 @@
!ENDIF
-
-SOURCE=.\misc\win32\timetest.c
-
-"$(INTDIR)\timetest.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
!ENDIF
1.13 +1 -3 apache-2.0/src/lib/apr/file_io/win32/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dir.c 2000/03/10 00:06:05 1.12
+++ dir.c 2000/03/28 21:22:20 1.13
@@ -176,9 +176,7 @@
if (thedir == NULL || thedir->entry == NULL) {
return APR_ENODIR;
}
-
- *time = WinTimeToUnixTime(&thedir->entry->ftLastWriteTime);
-
+ FileTimeToAprTime(time, &thedir->entry->ftLastWriteTime);
return APR_SUCCESS;
}
1.16 +3 -3 apache-2.0/src/lib/apr/file_io/win32/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- readwrite.c 2000/03/22 09:21:35 1.15
+++ readwrite.c 2000/03/28 21:22:20 1.16
@@ -104,9 +104,9 @@
FlushFileBuffers(thefile->filehand);
thefile->size = GetFileSize(thefile->filehand, NULL);
GetFileTime(thefile->filehand, &ctime, &atime, &mtime);
- thefile->atime = WinTimeToUnixTime(&atime);
- thefile->mtime = WinTimeToUnixTime(&mtime);
- thefile->ctime = WinTimeToUnixTime(&ctime);
+ FileTimeToAprTime(&thefile->atime, &atime);
+ FileTimeToAprTime(&thefile->mtime, &mtime);
+ FileTimeToAprTime(&thefile->ctime, &ctime);
}
*nbytes = bwrote;
return APR_SUCCESS;
1.6 +1 -1 apache-2.0/src/lib/apr/include/apr_winconfig.h
Index: apr_winconfig.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_winconfig.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_winconfig.h 2000/03/10 00:06:10 1.5
+++ apr_winconfig.h 2000/03/28 21:22:21 1.6
@@ -154,7 +154,7 @@
* only found in the windows version of APR.
*/
-time_t WinTimeToUnixTime(FILETIME *);
+void FileTimeToAprTime(time_t *atime, FILETIME *ft);
unsigned __stdcall SignalHandling(void *);
int thread_ready(void);