r467: hopefully get the buildfarm compiling fine now...

metze

diff --git a/source/lib/registry/tools/gregedit.c b/source/lib/registry/tools/gregedit.c
index 10e5f4546858347f468f2d88d5d66170342a88e4..4bbde9a37d7c57138e1cdbe77507bb5df636fd61 100644 (file)
--- a/source/lib/registry/tools/gregedit.c
+++ b/source/lib/registry/tools/gregedit.c
@@ -723,10 +723,12 @@ GtkWidget* create_savefilewin (void)
   return savefilewin;
 }
 
-int main (int argc, char *argv[])
+ int main(int argc, char *argv[])
 {
   poptContext pc;
-  const char *backend = NULL, *credentials = NULL, *location;
+  const char *backend = NULL;
+  const char *credentials = NULL;
+  const char *location;
   int opt;
   struct poptOption long_options[] = {
        POPT_AUTOHELP

diff --git a/source/lib/registry/tools/regdiff.c b/source/lib/registry/tools/regdiff.c
index 305a7a1e4684140368fafbe2d40972d7b4f84be9..c3633ef0af19a25603a5368ec1b1eab0a98befc1 100644 (file)
--- a/source/lib/registry/tools/regdiff.c
+++ b/source/lib/registry/tools/regdiff.c
@@ -59,7 +59,7 @@ void writediff(REG_KEY *oldkey, REG_KEY *newkey, FILE *out)
 
        for(i = 0; W_ERROR_IS_OK(error1 = reg_key_get_value_by_index(newkey, i, &v1)); i++) {
                error2 = reg_key_get_value_by_name(oldkey, reg_val_name(v1), &v2);
-               if ((W_ERROR_IS_OK(error2) && reg_val_size(v2) != reg_val_size(v1) || memcmp(reg_val_data_blk(v1), reg_val_data_blk(v2), reg_val_size(v1))) 
+               if (((W_ERROR_IS_OK(error2) && reg_val_size(v2) != reg_val_size(v1)) || memcmp(reg_val_data_blk(v1), reg_val_data_blk(v2), reg_val_size(v1))) 
                        || W_ERROR_EQUAL(error2, WERR_DEST_NOT_FOUND)) {
                        fprintf(out, "\"%s\"=%s:%s\n", reg_val_name(v1), str_regtype(reg_val_type(v1)), reg_val_data_string(v1));
                }
@@ -91,7 +91,7 @@ void writediff(REG_KEY *oldkey, REG_KEY *newkey, FILE *out)
        }
 }
 
-int main (int argc, char **argv)
+ int main(int argc, char **argv)
 {
        int opt;
        poptContext pc;

diff --git a/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
index e632edaa49c7a2e30b74e76698a4d3599b607f79..d4b036afe9b352271e02e4ee07a4cbd5e8759787 100644 (file)
--- a/source/lib/registry/tools/regpatch.c
+++ b/source/lib/registry/tools/regpatch.c
@@ -752,7 +752,7 @@ int nt_apply_reg_command_file(REG_KEY *root, const char *cmd_file_name)
        return modified;
 }
 
-int main (int argc, char **argv)
+ int main(int argc, char **argv)
 {
        int opt;
        poptContext pc;

diff --git a/source/lib/registry/tools/regshell.c b/source/lib/registry/tools/regshell.c
index 8ee2a65d06526d1d2cab8202640348234fa94c17..b78f4256f08a94dcc8ee3fd7d713ef0aef9c4090 100644 (file)
--- a/source/lib/registry/tools/regshell.c
+++ b/source/lib/registry/tools/regshell.c
@@ -199,9 +199,9 @@ REG_KEY *process_cmd(REG_KEY *k, char *line)
 int main (int argc, char **argv)
 {
        int opt;
-       char *backend = "dir";
-       char *credentials = NULL;
-       REG_KEY *curkey = NULL;;
+       const char *backend = "dir";
+       const char *credentials = NULL;
+       REG_KEY *curkey = NULL;
        poptContext pc;
        WERROR error;
        REG_HANDLE *h;

diff --git a/source/lib/registry/tools/regtree.c b/source/lib/registry/tools/regtree.c
index 94018bdc5ceda67402b2b5caaf2b53bc64755d19..4d0d4b29095a9378c8ab1802bb6c328d42ce67f7 100644 (file)
--- a/source/lib/registry/tools/regtree.c
+++ b/source/lib/registry/tools/regtree.c
@@ -58,10 +58,11 @@ void print_tree(int l, REG_KEY *p, int fullpath, int novals)
        }
 }
 
-int main (int argc, char **argv)
+ int main(int argc, char **argv)
 {
        int opt;
-       char *backend = "dir", *credentials = NULL;
+       const char *backend = "dir";
+       const char *credentials = NULL;
        poptContext pc;
        REG_KEY *root;
        REG_HANDLE *h;