summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-04 13:18:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:44 -0500
commit6a8355a6282563e3198c05dd6eb82107e449682c (patch)
treec343d58d690e78e7d4c539114c92fc3344e2a258 /source4
parent1b3bbc7d440d61e0780fdb0b2493dd4ab9bd3f59 (diff)
downloadsamba-6a8355a6282563e3198c05dd6eb82107e449682c.tar.gz
samba-6a8355a6282563e3198c05dd6eb82107e449682c.tar.bz2
samba-6a8355a6282563e3198c05dd6eb82107e449682c.zip
r467: hopefully get the buildfarm compiling fine now...
metze (This used to be commit d15f0e18bb43608c611cfe78fc79db9ee10e1eb2)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/registry/tools/gregedit.c6
-rw-r--r--source4/lib/registry/tools/regdiff.c4
-rw-r--r--source4/lib/registry/tools/regpatch.c2
-rw-r--r--source4/lib/registry/tools/regshell.c6
-rw-r--r--source4/lib/registry/tools/regtree.c5
5 files changed, 13 insertions, 10 deletions
diff --git a/source4/lib/registry/tools/gregedit.c b/source4/lib/registry/tools/gregedit.c
index 10e5f45468..4bbde9a37d 100644
--- a/source4/lib/registry/tools/gregedit.c
+++ b/source4/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/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 305a7a1e46..c3633ef0af 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/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/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index e632edaa49..d4b036afe9 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/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/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 8ee2a65d06..b78f4256f0 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/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/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 94018bdc5c..4d0d4b2909 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/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;