regedit: add padding for key labels when there's not a prefix.
authorChris Davis <cd.rattan@gmail.com>
Tue, 20 May 2014 00:34:01 +0000 (17:34 -0700)
committerMichael Adam <obnox@samba.org>
Wed, 1 Oct 2014 12:32:08 +0000 (14:32 +0200)
Signed-off-by: Chris Davis <cd.rattan@gmail.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
source3/utils/regedit_treeview.c

index c74f052c5951ad99348ad82c32ee9d10e5586dfb..1f2354ad35babefca579d85b99b7479b26cb15bb 100644 (file)
@@ -253,20 +253,21 @@ WERROR tree_view_update(struct tree_view *view, struct tree_node *list)
        }
 
        for (i = 0, node = list; node != NULL; ++i, node = node->next) {
-               const char *label = node->name;
+               char prefix = ' ';
 
                /* Add a '+' marker to indicate that the item has
                   descendants. */
                if (tree_node_has_children(node)) {
-                       SMB_ASSERT(node->label == NULL);
-                       node->label = talloc_asprintf(node, "+%s", node->name);
-                       if (node->label == NULL) {
-                               goto fail;
-                       }
-                       label = node->label;
+                       prefix = '+';
+               }
+
+               SMB_ASSERT(node->label == NULL);
+               node->label = talloc_asprintf(node, "%c%s", prefix, node->name);
+               if (node->label == NULL) {
+                       goto fail;
                }
 
-               items[i] = new_item(label, node->name);
+               items[i] = new_item(node->label, node->name);
                set_item_userptr(items[i], node);
        }