summaryrefslogtreecommitdiffstats
path: root/loader2/kickstart.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-06-13 19:09:23 +0000
committerJeremy Katz <katzj@redhat.com>2005-06-13 19:09:23 +0000
commitefd4daedfbe9d1cd0809f08c244c419231575436 (patch)
tree17e936613588a0ad9262c9dbfac3d21c3b7f96e9 /loader2/kickstart.c
parentd6ddca580702b6c469f3952966a96bc54f4a0836 (diff)
downloadanaconda-efd4daedfbe9d1cd0809f08c244c419231575436.tar.gz
anaconda-efd4daedfbe9d1cd0809f08c244c419231575436.tar.xz
anaconda-efd4daedfbe9d1cd0809f08c244c419231575436.zip
2005-06-13 Jeremy Katz <katzj@redhat.com>
* Makefile Makefile.inc mini-wm.c xmouse.c xutils.c isys/Makefile isys/isys.c isys/lang.c isys/smp.c isys/uncpio.c isys/gzlib/Makefile isys/gzlib/inflate.c loader2/Makefile loader2/driverdisk.c loader2/driverselect.c loader2/hdinstall.c loader2/init.c loader2/kickstart.c loader2/loader.c loader2/loadermisc.c loader2/moduleinfo.h loader2/modules.c loader2/net.c loader2/nfsinstall.c loader2/telnet.c loader2/undomounts.c loader2/urlinstall.c utils/Makefile utils/genhdlist.c utils/mapshdr.c utils/snarffont.c: Define cflags in one place (Makefile.inc) and use a consistent set everywhere. Fix up some of the compile warnings this uncovered. Also fix a few more things that -Wextra turned up.
Diffstat (limited to 'loader2/kickstart.c')
-rw-r--r--loader2/kickstart.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/loader2/kickstart.c b/loader2/kickstart.c
index 197f4e4a8..aec7f633d 100644
--- a/loader2/kickstart.c
+++ b/loader2/kickstart.c
@@ -396,10 +396,10 @@ static void setShutdown(struct loaderData_s * loaderData, int argc,
int rc;
struct poptOption ksOptions[] = {
- { "reboot", 'r', POPT_ARG_NONE, &reboot, 0 },
- { "halt", 'h', POPT_ARG_NONE, &halt, 0 },
- { "poweroff", 'p', POPT_ARG_NONE, &poweroff, 0 },
- { 0, 0, 0, 0, 0 }
+ { "reboot", 'r', POPT_ARG_NONE, &reboot, 0, NULL, NULL },
+ { "halt", 'h', POPT_ARG_NONE, &halt, 0, NULL, NULL },
+ { "poweroff", 'p', POPT_ARG_NONE, &poweroff, 0, NULL, NULL },
+ { 0, 0, 0, 0, 0, 0, 0 }
};
optCon = poptGetContext(NULL, argc, (const char **) argv, ksOptions, 0);