Finish removal of iconv_convenience in public API's.

[bbaumbach/samba-autobuild/.git] / source4 / lib / registry / tools / regtree.c

diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index d266b604e31592cce440ab520827cb4ee6c122fc..68579406722dcfa7103a92938c8a6d008aea3c99 100644 (file)
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -33,7 +33,7 @@
  * @param fullpath Whether the full pat hshould be printed or just the last bit
  * @param novals Whether values should not be printed
  */
-static void print_tree(int level, struct registry_key *p,
+static void print_tree(unsigned int level, struct registry_key *p,
                       const char *name,
                       bool fullpath, bool novals)
 {
@@ -43,7 +43,7 @@ static void print_tree(int level, struct registry_key *p,
        DATA_BLOB valuedata;
        struct security_descriptor *sec_desc;
        WERROR error;
-       int i;
+       unsigned int i;
        TALLOC_CTX *mem_ctx;
 
        for(i = 0; i < level; i++) putchar(' '); puts(name);
@@ -78,11 +78,10 @@ static void print_tree(int level, struct registry_key *p,
                for(i = 0; W_ERROR_IS_OK(error = reg_key_get_value_by_index(
                        mem_ctx, p, i, &valuename, &valuetype, &valuedata));
                        i++) {
-                       int j;
+                       unsigned int j;
                        for(j = 0; j < level+1; j++) putchar(' ');
                        printf("%s\n",  reg_val_description(mem_ctx,
-                               lp_iconv_convenience(cmdline_lp_ctx), valuename,
-                               valuetype, valuedata));
+                               valuename, valuetype, valuedata));
                }
                talloc_free(mem_ctx);
 
@@ -101,7 +100,8 @@ static void print_tree(int level, struct registry_key *p,
 
 int main(int argc, char **argv)
 {
-       int opt, i;
+       int opt;
+       unsigned int i;
        const char *file = NULL;
        const char *remote = NULL;
        poptContext pc;