[Fedora-directory-commits] adminserver/lib/base nscputil.cpp, 1.3, 1.3.2.1 buffer.cpp, 1.4, NONE eventhandler.cpp, 1.3, NONE eventlog.cpp, 1.3, NONE ntdaemon.cpp, 1.3, NONE nterrors.cpp, 1.3, NONE ntpipe.cpp, 1.3, NONE
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Mon Jul 14 20:58:49 UTC 2008
Author: rmeggins
Update of /cvs/dirsec/adminserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver/lib/base
Modified Files:
Tag: Directory_Server_8_0_Branch
nscputil.cpp
Removed Files:
Tag: Directory_Server_8_0_Branch
buffer.cpp eventhandler.cpp eventlog.cpp ntdaemon.cpp
nterrors.cpp ntpipe.cpp
Log Message:
remove obsolete code from 8.0 branch
Index: nscputil.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- nscputil.cpp 22 Jun 2007 01:34:20 -0000 1.3
+++ nscputil.cpp 14 Jul 2008 20:58:47 -0000 1.3.2.1
@@ -44,9 +44,6 @@
#include "base/util.h"
-#include "base/dbtbase.h"
-
-
#ifdef XP_UNIX
#include <sys/types.h>
#endif /* WIN32 */
@@ -850,66 +847,6 @@
}
#endif /* NEED_STRNCASECMP */
-#ifdef XP_WIN32
-
-
-/* util_delete_directory()
- * This routine deletes all the files in a directory. If delete_directory is
- * TRUE it will also delete the directory itself.
- */
-VOID
-util_delete_directory(char *FileName, BOOL delete_directory)
-{
- HANDLE firstFile;
- WIN32_FIND_DATA findData;
- char *TmpFile, *NewFile;
-
- if (FileName == NULL)
- return;
-
- TmpFile = (char *)MALLOC(strlen(FileName) + 5);
- sprintf(TmpFile, "%s\\*.*", FileName);
- firstFile = FindFirstFile(TmpFile, &findData);
- FREE(TmpFile);
-
- if (firstFile == INVALID_HANDLE_VALUE)
- return;
-
- if(strcmp(findData.cFileName, ".") &&
- strcmp(findData.cFileName, "..")) {
- NewFile = (char *)MALLOC(strlen(FileName) + 1 +
- strlen(findData.cFileName) + 1);
- sprintf(NewFile, "%s\\%s",FileName, findData.cFileName);
- DeleteFile(NewFile);
- FREE(NewFile);
- }
- while (TRUE) {
- if(!(FindNextFile(firstFile, &findData))) {
- if (GetLastError() != ERROR_NO_MORE_FILES) {
-// ereport(LOG_WARN, XP_GetAdminStr(DBT_couldNotRemoveTemporaryDirectory_), FileName, GetLastError());
- } else {
- FindClose(firstFile);
- if (delete_directory)
- if(!RemoveDirectory(FileName)) {
-// ereport(LOG_WARN,
- XP_GetAdminStr(DBT_couldNotRemoveTemporaryDirectory_1),
- FileName, GetLastError());
- }
- return;
- }
- } else {
- if(strcmp(findData.cFileName, ".") &&
- strcmp(findData.cFileName, "..")) {
- NewFile = (char *)MALLOC(strlen(FileName) + 5 +
- strlen(findData.cFileName) + 1);
- sprintf(NewFile,"%s\\%s", FileName, findData.cFileName);
- DeleteFile(NewFile);
- FREE(NewFile);
- }
- }
- }
-}
-#endif
/* ------------------------------ util_strftime --------------------------- */
/*
--- buffer.cpp DELETED ---
--- eventhandler.cpp DELETED ---
--- eventlog.cpp DELETED ---
--- ntdaemon.cpp DELETED ---
--- nterrors.cpp DELETED ---
--- ntpipe.cpp DELETED ---
More information about the Fedora-directory-commits
mailing list