registry...

[metze/samba/wip.git] / source4 / lib / registry / tools / regtree.c

diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 68579406722dcfa7103a92938c8a6d008aea3c99..c4ffe0d9a406421ee2232378d0be279d0a166c82 100644 (file)
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -46,7 +46,8 @@ static void print_tree(unsigned int level, struct registry_key *p,
        unsigned int i;
        TALLOC_CTX *mem_ctx;
 
-       for(i = 0; i < level; i++) putchar(' '); puts(name);
+       for(i = 0; i < level; i++) putchar(' ');
+       puts(name);
 
        mem_ctx = talloc_init("print_tree");
        for (i = 0; W_ERROR_IS_OK(error = reg_key_get_subkey_by_index(mem_ctx,
@@ -92,13 +93,15 @@ static void print_tree(unsigned int level, struct registry_key *p,
        }
 
        mem_ctx = talloc_init("sec_desc");
-       if (NT_STATUS_IS_ERR(reg_get_sec_desc(mem_ctx, p, &sec_desc))) {
-               DEBUG(0, ("Error getting security descriptor\n"));
+       error = reg_get_sec_desc(mem_ctx, p, &sec_desc);
+       if (!W_ERROR_IS_OK(error)) {
+               DEBUG(0, ("Error getting security descriptor: - %s\n",
+                       win_errstr(error)));
        }
        talloc_free(mem_ctx);
 }
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
        int opt;
        unsigned int i;
@@ -122,7 +125,7 @@ int main(int argc, char **argv)
                { NULL }
        };
 
-       pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
+       pc = poptGetContext(argv[0], argc, argv, long_options,0);
 
        while((opt = poptGetNextOpt(pc)) != -1) {
        }