summaryrefslogtreecommitdiff
path: root/com32/menu
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:28 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:28 -0700
commit89c005db514d67a3bfca607ebd0607ae9fe3801f (patch)
tree7935acf642fe0f11464861aea3bec49598c5ed15 /com32/menu
parent08d86ec4062eff21da4feab67a365bc88ac13eda (diff)
downloadsyslinux-89c005db514d67a3bfca607ebd0607ae9fe3801f.tar.gz
Run Nindent on com32/menu/execute.c
Automatically reformat com32/menu/execute.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/menu')
-rw-r--r--com32/menu/execute.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/com32/menu/execute.c b/com32/menu/execute.c
index d84958c5..c2de7353 100644
--- a/com32/menu/execute.c
+++ b/com32/menu/execute.c
@@ -17,53 +17,53 @@
void execute(const char *cmdline, enum kernel_type type)
{
- com32sys_t ireg;
- const char *p, * const *pp;
- char *q = __com32.cs_bounce;
- const char *kernel, *args;
+ com32sys_t ireg;
+ const char *p, *const *pp;
+ char *q = __com32.cs_bounce;
+ const char *kernel, *args;
- memset(&ireg, 0, sizeof ireg);
+ memset(&ireg, 0, sizeof ireg);
- kernel = q;
- p = cmdline;
- while ( *p && !my_isspace(*p) ) {
- *q++ = *p++;
- }
- *q++ = '\0';
+ kernel = q;
+ p = cmdline;
+ while (*p && !my_isspace(*p)) {
+ *q++ = *p++;
+ }
+ *q++ = '\0';
- args = q;
- while ( *p && my_isspace(*p) )
- p++;
+ args = q;
+ while (*p && my_isspace(*p))
+ p++;
- strcpy(q, p);
+ strcpy(q, p);
- if (kernel[0] == '.' && type == KT_NONE) {
- /* It might be a type specifier */
- enum kernel_type type = KT_NONE;
- for (pp = kernel_types; *pp; pp++, type++) {
- if (!strcmp(kernel+1, *pp)) {
- execute(p, type); /* Strip the type specifier and retry */
- }
+ if (kernel[0] == '.' && type == KT_NONE) {
+ /* It might be a type specifier */
+ enum kernel_type type = KT_NONE;
+ for (pp = kernel_types; *pp; pp++, type++) {
+ if (!strcmp(kernel + 1, *pp)) {
+ execute(p, type); /* Strip the type specifier and retry */
+ }
+ }
}
- }
- if (type == KT_LOCALBOOT) {
- ireg.eax.w[0] = 0x0014; /* Local boot */
- ireg.edx.w[0] = strtoul(kernel, NULL, 0);
- } else {
- if (type < KT_KERNEL)
- type = KT_KERNEL;
+ if (type == KT_LOCALBOOT) {
+ ireg.eax.w[0] = 0x0014; /* Local boot */
+ ireg.edx.w[0] = strtoul(kernel, NULL, 0);
+ } else {
+ if (type < KT_KERNEL)
+ type = KT_KERNEL;
- ireg.eax.w[0] = 0x0016; /* Run kernel image */
- ireg.esi.w[0] = OFFS(kernel);
- ireg.ds = SEG(kernel);
- ireg.ebx.w[0] = OFFS(args);
- ireg.es = SEG(args);
- ireg.edx.l = type-KT_KERNEL;
- /* ireg.ecx.l = 0; */ /* We do ipappend "manually" */
- }
+ ireg.eax.w[0] = 0x0016; /* Run kernel image */
+ ireg.esi.w[0] = OFFS(kernel);
+ ireg.ds = SEG(kernel);
+ ireg.ebx.w[0] = OFFS(args);
+ ireg.es = SEG(args);
+ ireg.edx.l = type - KT_KERNEL;
+ /* ireg.ecx.l = 0; *//* We do ipappend "manually" */
+ }
- __intcall(0x22, &ireg, NULL);
+ __intcall(0x22, &ireg, NULL);
- /* If this returns, something went bad; return to menu */
+ /* If this returns, something went bad; return to menu */
}