Changeset 4454

Timestamp:

Apr 2, 2021, 10:26:48 AM (4 years ago)

Author:

Andreas Schnellbacher

Message:

• DeleteConfigTree: A trailing backslash indicates now that only subpaths should be deleted.

File:

• trunk/src/netlabs/macros/config.e (modified) (4 diffs)

trunk/src/netlabs/macros/config.e ¶

@@ -1393 +1393 @@
 ; ---------------------------------------------------------------------------
 defproc DeleteConfigTree( KeyPath)
-   -- Strip trailing '\'
+   -- A trailing backslash may be specified to delete only subkeys
+   fDeleteSubOnly = 0
    if rightstr( KeyPath, 1) = '\' then
+      fDeleteSubOnly = 1
+      -- Strip trailing '\'
       KeyPath = leftstr( KeyPath, length( KeyPath) - 1)
    endif
@@ -1400 +1403 @@
 
    --dprintf( 'KeyPath = 'KeyPath)
-   call DeleteNextConfigKey( KeyPath)
+   call DeleteNextConfigKey( KeyPath, '', fDeleteSubOnly)
 
    return
@@ -1428 +1431 @@
    endif
 
-   -- Delete key, don't query default values
-   -- This doesn't find empty values nor empty zero-terminated values.
-   Val = queryprofile( nepmd_hini, 'RegKeys', KeyPath)
-   if Val <> '' then
-      numcfgkeys = numcfgkeys + 1
-      --dprintf( '   Key found: 'KeyPath' = 'strip( leftstr( translate( Val, '.', \1), 80)))
-   endif
-
-   -- This finds also empty values or empty zero-terminated values.
-   call DeleteConfigKey( KeyPath)
+   fDeleteSubOnly = (arg( 3) = 1)
+   if not fDeleteSubOnly then
+      -- Delete key, don't query default values
+      -- This doesn't find empty values nor empty zero-terminated values.
+      Val = queryprofile( nepmd_hini, 'RegKeys', KeyPath)
+      if Val <> '' then
+         numcfgkeys = numcfgkeys + 1
+         --dprintf( '   Key found: 'KeyPath' = 'strip( leftstr( translate( Val, '.', \1), 80)))
+      endif
+
+      -- This finds also empty values or empty zero-terminated values.
+      call DeleteConfigKey( KeyPath)
+   endif
+   fDeleteSubOnly = 0
 
    -- Delete subkeys and subcontainers
@@ -1447 +1454 @@
 
       -- Process NextKey (recursive call)
-      call DeleteNextConfigKey( KeyPath'\'NextKey, KeyPath)
+      call DeleteNextConfigKey( KeyPath'\'NextKey, KeyPath, fDeleteSubOnly)
       -- Don't stop here on error to delete the rest
       --if rc then