summaryrefslogtreecommitdiff
path: root/distrib/common
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-02 00:40:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-02 00:40:21 +0000
commit35d822e4fdd9c8e5985b9baa0f68d35ffd6588dc (patch)
tree0c55a2edeb7ebdaf9d2b1b42c82d347e8baf9b4e /distrib/common
parentb3ce2af82429b61638057d015b1b303eb2a0fea1 (diff)
eliminate gratuitous differences
Diffstat (limited to 'distrib/common')
-rw-r--r--distrib/common/elfrdsetroot.c6
-rw-r--r--distrib/common/rdsetroot.c5
2 files changed, 5 insertions, 6 deletions
diff --git a/distrib/common/elfrdsetroot.c b/distrib/common/elfrdsetroot.c
index 6367626d8d1..9adbb20c3e4 100644
--- a/distrib/common/elfrdsetroot.c
+++ b/distrib/common/elfrdsetroot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elfrdsetroot.c,v 1.13 2008/09/02 19:21:28 drahn Exp $ */
+/* $OpenBSD: elfrdsetroot.c,v 1.14 2008/12/02 00:40:20 deraadt Exp $ */
/* $NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $ */
/*
@@ -65,7 +65,7 @@ long rd_root_image_off, rd_root_size_off;
off_t rd_root_size_val;
/* pointers to pieces of mapped file */
-char *dataseg;
+char *dataseg;
/* parameters to mmap digged out from program header */
off_t mmap_offs;
@@ -75,7 +75,7 @@ int find_rd_root_image(char *, Elf_Ehdr *, Elf_Phdr *, int);
__dead void usage(void);
int
-main(int argc, char **argv)
+main(int argc, char *argv[])
{
int ch, fd, n, xflag = 0, found = 0, phsize;
u_int32_t *ip;
diff --git a/distrib/common/rdsetroot.c b/distrib/common/rdsetroot.c
index 980eb0c19ef..b22d639eaad 100644
--- a/distrib/common/rdsetroot.c
+++ b/distrib/common/rdsetroot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdsetroot.c,v 1.11 2008/12/02 00:37:54 deraadt Exp $ */
+/* $OpenBSD: rdsetroot.c,v 1.12 2008/12/02 00:40:20 deraadt Exp $ */
/* $NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $ */
/*
@@ -69,10 +69,9 @@ __dead void usage(void);
int
main(int argc, char *argv[])
{
- int ch, fd, n, xflag;
+ int ch, fd, n, xflag = 0;
int *ip;
- xflag = 0;
while ((ch = getopt(argc, argv, "x")) != -1) {
switch (ch) {
case 'x':