diff --git a/NT/elconv.vcproj b/NT/elconv.vcproj index 33033a43..b174553e 100755 --- a/NT/elconv.vcproj +++ b/NT/elconv.vcproj @@ -1,130 +1,193 @@ + ProjectGUID="{8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -132,33 +195,41 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="..\src\elconv.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + Filter="h;hpp;hxx;hm;inl" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > diff --git a/NT/elog.vcproj b/NT/elog.vcproj index 652717d8..ea6cedd0 100755 --- a/NT/elog.vcproj +++ b/NT/elog.vcproj @@ -1,132 +1,195 @@ + ProjectGUID="{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -134,34 +197,42 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="..\src\elog.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Filter="h;hpp;hxx;hm;inl" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > diff --git a/NT/elogd.sln b/NT/elogd.sln index 6db5600b..2fcfe4a8 100755 --- a/NT/elogd.sln +++ b/NT/elogd.sln @@ -1,39 +1,31 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elconv", "elconv.vcproj", "{8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elog", "elog.vcproj", "{FD6FCAF3-A94B-40FA-AE52-07705DE2E519}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elogd", "elogd.vcproj", "{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locext", "locext.vcproj", "{77ED3530-9382-4830-8513-9729C051A93E}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}.Debug.ActiveCfg = Debug|Win32 - {8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}.Release.ActiveCfg = Release|Win32 - {FD6FCAF3-A94B-40FA-AE52-07705DE2E519}.Debug.ActiveCfg = Debug|Win32 - {FD6FCAF3-A94B-40FA-AE52-07705DE2E519}.Release.ActiveCfg = Release|Win32 - {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Debug.ActiveCfg = Debug|Win32 - {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Debug.Build.0 = Debug|Win32 - {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Release.ActiveCfg = Release|Win32 - {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Release.Build.0 = Release|Win32 - {77ED3530-9382-4830-8513-9729C051A93E}.Debug.ActiveCfg = Debug|Win32 - {77ED3530-9382-4830-8513-9729C051A93E}.Release.ActiveCfg = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}.Debug|Win32.ActiveCfg = Debug|Win32 + {8D6EBED8-48F3-4719-907E-7BE46A3C0FA4}.Release|Win32.ActiveCfg = Release|Win32 + {FD6FCAF3-A94B-40FA-AE52-07705DE2E519}.Debug|Win32.ActiveCfg = Debug|Win32 + {FD6FCAF3-A94B-40FA-AE52-07705DE2E519}.Release|Win32.ActiveCfg = Release|Win32 + {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Debug|Win32.ActiveCfg = Debug|Win32 + {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Debug|Win32.Build.0 = Debug|Win32 + {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Release|Win32.ActiveCfg = Release|Win32 + {CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}.Release|Win32.Build.0 = Release|Win32 + {77ED3530-9382-4830-8513-9729C051A93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {77ED3530-9382-4830-8513-9729C051A93E}.Release|Win32.ActiveCfg = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/NT/elogd.vcproj b/NT/elogd.vcproj index 257d2f72..cb4abd8c 100755 --- a/NT/elogd.vcproj +++ b/NT/elogd.vcproj @@ -1,143 +1,205 @@ + ProjectGUID="{CB6EB7FE-CC3D-4548-B8B8-8DDA05916759}" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -145,89 +207,115 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="..\src\elogd.c" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + BrowseInformation="1" + /> + RelativePath="..\..\mxml\mxml.c" + > + Name="Debug|Win32" + > + PreprocessorDefinitions="HAVE_STRLCPY" + /> + RelativePath="..\src\regex.c" + > + Name="Debug|Win32" + > + WarningLevel="0" + /> + RelativePath="..\..\mxml\strlcpy.c" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;css" + > + RelativePath="..\themes\default\default.css" + > + RelativePath="..\scripts\elcode.js" + > + RelativePath="..\..\elogdemo\elogd.cfg" + > + RelativePath="..\resources\eloglang.german" + > + Filter="txt;htm;html" + > + RelativePath="..\doc\ChangeLog" + > + RelativePath="..\checklist.txt" + > + RelativePath="..\doc\config.html" + > + RelativePath="..\doc\index.html" + > + Filter="h;hpp;hxx;hm;inl" + > + RelativePath="..\..\mxml\mxml.h" + > + RelativePath="..\src\regex.h" + > diff --git a/NT/locext.vcproj b/NT/locext.vcproj index adc60a49..e9a6b00c 100755 --- a/NT/locext.vcproj +++ b/NT/locext.vcproj @@ -1,130 +1,193 @@ + ProjectGUID="{77ED3530-9382-4830-8513-9729C051A93E}" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -132,33 +195,41 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="..\src\locext.c" + > + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Filter="h;hpp;hxx;hm;inl" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > diff --git a/src/elogd.c b/src/elogd.c index e083c8b9..8f7a30cb 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -19892,7 +19892,7 @@ void submit_elog(LOGBOOK * lbs) tms.tm_mday = day; tms.tm_hour = 12; - ltime = mktime(&tms); + ltime = (int) mktime(&tms); if (ltime == -1) { show_error(loc("Date must be between 1970 and 2037")); @@ -19940,7 +19940,7 @@ void submit_elog(LOGBOOK * lbs) tms.tm_sec = sec; tms.tm_isdst = -1; - ltime = mktime(&tms); + ltime = (int) mktime(&tms); if (ltime == -1) { show_error(loc("Date must be between 1970 and 2037")); diff --git a/src/regex.c b/src/regex.c index d0febf78..d522538f 100755 --- a/src/regex.c +++ b/src/regex.c @@ -4642,11 +4642,7 @@ int eflags; /* Returns a message corresponding to an error code, ERRCODE, returned from either regcomp or regexec. We don't use PREG here. */ -size_t regerror(errcode, preg, errbuf, errbuf_size) -int errcode; -const regex_t *preg; -char *errbuf; -size_t errbuf_size; +size_t regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size) { const char *msg; size_t msg_size;