From b53066dc3ff00a91dc7791b7fd82beeba3831ef1 Mon Sep 17 00:00:00 2001 From: Geert Stappers Date: Tue, 7 Jun 2016 06:19:36 -0400 Subject: removing double l from auxilliary This patch changes only strings, no program code. Reported-by: Ady Signed-off-by: Gene Cumm --- NEWS | 2 +- com32/elflink/ldlinux/adv.c | 2 +- com32/elflink/ldlinux/getadv.c | 2 +- com32/elflink/ldlinux/setadv.c | 2 +- com32/include/sys/elfcommon.h | 2 +- com32/mboot/mboot.c | 4 ++-- core/i386/syslinux.ld | 2 +- doc/extlinux.txt | 2 +- efi/adv.c | 2 +- libinstaller/advio.c | 2 +- libinstaller/setadv.c | 2 +- libinstaller/syslxopt.c | 2 +- syslinux.spec.in | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NEWS b/NEWS index d1a5b2c2..c0846d8e 100644 --- a/NEWS +++ b/NEWS @@ -768,7 +768,7 @@ Changes in 3.61: memory regions in the e820 map. Changes in 3.60: - * Support for "auxilliary data vector", a small amount of + * Support for "auxiliary data vector", a small amount of writable storage. Currently only supported for EXTLINUX, but the infrastructure is there for the other derivatives, assuming a suitable storage location can be found. diff --git a/com32/elflink/ldlinux/adv.c b/com32/elflink/ldlinux/adv.c index 0cbbe274..8ce73c33 100644 --- a/com32/elflink/ldlinux/adv.c +++ b/com32/elflink/ldlinux/adv.c @@ -28,7 +28,7 @@ /* * syslinux/adv.c * - * Access the syslinux auxilliary data vector + * Access the syslinux auxiliary data vector */ #include diff --git a/com32/elflink/ldlinux/getadv.c b/com32/elflink/ldlinux/getadv.c index 1c27f1b8..9baeba14 100644 --- a/com32/elflink/ldlinux/getadv.c +++ b/com32/elflink/ldlinux/getadv.c @@ -28,7 +28,7 @@ /* * syslinux/getadv.c * - * Get a data item from the auxilliary data vector. Returns a pointer + * Get a data item from the auxiliary data vector. Returns a pointer * and sets *size on success; NULL on failure. */ diff --git a/com32/elflink/ldlinux/setadv.c b/com32/elflink/ldlinux/setadv.c index 2e386213..ba3be722 100644 --- a/com32/elflink/ldlinux/setadv.c +++ b/com32/elflink/ldlinux/setadv.c @@ -29,7 +29,7 @@ /* * syslinux/setadv.c * - * (Over)write a data item in the auxilliary data vector. To + * (Over)write a data item in the auxiliary data vector. To * delete an item, set its length to zero. * * Return 0 on success, -1 on error, and set errno. diff --git a/com32/include/sys/elfcommon.h b/com32/include/sys/elfcommon.h index 99b5ad10..29f20943 100644 --- a/com32/include/sys/elfcommon.h +++ b/com32/include/sys/elfcommon.h @@ -162,7 +162,7 @@ #define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1) #define DT_EXTRANUM 3 -/* Auxilliary table entries */ +/* Auxiliary table entries */ #define AT_NULL 0 /* end of vector */ #define AT_IGNORE 1 /* entry should be ignored */ #define AT_EXECFD 2 /* file descriptor of program */ diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c index 10e6701c..4e6b4e1d 100644 --- a/com32/mboot/mboot.c +++ b/com32/mboot/mboot.c @@ -223,13 +223,13 @@ int main(int argc, char *argv[]) mbinfo.flags |= MB_INFO_CMDLINE; } - /* Map auxilliary images */ + /* Map auxiliary images */ if (nmodules > 1) { if (map_modules(modules + 1, nmodules - 1)) return 1; } - /* Add auxilliary information */ + /* Add auxiliary information */ mboot_make_memmap(); mboot_apm(); mboot_syslinux_info(); diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld index 36b1a69b..e8d32dd9 100644 --- a/core/i386/syslinux.ld +++ b/core/i386/syslinux.ld @@ -207,7 +207,7 @@ SECTIONS xfer_buf_seg = core_xfer_buf >> 4; /* - * The auxilliary data segment is used by the 16-bit code + * The auxiliary data segment is used by the 16-bit code * for items that don't need to live in the bottom 64K. */ diff --git a/doc/extlinux.txt b/doc/extlinux.txt index d8cbb5df..f0cac8dd 100644 --- a/doc/extlinux.txt +++ b/doc/extlinux.txt @@ -48,7 +48,7 @@ slight modifications. 5. EXTLINUX now has "boot-once" support. The boot-once information is stored in an on-disk datastructure, part of extlinux.sys, called - the "Auxillary Data Vector". The Auxilliary Data Vector is also + the "Auxillary Data Vector". The Auxiliary Data Vector is also available to COM32 modules that want to store small amounts of information. diff --git a/efi/adv.c b/efi/adv.c index 4056db15..7709e088 100644 --- a/efi/adv.c +++ b/efi/adv.c @@ -283,7 +283,7 @@ int efi_adv_write(void) } if (err == -2) - efi_printerr(L"%s: cannot write auxilliary data (need --update)?\n", + efi_printerr(L"%s: cannot write auxiliary data (need --update)?\n", file); else if (err == -1) efi_perror(L"efi_adv_write:"); diff --git a/libinstaller/advio.c b/libinstaller/advio.c index e282e11c..917714ac 100644 --- a/libinstaller/advio.c +++ b/libinstaller/advio.c @@ -150,7 +150,7 @@ int write_adv(const char *path, const char *cfg) } if (err == -2) - fprintf(stderr, "%s: cannot write auxilliary data (need --update)?\n", + fprintf(stderr, "%s: cannot write auxiliary data (need --update)?\n", file); else if (err == -1) perror(file); diff --git a/libinstaller/setadv.c b/libinstaller/setadv.c index 214f7fc1..47a637bd 100644 --- a/libinstaller/setadv.c +++ b/libinstaller/setadv.c @@ -14,7 +14,7 @@ /* * setadv.c * - * (Over)write a data item in the auxilliary data vector. To + * (Over)write a data item in the auxiliary data vector. To * delete an item, set its length to zero. * * Return 0 on success, -1 on error, and set errno. diff --git a/libinstaller/syslxopt.c b/libinstaller/syslxopt.c index 3fc5519b..fb2733b5 100644 --- a/libinstaller/syslxopt.c +++ b/libinstaller/syslxopt.c @@ -112,7 +112,7 @@ void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode) " --raid -r Fall back to the next device on boot failure\n" " --once=... %s Execute a command once upon boot\n" " --clear-once -O Clear the boot-once command\n" - " --reset-adv Reset auxilliary data\n", + " --reset-adv Reset auxiliary data\n", mode == MODE_SYSLINUX ? " " : "-o"); /* * Have to chop this roughly in half for the DOS installer due diff --git a/syslinux.spec.in b/syslinux.spec.in index b82d9a14..421e4f28 100644 --- a/syslinux.spec.in +++ b/syslinux.spec.in @@ -231,7 +231,7 @@ fi * Fri Apr 13 2001 H. Peter Anvin - Upgrade to 1.61 -- Install auxilliary programs in /usr/lib/syslinux +- Install auxiliary programs in /usr/lib/syslinux * Sat Feb 10 2001 Matt Wilson - 1.52 -- cgit v1.2.1