Changeset 411

Timestamp:

Mar 29, 2012, 11:03:40 PM (13 years ago)

Author:

pr

Message:

Deleting a non-existant directory not an error.

Files:

• branches/branch-1-0/src/helpers/dosh.c (modified) (3 diffs)
• trunk/src/helpers/dosh.c (modified) (3 diffs)

branches/branch-1-0/src/helpers/dosh.c

@@ -30 +30 @@
 
 /*
- *      This file Copyright (C) 1997-2010 Ulrich M”ller.
+ *      This file Copyright (C) 1997-2012 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -3502 +3502 @@
  *@@changed WarpIN V1.0.15 (2007-03-27) [pr]: allow NULL pulDirs and pulFiles
  *@@changed WarpIN V1.0.16 (2007-07-28) [pr]: bump directory count on recursive delete failures @@fixes 1001
+ *@@changed WarpIN V1.0.20 (2012-03-29) [pr]: path not found no longer an error
  */
 
@@ -3592 +3593 @@
 
     if (arcReturn == NO_ERROR)
+    {
         // success so far:
         // delete our directory now
         arcReturn = DosDeleteDir((PSZ)pcszDir);
+        if (arcReturn == ERROR_PATH_NOT_FOUND)  // WarpIN V1.0.20 (2012-03-29) [pr]
+            arcReturn = NO_ERROR;
+    }
 
     return (arcReturn);

trunk/src/helpers/dosh.c

@@ -30 +30 @@
 
 /*
- *      This file Copyright (C) 1997-20107Ulrich M”ller.
+ *      This file Copyright (C) 1997-2012 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -3715 +3715 @@
  *@@changed WarpIN V1.0.15 (2007-03-27) [pr]: allow NULL pulDirs and pulFiles
  *@@changed WarpIN V1.0.16 (2007-07-28) [pr]: bump directory count on recursive delete failures @@fixes 1001
+ *@@changed WarpIN V1.0.20 (2012-03-29) [pr]: path not found no longer an error
  */
 
@@ -3805 +3806 @@
 
     if (arcReturn == NO_ERROR)
+    {
         // success so far:
         // delete our directory now
         arcReturn = DosDeleteDir((PSZ)pcszDir);
+        if (arcReturn == ERROR_PATH_NOT_FOUND)  // WarpIN V1.0.20 (2012-03-29) [pr]
+            arcReturn = NO_ERROR;
+    }
 
     return arcReturn;