bus: Remove trailing whitespaces
PATCH 1/21 bus: Remove trailing whitespaces
--- grub-core/bus/bonito.c | 22 ++++++------- grub-core/bus/cs5536.c | 22 ++++++------- grub-core/bus/pci.c | 4 +-- grub-core/bus/usb/ehci-pci.c | 6 ++-- grub-core/bus/usb/ehci.c | 8 ++--- grub-core/bus/usb/ohci.c | 54 +++++++++++++++---------------- grub-core/bus/usb/serial/common.c | 2 +- grub-core/bus/usb/serial/ftdi.c | 2 +- grub-core/bus/usb/serial/pl2303.c | 2 +- grub-core/bus/usb/uhci.c | 32 +++++++++--------- grub-core/bus/usb/usb.c | 6 ++-- grub-core/bus/usb/usbhub.c | 20 ++++++------ grub-core/bus/usb/usbtrans.c | 4 +-- 13 files changed, 92 insertions(+), 92 deletions(-)
grub-core/bus/bonito.c +11 -11
@@ -21,12 +21,12 @@#include <grub/misc.h> static grub_uint32_t base_win[GRUB_MACHINE_PCI_NUM_WIN ]; -static const grub_size_t sizes_win[GRUB_MACHINE_PCI_NUM_WIN ] = - {GRUB_MACHINE_PCI_WIN1_SIZE ,GRUB_MACHINE_PCI_WIN_SIZE , +static const grub_size_t sizes_win[GRUB_MACHINE_PCI_NUM_WIN ] = + {GRUB_MACHINE_PCI_WIN1_SIZE ,GRUB_MACHINE_PCI_WIN_SIZE ,GRUB_MACHINE_PCI_WIN_SIZE };/* Usage counters. */ static int usage_win[GRUB_MACHINE_PCI_NUM_WIN ]; -static grub_addr_t addr_win[GRUB_MACHINE_PCI_NUM_WIN ] = +static grub_addr_t addr_win[GRUB_MACHINE_PCI_NUM_WIN ] = {GRUB_MACHINE_PCI_WIN1_ADDR ,GRUB_MACHINE_PCI_WIN2_ADDR ,GRUB_MACHINE_PCI_WIN3_ADDR };
@@ -93,9 +93,9 @@ write_bases_2f (void) {int i;grub_uint32_t reg =0 ; -for (i =0 ; i <GRUB_MACHINE_PCI_NUM_WIN ; i++) - reg |= (((base_win[i] >>GRUB_MACHINE_PCI_WIN_SHIFT ) - &GRUB_MACHINE_PCI_WIN_MASK ) +for (i =0 ; i <GRUB_MACHINE_PCI_NUM_WIN ; i++) + reg |= (((base_win[i] >>GRUB_MACHINE_PCI_WIN_SHIFT ) + &GRUB_MACHINE_PCI_WIN_MASK ) << (i *GRUB_MACHINE_PCI_WIN_MASK_SIZE ));GRUB_MACHINE_PCI_IO_CTRL_REG_2F = reg; }
@@ -111,23 +111,23 @@ grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),/* First try already used registers. */ for (i =0 ; i <GRUB_MACHINE_PCI_NUM_WIN ; i++) -if (usage_win[i] && base_win[i] <= base +if (usage_win[i] && base_win[i] <= base && base_win[i] + sizes_win[i] > base + size) { usage_win[i]++; -return (void *) +return (void *) (addr_win[i] | (base &GRUB_MACHINE_PCI_WIN_OFFSET_MASK )); }/* Map new register. */ newbase = base & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK ;for (i =0 ; i <GRUB_MACHINE_PCI_NUM_WIN ; i++) -if (!usage_win[i] && newbase <= base +if (!usage_win[i] && newbase <= base && newbase + sizes_win[i] > base + size) { usage_win[i]++; base_win[i] = newbase;write_bases_2f (); -return (void *) +return (void *) (addr_win[i] | (base &GRUB_MACHINE_PCI_WIN_OFFSET_MASK )); }grub_fatal ("Out of PCI windows." );
@@ -164,7 +164,7 @@ grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)), {int i;for (i =0 ; i <GRUB_MACHINE_PCI_NUM_WIN ; i++) -if (usage_win[i] && addr_win[i] +if (usage_win[i] && addr_win[i] == (((grub_addr_t ) mem |0x20000000 ) & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK )) {
grub-core/bus/cs5536.c +11 -11
@@ -72,7 +72,7 @@ grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr) addr); ret = (grub_uint64_t )grub_pci_read (grub_pci_make_address (dev,GRUB_CS5536_MSR_MAILBOX_DATA0 )); - ret |= (((grub_uint64_t ) + ret |= (((grub_uint64_t )grub_pci_read (grub_pci_make_address (dev,GRUB_CS5536_MSR_MAILBOX_DATA1 ))) <<32 );
@@ -100,7 +100,7 @@ grub_cs5536_smbus_wait (grub_port_t smbbase)grub_uint8_t status; status =grub_inb (smbbase +GRUB_CS5536_SMB_REG_STATUS );if (status &GRUB_CS5536_SMB_REG_STATUS_SDAST ) -return GRUB_ERR_NONE ; +return GRUB_ERR_NONE ;if (status &GRUB_CS5536_SMB_REG_STATUS_BER )return grub_error (GRUB_ERR_IO ,"SM bus error" );if (status &GRUB_CS5536_SMB_REG_STATUS_NACK )
@@ -122,8 +122,8 @@ grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev, smbbase + GRUB_CS5536_SMB_REG_CTRL1);/* Send device address. */ - err =grub_cs5536_smbus_wait (smbbase); -if (err) + err =grub_cs5536_smbus_wait (smbbase); +if (err)return err;grub_outb (dev <<1 , smbbase +GRUB_CS5536_SMB_REG_DATA );
@@ -139,8 +139,8 @@ grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,grub_outb (addr, smbbase +GRUB_CS5536_SMB_REG_DATA );/* Send START. */ - err =grub_cs5536_smbus_wait (smbbase); -if (err) + err =grub_cs5536_smbus_wait (smbbase); +if (err)return err; grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1) | GRUB_CS5536_SMB_REG_CTRL1_START,
@@ -161,7 +161,7 @@ grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev, smbbase + GRUB_CS5536_SMB_REG_CTRL1); err =grub_cs5536_smbus_wait (smbbase); -if (err) +if (err)return err; *res =grub_inb (smbbase +GRUB_CS5536_SMB_REG_DATA );
@@ -198,8 +198,8 @@ grub_cs5536_init_smbus (grub_pci_device_t dev, grub_uint16_t divisor,grub_outb (((divisor >>7 ) &0xff ), *smbbase +GRUB_CS5536_SMB_REG_CTRL3 );grub_outb (((divisor <<1 ) &0xfe ) |GRUB_CS5536_SMB_REG_CTRL2_ENABLE , *smbbase +GRUB_CS5536_SMB_REG_CTRL2 ); - -return GRUB_ERR_NONE ; + +return GRUB_ERR_NONE ; } grub_err_t
@@ -217,7 +217,7 @@ grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,if (b ==0 )return grub_error (GRUB_ERR_IO ,"no SPD found" ); size = b; - + ((grub_uint8_t *) res)[0 ] = b;for (ptr =1 ; ptr < size; ptr++) {
@@ -310,7 +310,7 @@ grub_cs5536_init_geode (grub_pci_device_t dev)/* Initialise USB controller. */ /* FIXME: assign adresses dynamically. */ -grub_cs5536_write_msr (dev,GRUB_CS5536_MSR_USB_OHCI_BASE , +grub_cs5536_write_msr (dev,GRUB_CS5536_MSR_USB_OHCI_BASE ,GRUB_CS5536_MSR_USB_BASE_BUS_MASTER |GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE |0x05024000 );
grub-core/bus/pci.c +2 -2
@@ -159,12 +159,12 @@ grub_pci_find_capability (grub_pci_device_t dev, grub_uint8_t cap) pos &= ~3 ; - addr =grub_pci_make_address (dev, pos); + addr =grub_pci_make_address (dev, pos); id =grub_pci_read_byte (addr);if (id ==0xff )break ; - +if (id == cap)return pos; pos++;
grub-core/bus/usb/ehci-pci.c +3 -3
@@ -96,7 +96,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,return 0 ; }grub_dprintf ("ehci" ,"EHCI grub_ehci_pci_iter: bus rev. num. OK\n" ); - +/* Determine EHCI EHCC registers base address. */ addr =grub_pci_make_address (dev,GRUB_PCI_REG_ADDRESS_REG0 ); base =grub_pci_read (addr);
@@ -125,7 +125,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,GRUB_PCI_COMMAND_MEM_ENABLED |GRUB_PCI_COMMAND_BUS_MASTER | grub_pci_read_word(addr)); - +grub_dprintf ("ehci" ,"EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n" ); }
@@ -142,7 +142,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,/* Determine and change ownership. */ /* EECP offset valid in HCCPARAMS */ /* Ownership can be changed via EECP only */ -if (pciid !=GRUB_CS5536_PCIID && eecp_offset >=0x40 ) +if (pciid !=GRUB_CS5536_PCIID && eecp_offset >=0x40 ) {grub_pci_address_t pciaddr_eecp; pciaddr_eecp =grub_pci_make_address (dev, eecp_offset);
grub-core/bus/usb/ehci.c +4 -4
@@ -498,8 +498,8 @@ grub_ehci_init_device (volatile void *regs) } e->iobase = ((volatile grub_uint32_t *) e->iobase_ehcc + (caplen /sizeof (grub_uint32_t))); -#else - e->iobase = (volatile grub_uint32_t *) +#else + e->iobase = (volatile grub_uint32_t *) ((grub_uint8_t *) e->iobase_ehcc + caplen);#endif
@@ -869,7 +869,7 @@ grub_ehci_find_qh (struct grub_ehci *e, grub_usb_transfer_t transfer) i++ ) {if (target == (qh_iter->ep_char & mask)) - { + {/* Found proper existing (and linked) QH, do setup of QH */ grub_dprintf ("ehci" ,"find_qh: found, QH=%p\n" , qh_iter);grub_ehci_setup_qh (qh_iter, transfer);
@@ -1813,7 +1813,7 @@ static struct grub_usb_controller_dev usb_controller = { .portstatus = grub_ehci_portstatus, .detect_dev = grub_ehci_detect_dev,/* estimated max. count of TDs for one bulk transfer */ - .max_bulk_tds =GRUB_EHCI_N_TD *3 /4 + .max_bulk_tds =GRUB_EHCI_N_TD *3 /4 };GRUB_MOD_INIT (ehci)
grub-core/bus/usb/ohci.c +27 -27
206 lines not on this page · raw message
grub-core/bus/usb/serial/common.c +1 -1
@@ -93,7 +93,7 @@ grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno,/* Configure device */ if (port->out_endp && port->in_endp) err =grub_usb_set_configuration (usbdev, configno +1 ); - +if (!port->out_endp || !port->in_endp || err) {grub_free (port->name);
grub-core/bus/usb/serial/ftdi.c +1 -1
@@ -174,7 +174,7 @@ static struct grub_serial_driver grub_ftdi_driver = .fini = grub_usbserial_fini }; -static const struct +static const struct {grub_uint16_t vendor, product; } products[] =
grub-core/bus/usb/serial/pl2303.c +1 -1
@@ -187,7 +187,7 @@ static struct grub_serial_driver grub_pl2303_driver = .fini = grub_usbserial_fini }; -static const struct +static const struct {grub_uint16_t vendor, product; } products[] =
grub-core/bus/usb/uhci.c +16 -16
@@ -244,10 +244,10 @@ grub_uhci_pci_iter (grub_pci_device_t dev, u->iobase = (base &GRUB_UHCI_IOMASK ) +GRUB_MACHINE_PCI_IO_BASE ;/* Reset PIRQ and SMI */ - addr =grub_pci_make_address (dev,GRUB_UHCI_REG_USBLEGSUP ); + addr =grub_pci_make_address (dev,GRUB_UHCI_REG_USBLEGSUP );grub_pci_write_word (addr,GRUB_UHCI_RESET_LEGSUP_SMI );/* Reset the HC */ -grub_uhci_writereg16 (u,GRUB_UHCI_REG_USBCMD ,GRUB_UHCI_CMD_HCRESET ); +grub_uhci_writereg16 (u,GRUB_UHCI_REG_USBCMD ,GRUB_UHCI_CMD_HCRESET );grub_millisleep (5 );/* Disable interrupts and commands (just to be safe) */ grub_uhci_writereg16 (u,GRUB_UHCI_REG_USBINTR ,0 );
@@ -399,7 +399,7 @@ grub_free_queue (struct grub_uhci *u, grub_uhci_qh_t qh, grub_uhci_td_t td, u->qh_busy[qh - u->qh_virt] =0 ; *actual =0 ; - +/* Free the TDs in this queue and set last_trans. */ for (i=0 ; td; i++) {
@@ -411,7 +411,7 @@ grub_free_queue (struct grub_uhci *u, grub_uhci_qh_t qh, grub_uhci_td_t td, transfer->last_trans = i; *actual += (td->ctrl_status +1 ) &0x7ff ; - +/* Unlink the queue. */ tdprev = td;if (!td->linkptr2)
@@ -537,7 +537,7 @@ grub_uhci_setup_transfer (grub_usb_controller_t dev, }grub_dprintf ("uhci" ,"transfer, iobase:%08x\n" , u->iobase); - +for (i =0 ; i < transfer->transcnt; i++) {grub_usb_transaction_t tr = &transfer->transactions[i];
@@ -604,7 +604,7 @@ grub_uhci_check_transfer (grub_usb_controller_t dev, errtd =grub_dma_phys2virt (cdata->qh->elinkptr & ~0x0f , u->qh_chunk); else errtd =0 ; - +if (errtd) { grub_dprintf ("uhci", ">t status=0x%02x data=0x%02x td=%p, %x\n",
@@ -632,27 +632,27 @@ grub_uhci_check_transfer (grub_usb_controller_t dev,/* Check if the endpoint is stalled. */ if (errtd->ctrl_status & (1 <<22 )) err =GRUB_USB_ERR_STALL ; - +/* Check if an error related to the data buffer occurred. */ else if (errtd->ctrl_status & (1 <<21 )) err =GRUB_USB_ERR_DATA ; - +/* Check if a babble error occurred. */ else if (errtd->ctrl_status & (1 <<20 )) err =GRUB_USB_ERR_BABBLE ; - +/* Check if a NAK occurred. */ else if (errtd->ctrl_status & (1 <<19 )) err =GRUB_USB_ERR_NAK ; - +/* Check if a timeout occurred. */ else if (errtd->ctrl_status & (1 <<18 )) err =GRUB_USB_ERR_TIMEOUT ; - +/* Check if a bitstuff error occurred. */ else if (errtd->ctrl_status & (1 <<17 )) err =GRUB_USB_ERR_BITSTUFF ; - +if (err) {grub_dprintf ("uhci" ,"transaction failed\n" );
@@ -719,7 +719,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,grub_uint64_t endtime;grub_dprintf ("uhci" ,"portstatus, iobase:%08x\n" , u->iobase); - +grub_dprintf ("uhci" ,"enable=%d port=%d\n" , enable, port);if (port ==0 )
@@ -746,7 +746,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,grub_dprintf ("uhci" ,">3detect=0x%02x\n" , status);return GRUB_USB_ERR_NONE ; } - +/* Reset the port. */ status =grub_uhci_readreg16 (u, reg) & ~GRUB_UHCI_PORTSC_RWC ;grub_uhci_writereg16 (u, reg, status | (1 <<9 ));
@@ -796,7 +796,7 @@ grub_uhci_detect_dev (grub_usb_controller_t dev, int port, int *changed)unsigned int status;grub_dprintf ("uhci" ,"detect_dev, iobase:%08x\n" , u->iobase); - +if (port ==0 ) reg =GRUB_UHCI_REG_PORTSC1 ;else if (port ==1 )
@@ -818,7 +818,7 @@ grub_uhci_detect_dev (grub_usb_controller_t dev, int port, int *changed) }else *changed =0 ; - +if (! (status &GRUB_UHCI_DETECT_HAVE_DEVICE ))return GRUB_USB_SPEED_NONE ;else if (status &GRUB_UHCI_DETECT_LOW_SPEED )
grub-core/bus/usb/usb.c +3 -3
@@ -144,7 +144,7 @@ grub_usb_device_initialize (grub_usb_device_t dev) { err =GRUB_USB_ERR_BADDEVICE ; goto fail; - } + }for (i =0 ; i < descdev->configcnt; i++) {
@@ -235,7 +235,7 @@ grub_usb_device_initialize (grub_usb_device_t dev)void grub_usb_device_attach (grub_usb_device_t dev) {int i; - +/* XXX: Just check configuration 0 for now. */ for (i =0 ; i < dev->config[0 ].descconf->numif; i++) {
@@ -331,7 +331,7 @@ grub_usb_register_attach_hook_class (struct grub_usb_attach_desc *desc)void grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc) { -grub_list_remove (GRUB_AS_LIST (desc)); +grub_list_remove (GRUB_AS_LIST (desc)); }
grub-core/bus/usb/usbhub.c +10 -10
@@ -115,11 +115,11 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller,grub_millisleep (2 );grub_boot_time ("Probing USB device driver" ); - +grub_usb_device_attach (dev);grub_boot_time ("Attached USB device" ); - +return dev; }
@@ -130,7 +130,7 @@ grub_usb_add_hub (grub_usb_device_t dev)struct grub_usb_usb_hubdesc hubdesc;grub_usb_err_t err;int i; - + err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN | GRUB_USB_REQTYPE_CLASS | GRUB_USB_REQTYPE_TARGET_DEV),
@@ -328,7 +328,7 @@ grub_usb_controller_dev_register (grub_usb_controller_dev_t usb) speed = hub->controller->dev->detect_dev (hub->controller, portno, &changed); - +if (hub->ports[portno].state ==PORT_STATE_NORMAL && speed !=GRUB_USB_SPEED_NONE ) {
@@ -422,7 +422,7 @@ wait_power_nonroot_hub (grub_usb_device_t dev)grub_usb_err_t err;int continue_waiting =0 ;unsigned i; - +for (i =1 ; i <= dev->nports; i++)if (dev->ports[i -1 ].state ==PORT_STATE_WAITING_FOR_STABLE_POWER ) {
@@ -564,7 +564,7 @@ poll_nonroot_hub (grub_usb_device_t dev)detach_device (dev->children[i -1 ]); dev->children[i -1 ] =NULL ; - +/* Connected and status of connection changed ? */ if (status &GRUB_USB_HUB_STATUS_PORT_CONNECTED ) {
@@ -642,7 +642,7 @@ poll_nonroot_hub (grub_usb_device_t dev) split_hubport = dev->split_hubport; split_hubaddr = dev->split_hubaddr; } - +/* Add the device and assign a device address to it. */ next_dev =grub_usb_hub_add_dev (&dev->controller, speed, split_hubport, split_hubaddr);
@@ -707,12 +707,12 @@ grub_usb_poll_devices (int wait_for_completion)while (1 ) { rescan =0 ; - +/* We should check changes of non-root hubs too. */ for (i =0 ; i <GRUB_USBHUB_MAX_DEVICES ; i++) {grub_usb_device_t dev = grub_usb_devs[i]; - +if (dev && dev->descdev.class ==0x09 )poll_nonroot_hub (dev); }
@@ -723,7 +723,7 @@ grub_usb_poll_devices (int wait_for_completion)for (i =0 ; i <GRUB_USBHUB_MAX_DEVICES ; i++) {grub_usb_device_t dev = grub_usb_devs[i]; - +if (dev && dev->descdev.class ==0x09 ) continue_waiting = continue_waiting ||wait_power_nonroot_hub (dev); }
grub-core/bus/usb/usbtrans.c +2 -2
@@ -40,7 +40,7 @@ grub_usb_bulk_maxpacket (grub_usb_device_t dev,static grub_usb_err_t -grub_usb_execute_and_wait_transfer (grub_usb_device_t dev, +grub_usb_execute_and_wait_transfer (grub_usb_device_t dev,grub_usb_transfer_t transfer,int timeout,grub_size_t *actual) {
@@ -205,7 +205,7 @@ grub_usb_control_msg (grub_usb_device_t dev,grub_dprintf ("usb" ,"control: err=%d\n" , err);grub_free (transfer->transactions); - +grub_free (transfer);grub_dma_free (setupdata_chunk);
Signature · 1 line
2.35.1
PATCH 2/21 commands: Remove trailing whitespaces
--- grub-core/commands/acpihalt.c | 6 +-- grub-core/commands/boottime.c | 2 +- grub-core/commands/cacheinfo.c | 2 +- grub-core/commands/cat.c | 6 +-- grub-core/commands/echo.c | 2 +- grub-core/commands/efi/lsefi.c | 2 +- grub-core/commands/efi/lsefimmap.c | 6 +-- grub-core/commands/efi/lsefisystab.c | 6 +-- grub-core/commands/halt.c | 2 +- grub-core/commands/hashsum.c | 8 +-- grub-core/commands/hdparm.c | 2 +- grub-core/commands/help.c | 6 +-- .../commands/i386/coreboot/cb_timestamps.c | 2 +- grub-core/commands/i386/coreboot/cbls.c | 2 +- grub-core/commands/i386/pc/drivemap.c | 2 +- grub-core/commands/i386/pc/halt.c | 2 +- grub-core/commands/i386/pc/lsapm.c | 2 +- grub-core/commands/i386/pc/play.c | 2 +- grub-core/commands/i386/pc/sendkey.c | 30 +++++------ grub-core/commands/keylayouts.c | 54 +++++++++---------- grub-core/commands/legacycfg.c | 12 ++--- grub-core/commands/lsacpi.c | 2 +- grub-core/commands/lspci.c | 6 +-- grub-core/commands/mips/loongson/lsspd.c | 2 +- grub-core/commands/nativedisk.c | 2 +- grub-core/commands/password_pbkdf2.c | 2 +- grub-core/commands/pgp.c | 14 ++--- grub-core/commands/search.c | 4 +- grub-core/commands/search_wrap.c | 4 +- grub-core/commands/terminal.c | 4 +- grub-core/commands/videoinfo.c | 2 +- grub-core/commands/videotest.c | 2 +- grub-core/commands/wildcard.c | 2 +- 33 files changed, 102 insertions(+), 102 deletions(-)
grub-core/commands/acpihalt.c +3 -3
@@ -78,7 +78,7 @@ static inline grub_uint32_t skip_name_string (const grub_uint8_t *ptr, const grub_uint8_t *end) { const grub_uint8_t *ptr0 = ptr; - +while (ptr < end && (*ptr =='^' || *ptr =='\\' )) ptr++; switch (*ptr)
@@ -231,7 +231,7 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end, grub_uint8_t *scope, int scope_len) {grub_uint8_t *prev = table; - +if (!ptr) ptr = table +sizeof (struct grub_acpi_table_header );while (ptr < end && prev < ptr)
@@ -337,7 +337,7 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end, }default :grub_printf ("Unknown opcode 0x%x\n" , *ptr); -return -1 ; +return -1 ; } }
grub-core/commands/boottime.c +1 -1
@@ -43,7 +43,7 @@ grub_cmd_boottime (struct grub_command *cmd __attribute__ ((unused)),grub_uint32_t tmrel = cur->tp - last_time; last_time = cur->tp; -grub_printf ("%3d.%03ds %2d.%03ds %s:%d %s\n" , +grub_printf ("%3d.%03ds %2d.%03ds %s:%d %s\n" , tmabs /1000 , tmabs %1000 , tmrel /1000 , tmrel %1000 , cur->file, cur->line, cur->msg); }
grub-core/commands/cacheinfo.c +1 -1
@@ -42,7 +42,7 @@ grub_rescue_cmd_info (struct grub_command *cmd __attribute__ ((unused)), hits, misses); }else -grub_printf ("%s\n" ,_ ("No disk cache statistics available\n" )); +grub_printf ("%s\n" ,_ ("No disk cache statistics available\n" ));return 0 ; }
grub-core/commands/cat.c +3 -3
@@ -104,7 +104,7 @@ grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args) || grub_isspace (code)) && code != '\r') {grub_printf ("%C" , code); - count =0 ; + count =0 ; code =0 ; utcount =0 ;continue ;
@@ -113,7 +113,7 @@ grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)if (dos && code =='\r' ) { is_0d =1 ; - count =0 ; + count =0 ; code =0 ; utcount =0 ;continue ;
@@ -123,7 +123,7 @@ grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)for (j =0 ; j < utcount; j++)grub_printf ("<%x>" , (unsigned int ) utbuf[j]);grub_setcolorstate (GRUB_TERM_COLOR_STANDARD ); - count =0 ; + count =0 ; code =0 ; utcount =0 ; }
grub-core/commands/echo.c +1 -1
@@ -119,7 +119,7 @@ grub_cmd_echo (grub_extcmd_context_t ctxt, int argc, char **args)if (newline)grub_printf ("\n" ); -grub_refresh (); +grub_refresh ();return 0 ; }
grub-core/commands/efi/lsefi.c +1 -1
@@ -33,7 +33,7 @@ struct known_protocol {grub_efi_guid_t guid;const char *name; -} known_protocols[] = +} known_protocols[] = { { GRUB_EFI_DISK_IO_GUID, "disk" }, { GRUB_EFI_BLOCK_IO_GUID, "block" },
grub-core/commands/efi/lsefimmap.c +3 -3
@@ -59,9 +59,9 @@ grub_cmd_lsefimmap (grub_command_t cmd __attribute__ ((unused)), {grub_efi_uint64_t size;grub_efi_uint64_t attr; -static const char types_str[][9 ] = +static const char types_str[][9 ] = { -"reserved" , +"reserved" ,"ldr-code" ,"ldr-data" ,"BS-code " ,
@@ -81,7 +81,7 @@ grub_cmd_lsefimmap (grub_command_t cmd __attribute__ ((unused)),grub_printf ("%s " , types_str[desc->type]); else grub_printf ("Unk %02x ", desc->type); - + grub_printf (" %016" PRIxGRUB_UINT64_T "-%016" PRIxGRUB_UINT64_T " %08" PRIxGRUB_UINT64_T, desc->physical_start,
grub-core/commands/efi/lsefisystab.c +3 -3
@@ -72,7 +72,7 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),char *vendor;grub_uint16_t *vendor_utf16;grub_printf ("Vendor: " ); - +for (vendor_utf16 = st->firmware_vendor; *vendor_utf16; vendor_utf16++);/* Allocate extra 3 bytes to simplify math. */ vendor =grub_calloc (4 , vendor_utf16 - st->firmware_vendor +1 );
@@ -99,7 +99,7 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)), t->vendor_guid.data3);for (j =0 ; j <8 ; j++)grub_printf ("%02x" , t->vendor_guid.data4[j]); - +for (j =0 ; j <ARRAY_SIZE (guid_mappings); j++)if (grub_memcmp (&guid_mappings[j].guid, &t->vendor_guid,sizeof (grub_efi_guid_t)) ==0 )
@@ -115,7 +115,7 @@ static grub_command_t cmd;GRUB_MOD_INIT (lsefisystab) { - cmd =grub_register_command ("lsefisystab" , grub_cmd_lsefisystab, + cmd =grub_register_command ("lsefisystab" , grub_cmd_lsefisystab,"" ,"Display EFI system tables." ); }
grub-core/commands/halt.c +1 -1
@@ -37,7 +37,7 @@ static grub_command_t cmd;GRUB_MOD_INIT (halt) { cmd =grub_register_command ("halt" , grub_cmd_halt, -0 ,N_ ("Halts the computer. This command does" +0 ,N_ ("Halts the computer. This command does" " not work on all firmware implementations." )); }
grub-core/commands/hashsum.c +4 -4
@@ -39,7 +39,7 @@ static const struct grub_arg_option options[] = { {0, 0, 0, 0, 0, 0} }; -static struct {const char *name;const char *hashname; } aliases[] = +static struct {const char *name;const char *hashname; } aliases[] = { {"sha256sum" ,"sha256" }, {"sha512sum" ,"sha512" },
@@ -116,7 +116,7 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename, hashlist =grub_file_open (hashfilename,GRUB_FILE_TYPE_HASHLIST );if (!hashlist)return grub_errno; - +while (grub_free (buf), (buf =grub_file_getline (hashlist))) {const char *p = buf;
@@ -143,7 +143,7 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,if (prefix) {char *filename; - + filename =grub_xasprintf ("%s/%s" , prefix, p);if (!filename) {
@@ -192,7 +192,7 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename, "hash of '%s' mismatches", p); } mismatch++; -continue ; +continue ; }grub_printf_ (N_ ("%s: OK\n" ), p); }
grub-core/commands/hdparm.c +1 -1
@@ -333,7 +333,7 @@ grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args)grub_disk_close (disk);return grub_error (GRUB_ERR_IO ,"not an ATA device" ); } - +/* Change settings. */ if (aam >=0 )
grub-core/commands/help.c +3 -3
@@ -64,11 +64,11 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc, stringwidth =0 ; -while (unicode_last_screen_position < unicode_last_position && +while (unicode_last_screen_position < unicode_last_position && stringwidth < ((grub_term_width (term) /2 ) -2 )) {struct grub_unicode_glyph glyph; - unicode_last_screen_position + unicode_last_screen_position += grub_unicode_aglomerate_comb (unicode_last_screen_position, unicode_last_position - unicode_last_screen_position,
@@ -88,7 +88,7 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,if (cnt %2 )grub_printf ("\n" ); cnt++; - +grub_free (command_help);grub_free (unicode_command_help); }
grub-core/commands/i386/coreboot/cb_timestamps.c +1 -1
@@ -84,7 +84,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item,grub_uint32_t tmrel =tsc2ms (ts_table->entries[i].tsc - last_tsc); last_tsc = ts_table->entries[i].tsc; - grub_printf ("%3d.%03ds %2d.%03ds %02d %s\n", + grub_printf ("%3d.%03ds %2d.%03ds %02d %s\n", tmabs / 1000, tmabs % 1000, tmrel / 1000, tmrel % 1000, ts_table->entries[i].id, (ts_table->entries[i].id < ARRAY_SIZE (descs)
grub-core/commands/i386/coreboot/cbls.c +1 -1
@@ -84,7 +84,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, grub_printf (": %dx%dx%d pitch=%d lfb=0x%llx %d/%d/%d/%d %d/%d/%d/%d", fb->width, fb->height, - fb->bpp, fb->pitch, + fb->bpp, fb->pitch, (unsigned long long) fb->lfb, fb->red_mask_size, fb->green_mask_size, fb->blue_mask_size, fb->reserved_mask_size,
grub-core/commands/i386/pc/drivemap.c +1 -1
@@ -185,7 +185,7 @@ list_mappings (void)return GRUB_ERR_NONE ; } -/* TRANSLATORS: This is the header of mapping list. +/* TRANSLATORS: This is the header of mapping list. On the left is how OS will see the disks and on the right current GRUB vision. */ grub_puts_ (N_ ("OS disk #num ------> GRUB/BIOS device" ));
grub-core/commands/i386/pc/halt.c +1 -1
@@ -59,7 +59,7 @@ grub_halt (int no_apm) regs.ebx =0 ; regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x15 , ®s); - +if (regs.flags &GRUB_CPU_INT_FLAGS_CARRY )stop ();
grub-core/commands/i386/pc/lsapm.c +1 -1
@@ -34,7 +34,7 @@ grub_apm_get_info (struct grub_apm_info *info) regs.ebx =0 ; regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x15 , ®s); - +if (regs.flags &GRUB_CPU_INT_FLAGS_CARRY )return 0 ; info->version = regs.eax &0xffff ;
grub-core/commands/i386/pc/play.c +1 -1
@@ -80,7 +80,7 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)), {if (argc <1 ) - return grub_error (GRUB_ERR_BAD_ARGUMENT, + return grub_error (GRUB_ERR_BAD_ARGUMENT,/* TRANSLATORS: It's musical notes, not the notes you take. Play command expects arguments which can be either a filename or tempo+notes.
grub-core/commands/i386/pc/sendkey.c +15 -15
@@ -55,12 +55,12 @@ static const struct grub_arg_option options[] = {"no-led", 0, 0, N_("don't update LED state"), 0, 0}, {0, 0, 0, 0, 0, 0} }; -static int simple_flag_offsets[] +static int simple_flag_offsets[] = {5 ,6 ,4 ,7 ,11 ,1 ,0 ,10 ,13 ,14 ,12 ,15 ,9 ,3 ,8 ,2 };static grub_uint32_t andmask =0xffffffff , ormask =0 ; -struct +struct keysym { const char *unshifted_name; /* the name in unshifted state */
@@ -171,13 +171,13 @@ static struct keysym keysym_table[] = {"right", 0, 0xe0, 0, 0x4d} }; -/* Set a simple flag in flags variable +/* Set a simple flag in flags variable OUTOFFSET - offset of flag in FLAGS, OP - action id */ static void grub_sendkey_set_simple_flag (int outoffset,int op) -{ +{if (op ==2 ) { andmask |= (1 << outoffset);
@@ -199,7 +199,7 @@ grub_sendkey_parse_op (struct grub_arg_list state)if (! state.set)return 2 ; -if (grub_strcmp (state.arg,"off" ) ==0 ||grub_strcmp (state.arg,"0" ) ==0 +if (grub_strcmp (state.arg,"off" ) ==0 ||grub_strcmp (state.arg,"0" ) ==0 ||grub_strcmp (state.arg,"unpress" ) ==0 )return 0 ;
@@ -234,7 +234,7 @@ grub_sendkey_preboot (int noret __attribute__ ((unused)))grub_uint32_t *flags = (grub_uint32_t *)0x417 ; oldflags = *flags; - +/* Set the sendkey. */ *((char *)0x41a ) =0x1e ; *((char *)0x41c ) = keylen +0x1e ;
@@ -247,7 +247,7 @@ grub_sendkey_preboot (int noret __attribute__ ((unused)))/* Transform "any alt" to "right alt" flag. */ if (*flags & (1 <<9 )) *flags &= ~(1 <<3 ); - + *flags = (*flags & andmask) | ormask;/* Transform "right ctrl" to "any ctrl" flag. */
@@ -294,10 +294,10 @@ find_key_code (char *key)for (i =0 ; i <ARRAY_SIZE (keysym_table); i++) { -if (keysym_table[i].unshifted_name +if (keysym_table[i].unshifted_name &&grub_strcmp (key, keysym_table[i].unshifted_name) ==0 )return keysym_table[i].keycode; -else if (keysym_table[i].shifted_name +else if (keysym_table[i].shifted_name &&grub_strcmp (key, keysym_table[i].shifted_name) ==0 )return keysym_table[i].keycode; }
@@ -313,10 +313,10 @@ find_ascii_code (char *key)for (i =0 ; i <ARRAY_SIZE (keysym_table); i++) { -if (keysym_table[i].unshifted_name +if (keysym_table[i].unshifted_name &&grub_strcmp (key, keysym_table[i].unshifted_name) ==0 )return keysym_table[i].unshifted_ascii; -else if (keysym_table[i].shifted_name +else if (keysym_table[i].shifted_name &&grub_strcmp (key, keysym_table[i].shifted_name) ==0 )return keysym_table[i].shifted_ascii; }
@@ -340,7 +340,7 @@ grub_cmd_sendkey (grub_extcmd_context_t ctxt, int argc, char **args)for (i =0 ; i < argc && keylen <0x20 ; i++) {int key_code; - + key_code =find_key_code (args[i]);if (key_code) {
@@ -353,7 +353,7 @@ grub_cmd_sendkey (grub_extcmd_context_t ctxt, int argc, char **args) {unsigned i;for (i =0 ; i <ARRAY_SIZE (simple_flag_offsets); i++) -grub_sendkey_set_simple_flag (simple_flag_offsets[i], +grub_sendkey_set_simple_flag (simple_flag_offsets[i],grub_sendkey_parse_op (state[i])); }
@@ -374,8 +374,8 @@ GRUB_MOD_INIT (sendkey)keypresses. */ N_("Emulate a keystroke sequence"), options); - preboot_hook - =grub_loader_register_preboot_hook (grub_sendkey_preboot, + preboot_hook + =grub_loader_register_preboot_hook (grub_sendkey_preboot, grub_sendkey_postboot,GRUB_LOADER_PREBOOT_HOOK_PRIO_CONSOLE ); }
grub-core/commands/keylayouts.c +27 -27
136 lines not on this page · raw message
grub-core/commands/legacycfg.c +6 -6
@@ -257,8 +257,8 @@ grub_cmd_legacy_source (struct grub_command *cmd, }static enum - { -GUESS_IT ,LINUX ,MULTIBOOT ,KFREEBSD ,KNETBSD ,KOPENBSD + { +GUESS_IT ,LINUX ,MULTIBOOT ,KFREEBSD ,KNETBSD ,KOPENBSD } kernel_type; static grub_err_t
@@ -273,7 +273,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),char **cutargs;int cutargc;grub_err_t err =GRUB_ERR_NONE ; - +for (i =0 ; i <2 ; i++) {/* FIXME: really support this. */
@@ -410,7 +410,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),if (dev)grub_device_close (dev); } - +/* k*BSD didn't really work well with grub-legacy. */ if (kernel_type ==GUESS_IT || kernel_type ==KFREEBSD ) {
@@ -632,7 +632,7 @@ check_password_md5_real (const char *entered, digest =GRUB_MD_MD5 ->read (ctx);GRUB_MD_MD5 ->final (ctx);grub_memcpy (alt_result, digest,MD5_HASHLEN ); - +GRUB_MD_MD5 ->init (ctx);GRUB_MD_MD5 ->write (ctx, entered, enteredlen);GRUB_MD_MD5 ->write (ctx, pw->salt, pw->saltlen);/* include the $1$ header */
@@ -654,7 +654,7 @@ check_password_md5_real (const char *entered,GRUB_MD_MD5 ->write (ctx, entered, enteredlen); else GRUB_MD_MD5->write (ctx, alt_result, 16); - + if (i % 3 != 0) GRUB_MD_MD5->write (ctx, pw->salt + 3, pw->saltlen - 3);
grub-core/commands/lsacpi.c +1 -1
@@ -35,7 +35,7 @@ print_strn (grub_uint8_t *str, grub_size_t len)for (; *str && len; str++, len--)grub_printf ("%c" , *str);for (len++; len; len--) -grub_printf (" " ); +grub_printf (" " ); }#define print_field (x) print_strn(x, sizeof (x))
grub-core/commands/lspci.c +3 -3
@@ -171,7 +171,7 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,if (space ==0 )continue ; - +switch (space &GRUB_PCI_ADDR_SPACE_MASK ) {case GRUB_PCI_ADDR_SPACE_IO :
@@ -195,13 +195,13 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid, (space &GRUB_PCI_ADDR_MEM_MASK ), space &GRUB_PCI_ADDR_MEM_PREFETCH ? "prefetchable" : "non-prefetchable"); - + }else grub_printf ("\t32-bit memory space %d at 0x%016llx [%s]\n" , (unsigned ) ((reg -GRUB_PCI_REG_ADDRESSES ) /sizeof (grub_uint32_t)) -1 , - (unsigned long long ) + (unsigned long long ) (space &GRUB_PCI_ADDR_MEM_MASK ), space &GRUB_PCI_ADDR_MEM_PREFETCH ?"prefetchable" :"non-prefetchable" );
grub-core/commands/mips/loongson/lsspd.c +1 -1
@@ -44,7 +44,7 @@ grub_cmd_lsspd (grub_command_t cmd __attribute__ ((unused)), }grub_printf_ (N_ ("CS5536 at %d:%d.%d\n" ),grub_pci_get_bus (dev),grub_pci_get_device (dev),grub_pci_get_function (dev)); - + err =grub_cs5536_init_smbus (dev,0x7fff , &smbbase);if (err)return err;
grub-core/commands/nativedisk.c +1 -1
@@ -31,7 +31,7 @@GRUB_MOD_LICENSE ("GPLv3+" ); -static const char *modnames_def[] = { +static const char *modnames_def[] = {/* FIXME: autogenerate this. */ #if defined (__i386__) || defined (__x86_64__) || defined (GRUB_MACHINE_MIPS_LOONGSON) "pata", "ahci", "usbms", "ohci", "uhci", "ehci"
grub-core/commands/password_pbkdf2.c +1 -1
@@ -162,7 +162,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),return grub_errno; } ptr = ptr2 +1 ; - ptr2 +=grub_strlen (ptr2); + ptr2 +=grub_strlen (ptr2);while (ptr < ptr2) {int hex1, hex2;
grub-core/commands/pgp.c +7 -7
@@ -74,7 +74,7 @@ read_packet_header (grub_file_t sig, grub_uint8_t *out_type, grub_size_t *len)if (type ==0 ) { *out_type =0xfe ; -return 0 ; +return 0 ; }if (!(type &0x80 ))
@@ -166,7 +166,7 @@ structint (*pad) (gcry_mpi_t *hmpi,grub_uint8_t *hval,const gcry_md_spec_t *hash,struct grub_public_subkey *sk);const char *module; -} pkalgos[] = +} pkalgos[] = { [1] = { "rsa", 1, 2, &grub_crypto_pk_rsa, rsa_pad, "gcry_rsa" }, [3] = { "rsa", 1, 2, &grub_crypto_pk_rsa, rsa_pad, "gcry_rsa" },
@@ -320,7 +320,7 @@ grub_load_public_key (grub_file_t f)grub_error (GRUB_ERR_BAD_SIGNATURE ,N_ ("bad signature" ));break ; } - + lb = (grub_be_to_cpu16 (l) +GRUB_CHAR_BIT -1 ) /GRUB_CHAR_BIT ;if (lb >READBUF_SIZE -sizeof (grub_uint16_t)) {
@@ -335,7 +335,7 @@ grub_load_public_key (grub_file_t f)grub_memcpy (buffer, &l,sizeof (l));GRUB_MD_SHA1 ->write (fingerprint_context, buffer, lb +sizeof (grub_uint16_t)); - +if (gcry_mpi_scan (&sk->mpis[i],GCRYMPI_FMT_PGP , buffer, lb +sizeof (grub_uint16_t),0 )) {
@@ -479,7 +479,7 @@ grub_verify_signature_init (struct grub_pubkey_context *ctxt, grub_file_t sig) h = ctxt->v4.hash; t = ctxt->v4.type; pk = ctxt->v4.pkeyalgo; - +if (t !=0 )return grub_error (GRUB_ERR_BAD_SIGNATURE ,N_ ("bad signature" ));
@@ -922,7 +922,7 @@ grub_env_write_sec (struct grub_env_var *var __attribute__ ((unused)),return grub_strdup (sec ?"enforce" :"no" ); } -static grub_ssize_t +static grub_ssize_t pseudo_read (struct grub_file *file,char *buf,grub_size_t len) {grub_memcpy (buf, (grub_uint8_t *) file->data + file->offset, len);
@@ -931,7 +931,7 @@ pseudo_read (struct grub_file *file, char *buf, grub_size_t len)/* Filesystem descriptor. */ -struct grub_fs pseudo_fs = +struct grub_fs pseudo_fs = { .name ="pseudo" , .fs_read = pseudo_read
grub-core/commands/search.c +2 -2
@@ -181,14 +181,14 @@ part_hook (grub_disk_t disk, const grub_partition_t partition, void *data)if (!devname)return 1 ; ret =iterate_device (devname, ctx); -grub_free (devname); +grub_free (devname);return ret; }/* Helper for FUNC_NAME. */ static void -try (struct search_ctx *ctx) +try (struct search_ctx *ctx) {unsigned i;struct cache_entry **prev;
grub-core/commands/search_wrap.c +2 -2
@@ -181,13 +181,13 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args) }if (state[SEARCH_LABEL ].set) -grub_search_label (id, var, state[SEARCH_NO_FLOPPY ].set, +grub_search_label (id, var, state[SEARCH_NO_FLOPPY ].set, hints, nhints);else if (state[SEARCH_FS_UUID ].set)grub_search_fs_uuid (id, var, state[SEARCH_NO_FLOPPY ].set, hints, nhints);else if (state[SEARCH_FILE ].set) -grub_search_fs_file (id, var, state[SEARCH_NO_FLOPPY ].set, +grub_search_fs_file (id, var, state[SEARCH_NO_FLOPPY ].set, hints, nhints);else grub_error (GRUB_ERR_INVALID_COMMAND ,"unspecified search type" );
grub-core/commands/terminal.c +2 -2
@@ -199,9 +199,9 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,grub_list_remove (GRUB_AS_LIST (term));grub_list_push (GRUB_AS_LIST_P (enabled),GRUB_AS_LIST (term)); - } + } } - + {struct abstract_terminal *next;for (term = *enabled; term; term = next)
grub-core/commands/videoinfo.c +1 -1
@@ -29,7 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");struct hook_ctx { -unsigned height, width, depth; +unsigned height, width, depth;struct grub_video_mode_info *current_mode; };
grub-core/commands/videotest.c +1 -1
@@ -158,7 +158,7 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)), {if (i ==0 || i ==1 ) - { + { color =grub_video_map_rgb (0 ,0 ,0 );grub_video_fill_rect (color,0 ,0 , width, height);
grub-core/commands/wildcard.c +1 -1
@@ -444,7 +444,7 @@ check_file_iter (const char *name, const struct grub_dirhook_info *info, ctx->found =1 ;return 1 ; } - +return 0 ; }
Signature · 1 line
2.35.1
PATCH 3/21 disk: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/disk/ahci.c | 24 ++++++++++++------------ grub-core/disk/ata.c | 14 +++++++------- grub-core/disk/cryptodisk.c | 26 +++++++++++++------------- grub-core/disk/diskfilter.c | 24 ++++++++++++------------ grub-core/disk/efi/efidisk.c | 4 ++-- grub-core/disk/geli.c | 10 +++++----- grub-core/disk/i386/pc/biosdisk.c | 16 ++++++++-------- grub-core/disk/ieee1275/ofdisk.c | 6 +++--- grub-core/disk/ldm.c | 4 ++-- grub-core/disk/luks.c | 4 ++-- grub-core/disk/lvm.c | 4 ++-- grub-core/disk/mdraid1x_linux.c | 8 ++++---- grub-core/disk/pata.c | 2 +- grub-core/disk/scsi.c | 8 ++++---- grub-core/disk/usbms.c | 26 +++++++++++++------------- 15 files changed, 90 insertions(+), 90 deletions(-)
grub-core/disk/ahci.c +12 -12
@@ -150,7 +150,7 @@ struct grub_ahci_deviceint atapi; }; -static grub_err_t +static grub_err_t grub_ahci_readwrite_real (struct grub_ahci_device *dev,struct grub_disk_ata_pass_through_parms *parms,int spinup,int reset);
@@ -457,7 +457,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,grub_dprintf ("ahci" ,"port: %d, err: %x\n" , adevs[i]->port, adevs[i]->hba->ports[adevs[i]->port].sata_error); - adevs[i]->rfis =grub_memalign_dma32 (4096 , + adevs[i]->rfis =grub_memalign_dma32 (4096 ,sizeof (struct grub_ahci_received_fis ));grub_memset ((char *)grub_dma_get_virt (adevs[i]->rfis),0 ,sizeof (struct grub_ahci_received_fis ));
@@ -543,7 +543,7 @@ grub_ahci_pciinit (grub_pci_device_t dev, adevs[i]->hba->ports[adevs[i]->port].sata_error);grub_dprintf ("ahci" ,"port %d, offset: %x, tfd:%x, CMD: %x\n" , adevs[i]->port, - (int ) ((char *) &adevs[i]->hba->ports[adevs[i]->port].task_file_data - + (int ) ((char *) &adevs[i]->hba->ports[adevs[i]->port].task_file_data - (char *) adevs[i]->hba), adevs[i]->hba->ports[adevs[i]->port].task_file_data, adevs[i]->hba->ports[adevs[i]->port].command);
@@ -557,7 +557,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,if (adevs[i]) {grub_dprintf ("ahci" ,"port %d, offset: %x, tfd:%x, CMD: %x\n" , adevs[i]->port, - (int ) ((char *) &adevs[i]->hba->ports[adevs[i]->port].task_file_data - + (int ) ((char *) &adevs[i]->hba->ports[adevs[i]->port].task_file_data - (char *) adevs[i]->hba), adevs[i]->hba->ports[adevs[i]->port].task_file_data, adevs[i]->hba->ports[adevs[i]->port].command);
@@ -702,7 +702,7 @@ grub_ahci_fini_hw (int noreturn __attribute__ ((unused)))return GRUB_ERR_NONE ; } -static int +static int reinit_port (struct grub_ahci_device *dev) {struct grub_pci_dma_chunk *command_list;
@@ -743,7 +743,7 @@ reinit_port (struct grub_ahci_device *dev) dev->hba->ports[dev->port].fbs =2 ; - dev->rfis =grub_memalign_dma32 (4096 , + dev->rfis =grub_memalign_dma32 (4096 ,sizeof (struct grub_ahci_received_fis ));grub_memset ((char *)grub_dma_get_virt (dev->rfis),0 ,sizeof (struct grub_ahci_received_fis ));
@@ -861,13 +861,13 @@ static const int register_map[11] = { 3 /* Features */,13 /* Sectors 48 */ ,8 /* LBA48 low */ ,9 /* LBA48 mid */ , - 10 /* LBA48 high */ }; + 10 /* LBA48 high */ };static grub_err_t grub_ahci_reset_port (struct grub_ahci_device *dev,int force) {grub_uint64_t endtime; - + dev->hba->ports[dev->port].sata_error = dev->hba->ports[dev->port].sata_error; if (force || (dev->hba->ports[dev->port].command_issue & 1)
@@ -913,7 +913,7 @@ grub_ahci_reset_port (struct grub_ahci_device *dev, int force)return GRUB_ERR_NONE ; } -static grub_err_t +static grub_err_t grub_ahci_readwrite_real (struct grub_ahci_device *dev,struct grub_disk_ata_pass_through_parms *parms,int spinup,int reset)
@@ -928,7 +928,7 @@ grub_ahci_readwrite_real (struct grub_ahci_device *dev,if (!reset)grub_ahci_reset_port (dev,0 ); - +grub_dprintf ("ahci" ,"AHCI tfd = %x\n" , dev->hba->ports[dev->port].task_file_data); dev->hba->ports[dev->port].task_file_data =0 ;
@@ -990,7 +990,7 @@ grub_ahci_readwrite_real (struct grub_ahci_device *dev, dev->command_table[0 ].cfis[0 ] =GRUB_AHCI_FIS_REG_H2D ; dev->command_table[0 ].cfis[1 ] =0x80 ;for (i =0 ; i <sizeof (parms->taskfile.raw); i++) - dev->command_table[0 ].cfis[register_map[i]] = parms->taskfile.raw[i]; + dev->command_table[0 ].cfis[register_map[i]] = parms->taskfile.raw[i]; grub_dprintf ("ahci", "cfis: %02x %02x %02x %02x %02x %02x %02x %02x\n", dev->command_table[0].cfis[0], dev->command_table[0].cfis[1],
@@ -1094,7 +1094,7 @@ grub_ahci_readwrite_real (struct grub_ahci_device *dev,return err; } -static grub_err_t +static grub_err_t grub_ahci_readwrite (grub_ata_t disk,struct grub_disk_ata_pass_through_parms *parms,int spinup)
grub-core/disk/ata.c +7 -7
@@ -236,7 +236,7 @@ grub_ata_setaddress (struct grub_ata *dev,"sector %" PRIxGRUB_UINT64_T" cannot be " "addressed using CHS addressing" , sector); - + parms->taskfile.disk =0xE0 | head; parms->taskfile.sectnum = sect; parms->taskfile.cyllsb = cylinder &0xFF ;
@@ -345,7 +345,7 @@ grub_ata_readwrite (grub_disk_t disk, grub_disk_addr_t sector, parms.write = rw;if (ata->dma) parms.dma =1 ; - + err = ata->dev->readwrite (ata, &parms,0 );if (err)return err;
@@ -430,7 +430,7 @@ grub_ata_iterate_iter (int id, int bus, void *data)grub_ata_real_close (ata);return 0 ; } -grub_snprintf (devname,sizeof (devname), +grub_snprintf (devname,sizeof (devname),"%s%d" , grub_scsi_names[id], bus); ret = ctx->hook (devname, ctx->hook_data);grub_ata_real_close (ata);
@@ -443,7 +443,7 @@ grub_ata_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data, {struct grub_ata_iterate_ctx ctx = { hook, hook_data };grub_ata_dev_t p; - +for (p = grub_ata_dev_list; p; p = p->next)if (p->iterate && p->iterate (grub_ata_iterate_iter, &ctx, pull))return 1 ;
@@ -546,7 +546,7 @@ grub_atapi_read (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd, parms.size = size; parms.buffer = buf; - + err = dev->dev->readwrite (dev, &parms,0 );if (err)return err;
@@ -575,7 +575,7 @@ grub_atapi_open (int id, int bus, struct grub_scsi *scsi) ata =grub_ata_real_open (id, bus);if (!ata)return grub_errno; - +if (! ata->atapi)return grub_error (GRUB_ERR_UNKNOWN_DEVICE ,"no such ATAPI device" );
@@ -623,7 +623,7 @@ grub_atapi_iterate (grub_scsi_dev_iterate_hook_t hook, void *hook_data, {struct grub_atapi_iterate_ctx ctx = { hook, hook_data };grub_ata_dev_t p; - +for (p = grub_ata_dev_list; p; p = p->next)if (p->iterate && p->iterate (grub_atapi_iterate_iter, &ctx, pull))return 1 ;
grub-core/disk/cryptodisk.c +13 -13
@@ -351,18 +351,18 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, dev->cipher->cipher->blocksize);if (err)return err; - +for (j =0 ; j < (1U << log_sector_size); j += dev->cipher->cipher->blocksize) {grub_crypto_xor (data + i + j, data + i + j, iv, dev->cipher->cipher->blocksize);if (do_encrypt) - err =grub_crypto_ecb_encrypt (dev->cipher, data + i + j, + err =grub_crypto_ecb_encrypt (dev->cipher, data + i + j, data + i + j, dev->cipher->cipher->blocksize);else - err =grub_crypto_ecb_decrypt (dev->cipher, data + i + j, + err =grub_crypto_ecb_decrypt (dev->cipher, data + i + j, data + i + j, dev->cipher->cipher->blocksize);if (err)
@@ -381,11 +381,11 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,lrw_xor (&sec, dev, data + i);if (do_encrypt) - err =grub_crypto_ecb_encrypt (dev->cipher, data + i, + err =grub_crypto_ecb_encrypt (dev->cipher, data + i, data + i, (1U << log_sector_size));else - err =grub_crypto_ecb_decrypt (dev->cipher, data + i, + err =grub_crypto_ecb_decrypt (dev->cipher, data + i, data + i, (1U << log_sector_size));if (err)
@@ -595,7 +595,7 @@ grub_cryptodisk_setkey (grub_cryptodisk_t dev, grub_uint8_t *key, grub_size_t ke real_keysize /=2 ;if (dev->mode ==GRUB_CRYPTODISK_MODE_LRW ) real_keysize -= dev->cipher->cipher->blocksize; - +/* Set the PBKDF2 output as the cipher key. */ err =grub_crypto_cipher_set_key (dev->cipher, key, real_keysize);if (err)
@@ -1083,7 +1083,7 @@ grub_cryptodisk_cheat_mount (const char *sourcedev, const char *cheat)if (dev) { -grub_disk_close (source); +grub_disk_close (source);return GRUB_ERR_NONE ; }
@@ -1321,7 +1321,7 @@ luks_script_get (grub_size_t *sz)switch (i->mode) {case GRUB_CRYPTODISK_MODE_ECB : - ptr =grub_stpcpy (ptr,"-ecb" ); + ptr =grub_stpcpy (ptr,"-ecb" );break ;case GRUB_CRYPTODISK_MODE_CBC : ptr =grub_stpcpy (ptr,"-cbc" );
@@ -1340,19 +1340,19 @@ luks_script_get (grub_size_t *sz)switch (i->mode_iv) {case GRUB_CRYPTODISK_MODE_IV_NULL : - ptr =grub_stpcpy (ptr,"-null" ); + ptr =grub_stpcpy (ptr,"-null" );break ;case GRUB_CRYPTODISK_MODE_IV_PLAIN : - ptr =grub_stpcpy (ptr,"-plain" ); + ptr =grub_stpcpy (ptr,"-plain" );break ;case GRUB_CRYPTODISK_MODE_IV_PLAIN64 : - ptr =grub_stpcpy (ptr,"-plain64" ); + ptr =grub_stpcpy (ptr,"-plain64" );break ;case GRUB_CRYPTODISK_MODE_IV_BENBI : - ptr =grub_stpcpy (ptr,"-benbi" ); + ptr =grub_stpcpy (ptr,"-benbi" );break ;case GRUB_CRYPTODISK_MODE_IV_ESSIV : - ptr =grub_stpcpy (ptr,"-essiv:" ); + ptr =grub_stpcpy (ptr,"-essiv:" ); ptr =grub_stpcpy (ptr, i->essiv_hash->name);break ;case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64 :
grub-core/disk/diskfilter.c +12 -12
@@ -140,7 +140,7 @@ scan_disk_partition_iter (grub_disk_t disk, grub_partition_t p, void *data)#endif disk->partition = p; - +for (arr = array_list; arr !=NULL ; arr = arr->next) {struct grub_diskfilter_pv *m;
@@ -155,7 +155,7 @@ scan_disk_partition_iter (grub_disk_t disk, grub_partition_t p, void *data)for (diskfilter = grub_diskfilter_list; diskfilter; diskfilter = diskfilter->next) {#ifdef GRUB_UTIL -grub_util_info ("Scanning for %s devices on disk %s" , +grub_util_info ("Scanning for %s devices on disk %s" , diskfilter->name, name);#endif id.uuid =0 ;
@@ -620,7 +620,7 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector,grub_disk_addr_t read_sector, far_ofs;grub_uint64_t disknr, b, near, far, ofs;unsigned int i, j; - + read_sector =grub_divmod64 (sector, seg->stripe_size, &b); far = ofs = near =1 ; far_ofs =0 ;
@@ -639,17 +639,17 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector,else far_ofs =grub_divmod64 (seg->raid_member_size, far * seg->stripe_size,0 ); - + far_ofs *= seg->stripe_size; } - read_sector =grub_divmod64 (read_sector * near, + read_sector =grub_divmod64 (read_sector * near, seg->node_count, &disknr); ofs *= seg->stripe_size; read_sector *= ofs; - +while (1 ) {grub_size_t read_size;
@@ -704,7 +704,7 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector, size -= read_size;if (! size)return GRUB_ERR_NONE ; - + b =0 ; disknr += (near - i);while (disknr >= seg->node_count)
@@ -765,7 +765,7 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector, {grub_size_t read_size;int next_level; - + read_size = seg->stripe_size - b;if (read_size > size) read_size = size;
@@ -870,7 +870,7 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector, disknr =0 ; } } - } + }return GRUB_ERR_NONE ;default : return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
@@ -894,7 +894,7 @@ read_lv (struct grub_diskfilter_lv *lv, grub_disk_addr_t sector,grub_uint64_t to_read; extent =grub_divmod64 (sector, vg->extent_size,NULL ); - +/* Find the right segment. */ {unsigned int i;
@@ -1230,8 +1230,8 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,for (pv = array->pvs; pv; pv = pv->next)if (id->uuidlen == pv->id.uuidlen - && id->uuidlen - ? (grub_memcmp (pv->id.uuid, id->uuid, id->uuidlen) ==0 ) + && id->uuidlen + ? (grub_memcmp (pv->id.uuid, id->uuid, id->uuidlen) ==0 ) : (pv->id.id == id->id)) {struct grub_diskfilter_lv *lv;
grub-core/disk/efi/efidisk.c +2 -2
@@ -335,7 +335,7 @@ name_devices (struct grub_efidisk_data *devices) {grub_efi_acpi_device_path_t *acpi = (grub_efi_acpi_device_path_t *) dp; -/* Floppy EISA ID. */ +/* Floppy EISA ID. */ if (acpi->hid ==0x60441d0 || acpi->hid ==0x70041d0 || acpi->hid ==0x70141d1 ) is_floppy =1 ;
@@ -707,7 +707,7 @@ grub_efidisk_get_device_handle (grub_disk_t disk) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE) && (GRUB_EFI_DEVICE_PATH_SUBTYPE (c->last_device_path) ==GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE ) - && (grub_partition_get_start (disk->partition) + && (grub_partition_get_start (disk->partition) == (hd->partition_start << (disk->log_sector_size -GRUB_DISK_SECTOR_BITS ))) && (grub_partition_get_len (disk->partition)
grub-core/disk/geli.c +5 -5
@@ -157,7 +157,7 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno)return gcry_err;return grub_cryptodisk_setkey (dev, (grub_uint8_t *) key, - dev->rekey_derived_size); + dev->rekey_derived_size); } static inline gcry_err_code_t
@@ -200,7 +200,7 @@ grub_util_get_geli_uuid (const char *dev)unsigned log_secsize;grub_uint8_t hdr[512 ];struct grub_geli_phdr *header; -char *uuid; +char *uuid;gcry_err_code_t err; fd =grub_util_fd_open (dev,GRUB_UTIL_FD_O_RDONLY );
@@ -218,7 +218,7 @@ grub_util_get_geli_uuid (const char *dev)grub_util_error ("%s" ,_ ("couldn't read ELI metadata" ));grub_util_fd_close (fd); - +COMPILE_TIME_ASSERT (sizeof (header) <=512 ); header = (void *) &hdr;
@@ -292,7 +292,7 @@ configure_ciphers (grub_disk_t disk, grub_cryptomount_args_t cargs) {grub_dprintf ("geli" ,"not a boot volume\n" );return NULL ; - } + } gcry_err =make_uuid (&header, uuid);if (gcry_err)
@@ -536,7 +536,7 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev, grub_cryptomount_args_tif (grub_le_to_cpu16 (header.alg) ==0x16 ) real_keysize *=2 ; gcry_err =grub_cryptodisk_setkey (dev, candidate_key.cipher_key, - real_keysize); + real_keysize);if (gcry_err)return grub_crypto_gcry_error (gcry_err); }
grub-core/disk/i386/pc/biosdisk.c +8 -8
@@ -71,7 +71,7 @@ static int grub_biosdisk_get_num_floppies (void)* non-zero, otherwise zero. */ -static int +static int grub_biosdisk_rw_int13_extensions (int ah,int drive,void *dap) {struct grub_bios_int_registers regs;
@@ -91,7 +91,7 @@ grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap)* NSEC sectors from COFF/HOFF/SOFF into SEGMENT. If an error occurs, * return non-zero, otherwise zero. */ -static int +static int grub_biosdisk_rw_standard (int ah,int drive,int coff,int hoff,int soff,int nsec,int segment) {
@@ -110,7 +110,7 @@ grub_biosdisk_rw_standard (int ah, int drive, int coff, int hoff,/* set bits 0-5 of %cl to sector */ regs.ecx |= soff &0x3f ; -/* set %dh to head and %dl to drive */ +/* set %dh to head and %dl to drive */ regs.edx = (drive &0xff ) | ((hoff <<8 ) &0xff00 );/* set %ah to AH */ regs.eax = (ah <<8 ) &0xff00 ;
@@ -153,7 +153,7 @@ grub_biosdisk_check_int13_extensions (int drive) regs.ebx =0x55aa ; regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x13 , ®s); - +if (regs.flags &GRUB_CPU_INT_FLAGS_CARRY )return 0 ;
@@ -171,7 +171,7 @@ grub_biosdisk_check_int13_extensions (int drive)* Return the geometry of DRIVE in CYLINDERS, HEADS and SECTORS. If an * error occurs, then return non-zero, otherwise zero. */ -static int +static int grub_biosdisk_get_diskinfo_standard (int drive, unsigned long *cylinders, unsigned long *heads,
@@ -185,12 +185,12 @@ grub_biosdisk_get_diskinfo_standard (int drive, regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x13 , ®s); -/* Check if unsuccessful. Ignore return value if carry isn't set to +/* Check if unsuccessful. Ignore return value if carry isn't set to workaround some buggy BIOSes. */ if ((regs.flags &GRUB_CPU_INT_FLAGS_CARRY ) && ((regs.eax &0xff00 ) !=0 ))return (regs.eax &0xff00 ) >>8 ; -/* bogus BIOSes may not return an error number */ +/* bogus BIOSes may not return an error number */ /* 0 sectors means no disk */ if (!(regs.ecx &0x3f ))/* XXX 0x60 is one of the unused error numbers */
@@ -218,7 +218,7 @@ grub_biosdisk_get_diskinfo_real (int drive, void *drp, grub_uint16_t ax) regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x13 , ®s); -/* Check if unsuccessful. Ignore return value if carry isn't set to +/* Check if unsuccessful. Ignore return value if carry isn't set to workaround some buggy BIOSes. */ if ((regs.flags &GRUB_CPU_INT_FLAGS_CARRY ) && ((regs.eax &0xff00 ) !=0 ))return (regs.eax &0xff00 ) >>8 ;
grub-core/disk/ieee1275/ofdisk.c +3 -3
@@ -380,7 +380,7 @@ grub_ofdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,return 0 ;scan (); - +for (i =0 ; i <ARRAY_SIZE (ofdisk_hash); i++) {static struct ofdisk_hash_ent *ent;
@@ -420,7 +420,7 @@ grub_ofdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,if (hook (ent->grub_shortest, hook_data))return 1 ; } - } + }return 0 ; }
@@ -558,7 +558,7 @@ grub_ofdisk_prepare (grub_disk_t disk, grub_disk_addr_t sector)grub_ieee1275_open (disk->data, &last_ihandle);if (! last_ihandle)return grub_error (GRUB_ERR_UNKNOWN_DEVICE ,"can't open device" ); - last_devpath = disk->data; + last_devpath = disk->data; } pos = sector << disk->log_sector_size;
grub-core/disk/ldm.c +2 -2
@@ -259,7 +259,7 @@ make_vg (grub_disk_t disk, }grub_memcpy (pv->internal_id, ptr, (grub_size_t ) ptr[0 ] +1 ); pv->internal_id[(grub_size_t ) ptr[0 ] +1 ] =0 ; - + ptr += *ptr +1 ;if (ptr + *ptr +1 >= vblk[i].dynamic +sizeof (vblk[i].dynamic))
@@ -836,7 +836,7 @@ make_vg (grub_disk_t disk,return NULL ; } -static struct grub_diskfilter_vg * +static struct grub_diskfilter_vg *grub_ldm_detect (grub_disk_t disk,struct grub_diskfilter_pv_id *id,grub_disk_addr_t *start_sector)
grub-core/disk/luks.c +2 -2
@@ -212,7 +212,7 @@ luks_recover_key (grub_disk_t source,grub_dprintf ("luks" ,"PBKDF2 done\n" ); - gcry_err =grub_cryptodisk_setkey (dev, digest, keysize); + gcry_err =grub_cryptodisk_setkey (dev, digest, keysize);if (gcry_err) {grub_free (split_key);
@@ -280,7 +280,7 @@ luks_recover_key (grub_disk_t source,grub_printf_ (N_ ("Slot %d opened\n" ), i);/* Set the master key. */ - gcry_err =grub_cryptodisk_setkey (dev, candidate_key, keysize); + gcry_err =grub_cryptodisk_setkey (dev, candidate_key, keysize);if (gcry_err) {grub_free (split_key);
grub-core/disk/lvm.c +2 -2
@@ -132,7 +132,7 @@ grub_lvm_free_cache_lvs (struct cache_lv *cache_lvs) } } -static struct grub_diskfilter_vg * +static struct grub_diskfilter_vg *grub_lvm_detect (grub_disk_t disk,struct grub_diskfilter_pv_id *id,grub_disk_addr_t *start_sector)
@@ -989,7 +989,7 @@ grub_lvm_detect (grub_disk_t disk, lv1->segments[i].nodes[j].lv = lv2; } } - + } {
grub-core/disk/mdraid1x_linux.c +4 -4
@@ -129,10 +129,10 @@ grub_mdraid_detect (grub_disk_t disk,grub_uint32_t level;struct grub_diskfilter_vg *array;char *uuid; - +if (size ==GRUB_DISK_SIZE_UNKNOWN && minor_version ==0 )continue ; - +switch (minor_version) {case 0 :
@@ -177,7 +177,7 @@ grub_mdraid_detect (grub_disk_t disk,/* Spares aren't implemented. */ return NULL ; -if (grub_disk_read (disk, sector, +if (grub_disk_read (disk, sector, (char *) (sb.dev_roles +grub_le_to_cpu32 (sb.dev_number)) - (char *) &sb,sizeof (role), &role))
@@ -203,7 +203,7 @@ grub_mdraid_detect (grub_disk_t disk,grub_le_to_cpu32 (sb.raid_disks), sb.set_name, (sb.size) - ?grub_le_to_cpu64 (sb.size) + ?grub_le_to_cpu64 (sb.size) :grub_le_to_cpu64 (sb.data_size),grub_le_to_cpu32 (sb.chunksize), grub_le_to_cpu32 (sb.layout),
grub-core/disk/pata.c +1 -1
@@ -123,7 +123,7 @@ grub_pata_wait (void)static void grub_pata_pio_read (struct grub_pata_device *dev,char *buf,grub_size_t size) -{ +{unsigned int i;/* Read in the data, word by word. */
grub-core/disk/scsi.c +4 -4
@@ -90,7 +90,7 @@ grub_scsi_test_unit_ready (grub_scsi_t scsi)struct grub_scsi_test_unit_ready tur;grub_err_t err;grub_err_t err_sense; - + tur.opcode = grub_scsi_cmd_test_unit_ready; tur.lun = scsi->lun <<GRUB_SCSI_LUN_SHIFT ; tur.reserved1 =0 ;
@@ -108,7 +108,7 @@ grub_scsi_test_unit_ready (grub_scsi_t scsi)if (err_sense !=GRUB_ERR_NONE ) grub_errno = err;/* err_sense is ignored for now and Request Sense Data also... */ - +if (err)return err;
@@ -169,7 +169,7 @@ grub_scsi_read_capacity10 (grub_scsi_t scsi) rc.PMI =0 ; rc.control =0 ; rc.pad =0 ; - + err = scsi->dev->read (scsi,sizeof (rc), (char *) &rc,sizeof (rcd), (char *) &rcd);
@@ -204,7 +204,7 @@ grub_scsi_read_capacity16 (grub_scsi_t scsi) rc.alloc_len =grub_cpu_to_be32_compile_time (sizeof (rcd)); rc.PMI =0 ; rc.control =0 ; - + err = scsi->dev->read (scsi,sizeof (rc), (char *) &rc,sizeof (rcd), (char *) &rcd);
grub-core/disk/usbms.c +13 -13
@@ -104,7 +104,7 @@ grub_usbms_cbi_reset (grub_usb_device_t dev, int interface) {0xff ,0xff ,0xff ,0xff ,0xff , 0xff, 0xff, 0xff, 0xff, 0xff } }; - +return grub_usbms_cbi_cmd (dev, interface, (grub_uint8_t *)&cbicb); }
@@ -161,7 +161,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)/* Experimental support of RBC, MMC-2, UFI, SFF-8070i devices */ && interf->subclass !=GRUB_USBMS_SUBCLASS_RBC && interf->subclass !=GRUB_USBMS_SUBCLASS_MMC2 - && interf->subclass !=GRUB_USBMS_SUBCLASS_UFI + && interf->subclass !=GRUB_USBMS_SUBCLASS_UFI && interf->subclass != GRUB_USBMS_SUBCLASS_SFF8070 ) || (interf->protocol !=GRUB_USBMS_PROTOCOL_BULK && interf->protocol != GRUB_USBMS_PROTOCOL_CBI
@@ -215,7 +215,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)if (grub_usbms_devices[curnum]->protocol ==GRUB_USBMS_PROTOCOL_BULK ) {/* Only Bulk only devices support Get Max LUN command */ err =grub_usb_control_msg (usbdev,0xA1 ,254 ,0 , interfno,1 , (char *) &luns); - +if (err) {/* In case of a stall, clear the stall. */
@@ -231,7 +231,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)else /* luns = 0 means one LUN with ID 0 present ! */ /* We get from device not number of LUNs but highest -* LUN number. LUNs are numbered from 0, +* LUN number. LUNs are numbered from 0, * i.e. number of LUNs is luns+1 ! */ grub_usbms_devices[curnum]->luns = luns +1 ; }
@@ -239,7 +239,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)/* XXX: Does CBI devices support multiple LUNs ? * I.e., should we detect number of device's LUNs ? (How?) */ grub_usbms_devices[curnum]->luns =1 ; - +grub_dprintf ("usbms" ,"alive\n" ); usbdev->config[configno].interf[interfno].detach_hook = grub_usbms_detach;
@@ -297,7 +297,7 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,grub_usb_err_t err =GRUB_USB_ERR_NONE ;grub_usb_err_t errCSW =GRUB_USB_ERR_NONE ;int retrycnt =3 +1 ; - + tag++; retry:
@@ -314,7 +314,7 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd, cbw.lun = scsi->lun;/* In USB MS CBW are LUN bits on another place than in SCSI CDB, both should be set correctly. */ cbw.length = cmdsize;grub_memcpy (cbw.cbwcb, cmd, cmdsize); - +/* Debug print of CBW content. */ grub_dprintf ("usb" ,"CBW: sign=0x%08x tag=0x%08x len=0x%08x\n" , cbw.signature, cbw.tag, cbw.transfer_length);
@@ -344,7 +344,7 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,if (size && (read_write ==0 )) { err =grub_usb_bulk_read (dev->dev, dev->in, size, buf); -grub_dprintf ("usb" ,"read: %d %d\n" , err,GRUB_USB_ERR_STALL ); +grub_dprintf ("usb" ,"read: %d %d\n" , err,GRUB_USB_ERR_STALL );if (err) {if (err ==GRUB_USB_ERR_STALL )
@@ -411,7 +411,7 @@ CheckCSW:grub_dprintf ("usb" ,"CSW: sign=0x%08x tag=0x%08x resid=0x%08x\n" , status.signature, status.tag, status.residue);grub_dprintf ("usb" ,"CSW: status=0x%02x\n" , status.status); - +/* If phase error or not valid signature, do bulk-only reset device. */ if ((status.status ==2 ) || (status.signature !=grub_cpu_to_le32_compile_time (0x53425355 )))
@@ -444,7 +444,7 @@ grub_usbms_transfer_cbi (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,grub_usb_err_t err =GRUB_USB_ERR_NONE ;grub_uint8_t cbicb[GRUB_USBMS_CBI_CMD_SIZE ];grub_uint16_t status; - + retry: retrycnt--;if (retrycnt ==0 )
@@ -456,7 +456,7 @@ grub_usbms_transfer_cbi (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd, cmdsize >=GRUB_USBMS_CBI_CMD_SIZE ?GRUB_USBMS_CBI_CMD_SIZE : cmdsize); - +/* Debug print of CBIcb content. */ grub_dprintf ("usb", "cbicb:\n %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", cbicb[ 0], cbicb[ 1], cbicb[ 2], cbicb[ 3],
@@ -490,7 +490,7 @@ grub_usbms_transfer_cbi (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,if (size && (read_write ==0 )) { err =grub_usb_bulk_read (dev->dev, dev->in, size, buf); -grub_dprintf ("usb" ,"read: %d\n" , err); +grub_dprintf ("usb" ,"read: %d\n" , err);if (err) {if (err ==GRUB_USB_ERR_STALL )
@@ -572,7 +572,7 @@ grub_usbms_transfer_cbi (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,if (err)return grub_error (GRUB_ERR_IO ,"USB error %d" , err); - +return GRUB_ERR_NONE ; }
Signature · 1 line
2.35.1
PATCH 4/21 font: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/font/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
grub-core/font/font.c +1 -1
@@ -936,7 +936,7 @@ grub_font_get_height (grub_font_t font) }/* Get the glyph for FONT corresponding to the Unicode code point CODE. -Returns the ASCII glyph for the code if no other fonts are available. +Returns the ASCII glyph for the code if no other fonts are available. The glyphs are cached once loaded. */ struct grub_font_glyph *grub_font_get_glyph (grub_font_t font,grub_uint32_t code)
Signature · 1 line
2.35.1
PATCH 5/21 fs: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/fs/affs.c | 4 +- grub-core/fs/archelp.c | 4 +- grub-core/fs/bfs.c | 10 +- grub-core/fs/cpio_common.c | 2 +- grub-core/fs/fat.c | 6 +- grub-core/fs/fshelp.c | 6 +- grub-core/fs/hfs.c | 14 +- grub-core/fs/hfsplus.c | 8 +- grub-core/fs/hfspluscomp.c | 6 +- grub-core/fs/iso9660.c | 12 +- grub-core/fs/minix.c | 6 +- grub-core/fs/nilfs2.c | 8 +- grub-core/fs/ntfs.c | 8 +- grub-core/fs/reiserfs.c | 2 +- grub-core/fs/romfs.c | 8 +- grub-core/fs/squash4.c | 26 ++-- grub-core/fs/udf.c | 2 +- grub-core/fs/ufs.c | 4 +- grub-core/fs/xfs.c | 2 +- grub-core/fs/zfs/zfs.c | 224 ++++++++++++++++---------------- grub-core/fs/zfs/zfs_fletcher.c | 12 +- grub-core/fs/zfs/zfs_sha256.c | 14 +- grub-core/fs/zfs/zfscrypt.c | 14 +- 23 files changed, 201 insertions(+), 201 deletions(-)
grub-core/fs/affs.c +2 -2
@@ -345,7 +345,7 @@ grub_affs_create_node (grub_fshelp_node_t dir,if (len >sizeof (fil->name)) len =sizeof (fil->name); *grub_latin1_to_utf8 (name_u8, fil->name, len) ='\0' ; - + (*node)->di = *fil;for (nest =0 ; nest <8 ; nest++) {
@@ -417,7 +417,7 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, node = orig_node =grub_zalloc (sizeof (*node));if (!node)return 1 ; - + *node = *dir;if (hook ("." ,GRUB_FSHELP_DIR , node, hook_data))return 1 ;
grub-core/fs/archelp.c +2 -2
@@ -75,7 +75,7 @@ handle_symlink (struct grub_archelp_data *data, || !arcops->get_link_target)return GRUB_ERR_NONE ; flen =grub_strlen (fn); -if (grub_memcmp (*name, fn, flen) !=0 +if (grub_memcmp (*name, fn, flen) !=0 || ((*name)[flen] !=0 && (*name)[flen] !='/' ))return GRUB_ERR_NONE ; rest = *name + flen;
@@ -251,7 +251,7 @@ grub_archelp_open (struct grub_archelp_data *data,grub_uint32_t mode;grub_int32_t mtime;int restart; - +if (arcops->find_file (data, &fn, &mtime, &mode)) goto fail;
grub-core/fs/bfs.c +5 -5
@@ -530,13 +530,13 @@ iterate_in_b_tree (grub_disk_t disk, err =read_b_node (disk, sb, ino, node_off, &node, - &key_data, + &key_data, &keylen_idx, &key_values);if (err)return 0 ; - +for (i =0 ; i <grub_bfs_to_cpu_treehead (node->count_keys); i++) {char c;
@@ -682,7 +682,7 @@ find_in_b_tree (grub_disk_t disk, level--;grub_free (node);continue ; - } + } }else if (level !=0 && i +1 <grub_bfs_to_cpu_treehead (node->count_keys))
@@ -827,7 +827,7 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb)grub_err_t err; err =grub_disk_read (disk,SUPERBLOCK ,0 ,sizeof (*sb), sb);if (err ==GRUB_ERR_OUT_OF_RANGE ) - return grub_error (GRUB_ERR_BAD_FS, + return grub_error (GRUB_ERR_BAD_FS, #ifdef MODE_AFS "not an AFS filesystem" #else
@@ -843,7 +843,7 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb) || (grub_bfs_to_cpu32 (sb->bsize) != (1U << grub_bfs_to_cpu32 (sb->log2_bsize))) || grub_bfs_to_cpu32 (sb->log2_bsize) < GRUB_DISK_SECTOR_BITS) - return grub_error (GRUB_ERR_BAD_FS, + return grub_error (GRUB_ERR_BAD_FS,#ifdef MODE_AFS "not an AFS filesystem" #else
grub-core/fs/cpio_common.c +1 -1
@@ -117,7 +117,7 @@ grub_cpio_get_link_target (struct grub_archelp_data *data)if (!ret)return NULL ; - err =grub_disk_read (data->disk,0 , data->dofs, data->size, + err =grub_disk_read (data->disk,0 , data->dofs, data->size, ret);if (err) {
grub-core/fs/fat.c +3 -3
@@ -246,7 +246,7 @@ grub_fat_mount (grub_disk_t disk)#ifdef MODE_EXFAT if (grub_memcmp ((const char *) bpb.oem_name,"EXFAT " ,sizeof (bpb.oem_name)) !=0 ) - goto fail; + goto fail;#endif /* Get the sizes of logical sectors and clusters. */
@@ -321,7 +321,7 @@ grub_fat_mount (grub_disk_t disk)#endif #ifdef MODE_EXFAT - data->cluster_sector = (grub_le_to_cpu32 (bpb.cluster_offset) + data->cluster_sector = (grub_le_to_cpu32 (bpb.cluster_offset) << data->logical_sector_bits); data->num_clusters = (grub_le_to_cpu32 (bpb.cluster_count) << data->logical_sector_bits);
@@ -694,7 +694,7 @@ grub_fat_iterate_dir_next (grub_fshelp_node_t node, {int j;for (j =0 ; j <15 ; j++) - ctxt->unibuf[slots *15 + j] + ctxt->unibuf[slots *15 + j] =grub_le_to_cpu16 (sec.type_specific.file_name.str[j]); slots++; }
grub-core/fs/fshelp.c +3 -3
@@ -215,7 +215,7 @@ find_file (char *currpath,break ;push_node (ctx, foundnode, foundtype); - +/* Read in the symlink and follow it. */ if (ctx->currnode->type ==GRUB_FSHELP_SYMLINK ) {
@@ -326,7 +326,7 @@ grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode, enum grub_fshelp_filetype expecttype) {return grub_fshelp_find_file_real (path, rootnode, foundnode, - iterate_dir,NULL , + iterate_dir,NULL , read_symlink, expecttype); }
@@ -339,7 +339,7 @@ grub_fshelp_find_file_lookup (const char *path, grub_fshelp_node_t rootnode, enum grub_fshelp_filetype expecttype) {return grub_fshelp_find_file_real (path, rootnode, foundnode, -NULL , lookup_file, +NULL , lookup_file, read_symlink, expecttype); }
grub-core/fs/hfs.c +7 -7
@@ -883,7 +883,7 @@ grub_hfs_iterate_dir_it_dir (struct grub_hfs_node *hnd __attribute ((unused)), {struct grub_hfs_catalog_key *ckey = rec->key;struct grub_hfs_iterate_dir_node_found_ctx *ctx = hook_arg; - +/* Stop when the entries do not match anymore. */ if (ckey->parent_dir != ctx->dir_be)return 1 ;
@@ -1077,7 +1077,7 @@ macroman_to_utf8 (char *to, const grub_uint8_t *from, grub_size_t len, { *optr++ =':' ;continue ; - } + }if (!(*iptr &0x80 )) { *optr++ = *iptr;
@@ -1094,7 +1094,7 @@ utf8_to_macroman (grub_uint8_t *to, const char *from)grub_uint8_t *end = to +31 ;grub_uint8_t *optr = to;const char *iptr = from; - +while (*iptr && optr < end) {int i, clen;
@@ -1104,7 +1104,7 @@ utf8_to_macroman (grub_uint8_t *to, const char *from) *optr++ ='/' ; iptr++;continue ; - } + }if (!(*iptr &0x80 )) { *optr++ = *iptr++;
@@ -1165,7 +1165,7 @@ lookup_file (grub_fshelp_node_t dir, *foundnode =grub_malloc (sizeof (struct grub_fshelp_node ));if (!*foundnode)return grub_errno; - + (*foundnode)->inode =grub_be_to_cpu32 (fdrec.dir.dirid); (*foundnode)->fdrec = fdrec; (*foundnode)->data = dir->data;
@@ -1266,7 +1266,7 @@ grub_hfs_dir (grub_device_t device, const char *path, grub_fs_dir_hook_t hook, .hook_data = hook_data };grub_fshelp_node_t found =NULL ; - +grub_dl_ref (my_mod); data =grub_hfs_mount (device->disk);
@@ -1295,7 +1295,7 @@ grub_hfs_open (struct grub_file *file, const char *name) {struct grub_hfs_data *data;grub_fshelp_node_t found =NULL ; - +grub_dl_ref (my_mod); data =grub_hfs_mount (file->device->disk);
grub-core/fs/hfsplus.c +4 -4
@@ -19,7 +19,7 @@/* HFS+ is documented at http://developer.apple.com/technotes/tn/tn1150.html */ -#define grub_fshelp_node grub_hfsplus_file +#define grub_fshelp_node grub_hfsplus_file#include <grub/err.h> #include <grub/file.h> #include <grub/mm.h>
@@ -146,7 +146,7 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) {struct grub_hfsplus_btnode *nnode =0 ;grub_disk_addr_t blksleft = fileblock; -struct grub_hfsplus_extent *extents = node->compressed +struct grub_hfsplus_extent *extents = node->compressed ? &node->resource_extents[0 ] : &node->extents[0 ];while (1 )
@@ -477,7 +477,7 @@ grub_hfsplus_cmp_extkey (struct grub_hfsplus_key *keya,if (extkey_a->type < extkey_b->type)return -1 ; - + akey =grub_be_to_cpu32 (extkey_a->start);if (akey > extkey_b->start)return 1 ;
@@ -568,7 +568,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,struct grub_hfsplus_key_internal *key, int (*compare_keys) (struct grub_hfsplus_key *keya,struct grub_hfsplus_key_internal *keyb), - struct grub_hfsplus_btnode **matchnode, + struct grub_hfsplus_btnode **matchnode, grub_off_t *keyoffset) { grub_uint64_t currnode;
grub-core/fs/hfspluscomp.c +3 -3
@@ -179,7 +179,7 @@ hfsplus_read_compressed_real (struct grub_hfsplus_file *node,return len0; } -static grub_err_t +static grub_err_t hfsplus_open_compressed_real (struct grub_hfsplus_file *node) {grub_err_t err;
@@ -306,8 +306,8 @@ hfsplus_open_compressed_real (struct grub_hfsplus_file *node)GRUB_MOD_INIT (hfspluscomp) { - grub_hfsplus_open_compressed = hfsplus_open_compressed_real; - grub_hfsplus_read_compressed = hfsplus_read_compressed_real; + grub_hfsplus_open_compressed = hfsplus_open_compressed_real; + grub_hfsplus_read_compressed = hfsplus_read_compressed_real; }GRUB_MOD_FINI (hfspluscomp)
grub-core/fs/iso9660.c +6 -6
@@ -181,7 +181,7 @@ static grub_err_t iso9660_to_unixtime (const struct grub_iso9660_date *i, grub_int64_t *nix) { struct grub_datetime datetime; - +if (! i->year[0 ] && ! i->year[1 ] && ! i->year[2 ] && ! i->year[3 ] && ! i->month[0] && ! i->month[1]
@@ -198,7 +198,7 @@ iso9660_to_unixtime (const struct grub_iso9660_date *i, grub_int64_t *nix) datetime.hour = (i->hour[0 ] -'0' ) *10 + (i->hour[1 ] -'0' ); datetime.minute = (i->minute[0 ] -'0' ) *10 + (i->minute[1 ] -'0' ); datetime.second = (i->second[0 ] -'0' ) *10 + (i->second[1 ] -'0' ); - +if (!grub_datetime2unixtime (&datetime, nix))return grub_error (GRUB_ERR_BAD_NUMBER ,"incorrect date" ); *nix -= i->offset *60 *15 ;
@@ -216,7 +216,7 @@ iso9660_to_unixtime2 (const struct grub_iso9660_date2 *i, grub_int64_t *nix) datetime.hour = i->hour; datetime.minute = i->minute; datetime.second = i->second; - +if (!grub_datetime2unixtime (&datetime, nix))return 0 ; *nix -= i->offset *60 *15 ;
@@ -499,7 +499,7 @@ grub_iso9660_mount (grub_disk_t disk)static char *grub_iso9660_read_symlink (grub_fshelp_node_t node) { -return node->have_symlink +return node->have_symlink ?grub_strdup (node->symlink + (node->have_dirents) *sizeof (node->dirents[0 ]) -sizeof (node->dirents)) :grub_strdup ("" );
@@ -549,7 +549,7 @@ add_part (struct iterate_dir_ctx *ctx, ctx->symlink = new;grub_memcpy (ctx->symlink + size, part, len2); - ctx->symlink[size + len2] =0 ; + ctx->symlink[size + len2] =0 ; } static grub_err_t
@@ -1106,7 +1106,7 @@ grub_iso9660_uuid (grub_device_t device, char **uuid) }/* Get writing time of filesystem. */ -static grub_err_t +static grub_err_t grub_iso9660_mtime (grub_device_t device,grub_int64_t *timebuf) {struct grub_iso9660_data *data;
grub-core/fs/minix.c +3 -3
@@ -98,10 +98,10 @@ struct grub_minix_sblockgrub_uint32_t max_file_size;grub_uint32_t zones;grub_uint16_t magic; - +grub_uint16_t pad2;grub_uint16_t block_size; - grub_uint8_t disk_version; + grub_uint8_t disk_version; };#else struct grub_minix_sblock
@@ -351,7 +351,7 @@ grub_minix_read_inode (struct grub_minix_data *data, grub_minix_ino_t ino)int offs = (ino % (GRUB_DISK_SECTOR_SIZE /sizeof (struct grub_minix_inode )) *sizeof (struct grub_minix_inode )); - +grub_disk_read (data->disk, block, offs,sizeof (struct grub_minix_inode ), &data->inode);
grub-core/fs/nilfs2.c +4 -4
@@ -1,5 +1,5 @@ -/* -* nilfs2.c - New Implementation of Log filesystem +/* +* nilfs2.c - New Implementation of Log filesystem * * Written by Jiro SEKIBA <[email protected]> *
@@ -680,12 +680,12 @@ grub_nilfs2_read_checkpoint (struct grub_nilfs2_data *data,grub_disk_t disk = data->disk;unsigned int nilfs2_block_count = (1 <<LOG2_NILFS2_BLOCK_SIZE (data)); -/* Assume sizeof(struct grub_nilfs2_cpfile_header) < +/* Assume sizeof(struct grub_nilfs2_cpfile_header) < sizeof(struct grub_nilfs2_checkpoint). */ blockno =grub_divmod64 (cpno,NILFS2_BLOCK_SIZE (data) /sizeof (struct grub_nilfs2_checkpoint ), &offset); - + pptr =grub_nilfs2_bmap_lookup (data, &data->sroot.sr_cpfile, blockno,1 );if (pptr == (grub_uint64_t) -1 ) {
grub-core/fs/ntfs.c +4 -4
@@ -17,7 +17,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define grub_fshelp_node grub_ntfs_file +#define grub_fshelp_node grub_ntfs_file#include <grub/file.h> #include <grub/mm.h>
@@ -32,7 +32,7 @@ GRUB_MOD_LICENSE ("GPLv3+");static grub_dl_t my_mod; -#define grub_fshelp_node grub_ntfs_file +#define grub_fshelp_node grub_ntfs_filestatic inline grub_uint16_t u16at (void *ptr,grub_size_t ofs)
@@ -725,7 +725,7 @@ grub_ntfs_read_symlink (grub_fshelp_node_t node) && grub_isalpha (buf[4])) {grub_memmove (buf, buf +6 , end - buf +1 -6 ); - end -=6 ; + end -=6 ; }return buf; }
@@ -992,7 +992,7 @@ grub_ntfs_dir_iter (const char *filename, enum grub_fshelp_filetype filetype,grub_memset (&info,0 ,sizeof (info)); info.dir = ((filetype &GRUB_FSHELP_TYPE_MASK ) ==GRUB_FSHELP_DIR ); info.mtimeset =1 ; - info.mtime =grub_divmod64 (node->mtime,10000000 ,0 ) + info.mtime =grub_divmod64 (node->mtime,10000000 ,0 ) -86400ULL *365 * (1970 -1601 ) -86400ULL * ((1970 -1601 ) /4 ) +86400ULL * ((1970 -1601 ) /100 );grub_free (node);
grub-core/fs/reiserfs.c +1 -1
@@ -785,7 +785,7 @@ grub_reiserfs_iterate_dir (grub_fshelp_node_t item,char *entry_name;char *entry_name_end =0 ;char c; - +if (!(entry_state &GRUB_REISERFS_VISIBLE_MASK ))continue ;
grub-core/fs/romfs.c +4 -4
@@ -112,7 +112,7 @@ grub_romfs_mount (grub_device_t dev) {grub_error (GRUB_ERR_BAD_FS ,"not romfs" );return NULL ; - } + } err =do_checksum (&sb,sizeof (sb) <grub_be_to_cpu32 (sb.sb.total_size) ?sizeof (sb) :grub_be_to_cpu32 (sb.sb.total_size));if (err)
@@ -271,7 +271,7 @@ grub_romfs_iterate_dir (grub_fshelp_node_t dir,while (1 ) {char buf[16 ]; - err =grub_disk_read (dir->data->disk, + err =grub_disk_read (dir->data->disk, laddr >>GRUB_DISK_SECTOR_BITS , laddr & (GRUB_DISK_SECTOR_SIZE -1 ),16 , buf);
@@ -298,7 +298,7 @@ grub_romfs_iterate_dir (grub_fshelp_node_t dir, node->data_addr =grub_be_to_cpu32 (node->file.spec); filetype =GRUB_FSHELP_DIR ; } - +break ; } }
@@ -402,7 +402,7 @@ grub_romfs_read (grub_file_t file, char *buf, grub_size_t len) data->data->disk->read_hook_data = file->read_hook_data;grub_disk_read (data->data->disk, (data->data_addr + file->offset) >>GRUB_DISK_SECTOR_BITS , - (data->data_addr + file->offset) & (GRUB_DISK_SECTOR_SIZE -1 ), + (data->data_addr + file->offset) & (GRUB_DISK_SECTOR_SIZE -1 ), len, buf); data->data->disk->read_hook =NULL ;
grub-core/fs/squash4.c +13 -13
@@ -210,7 +210,7 @@ struct grub_fshelp_nodestruct grub_squash_data *data;struct grub_squash_inode ino;grub_size_t stsize; -struct +struct {grub_disk_addr_t ino_chunk;grub_uint16_t ino_offset;
@@ -243,7 +243,7 @@ read_chunk (struct grub_squash_data *data, void *buf, grub_size_t len, csize =SQUASH_CHUNK_SIZE - offset;if (csize > len) csize = len; - +if (grub_le_to_cpu16 (d) &SQUASH_CHUNK_UNCOMPRESSED ) {grub_disk_addr_t a = chunk_start +2 + offset;
@@ -256,7 +256,7 @@ read_chunk (struct grub_squash_data *data, void *buf, grub_size_t len,else {char *tmp; -grub_size_t bsize =grub_le_to_cpu16 (d) & ~SQUASH_CHUNK_FLAGS ; +grub_size_t bsize =grub_le_to_cpu16 (d) & ~SQUASH_CHUNK_FLAGS ;grub_disk_addr_t a = chunk_start +2 ; tmp =grub_malloc (bsize);if (!tmp)
@@ -339,7 +339,7 @@ xz_decompress (char *inbuf, grub_size_t insize, grub_off_t off,while (len) {enum xz_ret xzret; - + buf.out_pos =0 ; xzret =xz_dec_run (data->xzdec, &buf);
@@ -399,9 +399,9 @@ squash_mount (grub_disk_t disk)return NULL ; } - err =grub_disk_read (disk, + err =grub_disk_read (disk,grub_le_to_cpu64 (sb.unk1offset) - >>GRUB_DISK_SECTOR_BITS , + >>GRUB_DISK_SECTOR_BITS ,grub_le_to_cpu64 (sb.unk1offset) & (GRUB_DISK_SECTOR_SIZE -1 ),sizeof (frag), &frag);if (grub_errno ==GRUB_ERR_OUT_OF_RANGE )
@@ -448,7 +448,7 @@ squash_mount (grub_disk_t disk) } data->blksz =grub_le_to_cpu32 (data->sb.block_size); -for (data->log2_blksz =0 ; +for (data->log2_blksz =0 ; (1U << data->log2_blksz) < data->blksz; data->log2_blksz++);
@@ -643,7 +643,7 @@ make_root_node (struct grub_squash_data *data, struct grub_fshelp_node *root) root->stack[0 ].ino_chunk =grub_le_to_cpu32 (data->sb.root_ino_chunk); root->stack[0 ].ino_offset =grub_cpu_to_le16 (data->sb.root_ino_offset);return read_chunk (data, &root->ino,sizeof (root->ino), -grub_le_to_cpu64 (data->sb.inodeoffset) +grub_le_to_cpu64 (data->sb.inodeoffset) + root->stack[0 ].ino_chunk, root->stack[0 ].ino_offset); }
@@ -765,7 +765,7 @@ grub_squash_open (struct grub_file *file, const char *name) }static grub_ssize_t -direct_read (struct grub_squash_data *data, +direct_read (struct grub_squash_data *data,struct grub_squash_cache_inode *ino,grub_off_t off,char *buf,grub_size_t len) {
@@ -882,7 +882,7 @@ direct_read (struct grub_squash_data *data,grub_free (block); }else - err =grub_disk_read (data->disk, + err =grub_disk_read (data->disk, (ino->cumulated_block_sizes[i] + a + boff) >>GRUB_DISK_SECTOR_BITS , (ino->cumulated_block_sizes[i] + a + boff)
@@ -946,7 +946,7 @@ grub_squash_read (grub_file_t file, char *buf, grub_size_t len) }else off -= direct_len; - + err =read_chunk (data, &frag,sizeof (frag), data->fragments,sizeof (frag) * fragment);if (err)
@@ -957,7 +957,7 @@ grub_squash_read (grub_file_t file, char *buf, grub_size_t len) b =grub_le_to_cpu32 (ino->ino.long_file.offset) + off; else b =grub_le_to_cpu32 (ino->ino.file.offset) + off; - +/* FIXME: cache uncompressed chunks. */ if (compressed) {
@@ -1013,7 +1013,7 @@ grub_squash_mtime (grub_device_t dev, grub_int64_t *tm) *tm =grub_le_to_cpu32 (data->sb.creation_time);squash_unmount (data);return GRUB_ERR_NONE ; -} +}static struct grub_fs grub_squash_fs = {
grub-core/fs/udf.c +1 -1
@@ -567,7 +567,7 @@ grub_udf_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) (buf +sizeof (struct grub_udf_aed ));continue ; } - +if (filebytes < adlen) {grub_uint32_t ad_block_num = ad->block.block_num;
grub-core/fs/ufs.c +2 -2
@@ -568,7 +568,7 @@ grub_ufs_find_file (struct grub_ufs_data *data, const char *path) { dirino = data->ino;grub_ufs_read_inode (data,grub_ufs_to_cpu32 (dirent.ino),0 ); - +if ((INODE_MODE (data) &GRUB_UFS_ATTR_TYPE ) ==GRUB_UFS_ATTR_LNK ) {
@@ -613,7 +613,7 @@ grub_ufs_mount (grub_disk_t disk) && ((data->sblock.bsize & (data->sblock.bsize - 1)) == 0) && data->sblock.ino_per_group != 0) { -for (data->log2_blksz =0 ; +for (data->log2_blksz =0 ; (1U << data->log2_blksz) <grub_ufs_to_cpu32 (data->sblock.bsize); data->log2_blksz++);
grub-core/fs/xfs.c +1 -1
@@ -894,7 +894,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,tag, which is not used by GRUB. So it can be overwritten. */ filename[direntry->len] ='\0' ; -if (iterate_dir_call_hook (grub_be_to_cpu64 (direntry->inode), +if (iterate_dir_call_hook (grub_be_to_cpu64 (direntry->inode), filename, &ctx)) {grub_free (dirblock);
grub-core/fs/zfs/zfs.c +112 -112
760 lines not on this page · raw message
grub-core/fs/zfs/zfs_fletcher.c +6 -6
@@ -39,14 +39,14 @@#include <grub/zfs/dsl_dataset.h> void -fletcher_2 (const void *buf,grub_uint64_t size,grub_zfs_endian_t endian, +fletcher_2 (const void *buf,grub_uint64_t size,grub_zfs_endian_t endian,zio_cksum_t *zcp) {const grub_uint64_t *ip = buf;const grub_uint64_t *ipend = ip + (size /sizeof (grub_uint64_t));grub_uint64_t a0, b0, a1, b1; - -for (a0 = b0 = a1 = b1 =0 ; ip < ipend; ip +=2 ) + +for (a0 = b0 = a1 = b1 =0 ; ip < ipend; ip +=2 ) { a0 +=grub_zfs_to_cpu64 (ip[0 ], endian); a1 +=grub_zfs_to_cpu64 (ip[1 ], endian);
@@ -61,14 +61,14 @@ fletcher_2(const void *buf, grub_uint64_t size, grub_zfs_endian_t endian, }void -fletcher_4 (const void *buf,grub_uint64_t size,grub_zfs_endian_t endian, +fletcher_4 (const void *buf,grub_uint64_t size,grub_zfs_endian_t endian,zio_cksum_t *zcp) {const grub_uint32_t *ip = buf;const grub_uint32_t *ipend = ip + (size /sizeof (grub_uint32_t));grub_uint64_t a, b, c, d; - -for (a = b = c = d =0 ; ip < ipend; ip++) + +for (a = b = c = d =0 ; ip < ipend; ip++) { a +=grub_zfs_to_cpu32 (ip[0 ], endian);; b += a;
grub-core/fs/zfs/zfs_sha256.c +7 -7
@@ -116,23 +116,23 @@ zio_checksum_SHA256(const void *buf, grub_uint64_t size,grub_uint8_t pad[128 ];unsigned padsize = size &63 ;unsigned i; - +for (i =0 ; i < size - padsize; i +=64 )SHA256Transform (H , (grub_uint8_t *)buf + i); - +for (i =0 ; i < padsize; i++) pad[i] = ((grub_uint8_t *)buf)[i]; - +for (pad[padsize++] =0x80 ; (padsize &63 ) !=56 ; padsize++) pad[padsize] =0 ; - +for (i =0 ; i <8 ; i++) pad[padsize++] = (size <<3 ) >> (56 -8 * i); - +for (i =0 ; i < padsize && i <=64 ; i +=64 )SHA256Transform (H , pad + i); - - zcp->zc_word[0 ] =grub_cpu_to_zfs64 ((grub_uint64_t )H [0 ] <<32 |H [1 ], + + zcp->zc_word[0 ] =grub_cpu_to_zfs64 ((grub_uint64_t )H [0 ] <<32 |H [1 ], endian); zcp->zc_word[1 ] =grub_cpu_to_zfs64 ((grub_uint64_t )H [2 ] <<32 |H [3 ], endian);
grub-core/fs/zfs/zfscrypt.c +7 -7
@@ -46,7 +46,7 @@GRUB_MOD_LICENSE ("GPLv3+" );/* -Mostly based on following article: +Mostly based on following article: https://blogs.oracle.com/darren/entry/zfs_encryption_what_is_on */
@@ -179,7 +179,7 @@ grub_gcm_mul (grub_uint8_t *a, const grub_uint8_t *b)grub_crypto_xor (res, res, bs,16 );grub_gcm_mul_x (bs); } - +grub_memcpy (a, res,16 ); }
@@ -275,7 +275,7 @@ algo_decrypt (grub_crypto_cipher_handle_t cipher, grub_uint64_t algo, } static grub_err_t -grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher, +grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher, grub_uint64_t algo, void *nonce, char *buf, grub_size_t size,
@@ -286,7 +286,7 @@ grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher,unsigned i;grub_uint32_t sw[4 ];gcry_err_code_t err; - +grub_memcpy (sw, nonce,16 );if (endian !=GRUB_ZFS_BIG_ENDIAN )for (i =0 ; i <4 ; i++)
@@ -302,7 +302,7 @@ grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher, sw + 1, 3, 12);if (err)return grub_crypto_gcry_error (err); - +for (i =0 ; i <3 ; i++)if (grub_zfs_to_cpu32 (expected_mac[i], endian) !=grub_be_to_cpu32 (mac[i]))
@@ -362,7 +362,7 @@ grub_zfs_load_key_real (const struct grub_zfs_key *key,grub_crypto_cipher_close (cipher);continue ; } - + err =grub_crypto_cipher_set_key (cipher, wrap_key_real, keylen);if (err)
@@ -371,7 +371,7 @@ grub_zfs_load_key_real (const struct grub_zfs_key *key,grub_crypto_cipher_close (cipher);continue ; } - + err =algo_decrypt (cipher, algo, decrypted, key->unknown_purpose_key,32 , mac, key->unknown_purpose_nonce,2 ,16 ); if (err || (grub_crypto_memcmp (mac, key->unknown_purpose_key + 32, 16)
Signature · 1 line
2.35.1
PATCH 6/21 gfxmenu: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/gettext/gettext.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
grub-core/gettext/gettext.c +5 -5
@@ -51,7 +51,7 @@ struct headergrub_uint32_t offset_translation; }; -struct string_descriptor +struct string_descriptor {grub_uint32_t length;grub_uint32_t offset;
@@ -206,7 +206,7 @@ grub_gettext_translate_real (struct grub_gettext_context *ctx, }grub_error_pop (); depth--; -return ret; +return ret; } }
@@ -235,7 +235,7 @@ grub_gettext_translate_real (struct grub_gettext_context *ctx, }grub_error_pop (); depth--; -return ret; +return ret; } }
@@ -452,7 +452,7 @@ void grub_gettext_reread_prefix (const char *val) {grub_err_t err; - err =grub_gettext_init_ext (&main_context,grub_env_get ("lang" ), + err =grub_gettext_init_ext (&main_context,grub_env_get ("lang" ),grub_env_get ("locale_dir" ), val);if (err)
@@ -519,7 +519,7 @@ GRUB_MOD_INIT (gettext)grub_register_command_p1 ("gettext" , grub_cmd_translate,N_ ("STRING" ),/* TRANSLATORS: It refers to passing the string through gettext. -So it's "translate" in the same meaning as in what you're +So it's "translate" in the same meaning as in what you're doing now. */ N_ ("Translates the string with the current settings." ));
Signature · 1 line
2.35.1
PATCH 7/21 gfxmenu: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/gfxmenu/gfxmenu.c | 2 +- grub-core/gfxmenu/gui_circular_progress.c | 2 +- grub-core/gfxmenu/gui_label.c | 2 +- grub-core/gfxmenu/gui_list.c | 4 ++-- grub-core/gfxmenu/gui_progress_bar.c | 4 ++-- grub-core/gfxmenu/theme_loader.c | 2 +- grub-core/gfxmenu/view.c | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-)
grub-core/gfxmenu/gfxmenu.c +1 -1
@@ -42,7 +42,7 @@ GRUB_MOD_LICENSE ("GPLv3+");static grub_gfxmenu_view_t cached_view; -static void +static void grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused))) { }
grub-core/gfxmenu/gui_circular_progress.c +1 -1
@@ -220,7 +220,7 @@ static void circprog_set_state (void *vself, int visible, int start, int current, int end) { -circular_progress_t self = vself; +circular_progress_t self = vself; self->visible = visible; self->start = start; self->value = current;
grub-core/gfxmenu/gui_label.c +1 -1
@@ -160,7 +160,7 @@ static void label_set_state (void *vself, int visible, int start __attribute__ ((unused)), int current, int end __attribute__ ((unused))) { -grub_gui_label_t self = vself; +grub_gui_label_t self = vself; self->value = -current; self->visible = visible;grub_free (self->text);
grub-core/gfxmenu/gui_list.c +2 -2
@@ -118,7 +118,7 @@ get_num_shown_items (list_impl_t self)int boxpad = self->item_padding;int item_vspace = self->item_spacing;int item_height = self->item_height; - +grub_gfxmenu_box_t box = self->menu_box;int box_top_pad = box->get_top_pad (box);int box_bottom_pad = box->get_bottom_pad (box);
@@ -353,7 +353,7 @@ draw_menu (list_impl_t self, int num_shown_items)grub_video_get_viewport (&oviewport.x, &oviewport.y, &oviewport.width, &oviewport.height); -grub_video_set_viewport (oviewport.x + boxpad, +grub_video_set_viewport (oviewport.x + boxpad, oviewport.y + boxpad, oviewport.width -2 * boxpad, oviewport.height -2 * boxpad);
grub-core/gfxmenu/gui_progress_bar.c +2 -2
@@ -320,7 +320,7 @@ static void progress_bar_set_state (void *vself, int visible, int start, int current, int end) { -grub_gui_progress_bar_t self = vself; +grub_gui_progress_bar_t self = vself; self->visible = visible; self->start = start; self->value = current;
@@ -335,7 +335,7 @@ progress_bar_set_property (void *vself, const char *name, const char *value) {grub_free (self->template);if (grub_strcmp (value,"@TIMEOUT_NOTIFICATION_LONG@" ) ==0 ) - value + value =_ ("The highlighted entry will be executed automatically in %ds." );else if (grub_strcmp (value,"@TIMEOUT_NOTIFICATION_MIDDLE@" ) ==0 )/* TRANSLATORS: 's' stands for seconds.
grub-core/gfxmenu/theme_loader.c +1 -1
@@ -419,7 +419,7 @@ read_expression (struct parsebuf *p)skip_whitespace (p);if (peek_char (p) =='"' ) { -/* Read as a quoted string. +/* Read as a quoted string. The quotation marks are not included in the expression value. */ /* Skip opening quotation mark. */ read_char (p);
grub-core/gfxmenu/view.c +4 -4
@@ -218,7 +218,7 @@ redraw_timeouts (struct grub_gfxmenu_view *view) } } -void +void grub_gfxmenu_print_timeout (int timeout,void *data) {struct grub_gfxmenu_view *view = data;
@@ -233,7 +233,7 @@ grub_gfxmenu_print_timeout (int timeout, void *data)redraw_timeouts (view); } -void +void grub_gfxmenu_clear_timeout (void *data) {struct grub_gfxmenu_view *view = data;
@@ -401,7 +401,7 @@ grub_gfxmenu_redraw_menu (grub_gfxmenu_view_t view) } } -void +void grub_gfxmenu_set_chosen_entry (int entry,void *data) {grub_gfxmenu_view_t view = data;
@@ -423,7 +423,7 @@ grub_gfxmenu_draw_terminal_box (void) term_box->set_content_size (term_box, term_view->terminal_rect.width, term_view->terminal_rect.height); - + term_box->draw (term_box, term_view->terminal_rect.x - term_box->get_left_pad (term_box), term_view->terminal_rect.y - term_box->get_top_pad (term_box));
Signature · 1 line
2.35.1
PATCH 8/21 io: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/io/gzio.c | 2 +- grub-core/io/xzio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
grub-core/io/gzio.c +1 -1
@@ -1252,7 +1252,7 @@ static int test_zlib_header (grub_gzio_t gzio) {grub_uint8_t cmf, flg; - + cmf =get_byte (gzio); flg =get_byte (gzio);
grub-core/io/xzio.c +1 -1
@@ -283,7 +283,7 @@ grub_xzio_read (grub_file_t file, char *buf, grub_size_t len) {grub_off_t new_offset = current_offset + xzio->buf.out_pos; - +if (file->offset <= new_offset)/* Store first chunk of data in buffer. */ {
Signature · 1 line
2.35.1
PATCH 9/21 kern: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/kern/acpi.c | 2 +- grub-core/kern/arm/efi/init.c | 2 +- grub-core/kern/arm64/dl.c | 2 +- grub-core/kern/arm64/dl_helper.c | 4 ++-- grub-core/kern/command.c | 2 +- grub-core/kern/coreboot/cbtable.c | 2 +- grub-core/kern/device.c | 2 +- grub-core/kern/disk.c | 6 +++--- grub-core/kern/dl.c | 2 +- grub-core/kern/efi/efi.c | 2 +- grub-core/kern/efi/init.c | 2 +- grub-core/kern/efi/mm.c | 2 +- grub-core/kern/emu/hostdisk.c | 2 +- grub-core/kern/emu/hostfs.c | 2 +- grub-core/kern/emu/main.c | 2 +- grub-core/kern/emu/misc.c | 8 ++++---- grub-core/kern/env.c | 4 ++-- grub-core/kern/file.c | 4 ++-- grub-core/kern/i386/coreboot/init.c | 2 +- grub-core/kern/i386/pc/mmap.c | 8 ++++---- grub-core/kern/i386/qemu/init.c | 4 ++-- grub-core/kern/ia64/dl_helper.c | 6 +++--- grub-core/kern/ieee1275/ieee1275.c | 2 +- grub-core/kern/ieee1275/init.c | 6 +++--- grub-core/kern/ieee1275/openfw.c | 2 +- grub-core/kern/main.c | 4 ++-- grub-core/kern/mips/dl.c | 8 ++++---- grub-core/kern/mips/loongson/init.c | 6 +++--- grub-core/kern/mips/qemu_mips/init.c | 4 ++-- grub-core/kern/misc.c | 4 ++-- grub-core/kern/mm.c | 4 ++-- grub-core/kern/partition.c | 2 +- grub-core/kern/powerpc/dl.c | 8 ++++---- 33 files changed, 61 insertions(+), 61 deletions(-)
grub-core/kern/acpi.c +1 -1
@@ -1,4 +1,4 @@ -/* +/* * GRUB -- GRand Unified Bootloader * Copyright (C) 2012 Free Software Foundation, Inc. *
grub-core/kern/arm/efi/init.c +1 -1
@@ -34,7 +34,7 @@ grub_efi_get_time_ms (void)return tmr; } -static void +static void increment_timer (grub_efi_event_t event __attribute__ ((unused)),void *context __attribute__ ((unused))) {
grub-core/kern/arm64/dl.c +1 -1
@@ -49,7 +49,7 @@ grub_arch_dl_check_header (void *ehdr)#pragma GCC diagnostic ignored "-Wcast-align"/* -* Unified function for both REL and RELA +* Unified function for both REL and RELA */ grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
grub-core/kern/arm64/dl_helper.c +2 -2
@@ -69,9 +69,9 @@ grub_arm64_set_hi21 (grub_uint32_t *place, grub_int64_t offset)grub_uint32_t val; offset >>=12 ; - + val = ((offset &3 ) <<29 ) | (((offset >>2 ) &0x7ffff ) <<5 ); - + *place &= insmask; *place |=grub_cpu_to_le32 (val) & ~insmask; }
grub-core/kern/command.c +1 -1
@@ -46,7 +46,7 @@ grub_register_command_prio (const char *name, cmd->flags =0 ; cmd->prio = prio; - +for (p = &grub_command_list, q = *p; q; p = &(q->next), q = q->next) {int r;
grub-core/kern/coreboot/cbtable.c +1 -1
@@ -62,7 +62,7 @@ signature_found: { table_header = (grub_linuxbios_table_header_t) (grub_addr_t) *(grub_uint64_t *) (table_item +1 ); - goto signature_found; + goto signature_found; }if (hook (table_item, hook_data))return 1 ;
grub-core/kern/device.c +1 -1
@@ -56,7 +56,7 @@ grub_device_open (const char *name)if (grub_net_open && grub_errno ==GRUB_ERR_UNKNOWN_DEVICE ) { grub_errno =GRUB_ERR_NONE ; - dev->net =grub_net_open (name); + dev->net =grub_net_open (name); }if (dev->net)
grub-core/kern/disk.c +3 -3
@@ -376,7 +376,7 @@ grub_disk_read_small_real (grub_disk_t disk, grub_disk_addr_t sector, tmp_buf =grub_malloc (num << disk->log_sector_size);if (!tmp_buf)return grub_errno; - +if ((disk->dev->disk_read) (disk,transform_sector (disk, aligned_sector), num, tmp_buf)) {
@@ -490,7 +490,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, buf);if (err)return err; - +for (i =0 ; i < agglomerate; i ++) grub_disk_cache_store (disk->dev->id, disk->id, sector + (i << GRUB_DISK_CACHE_BITS),
@@ -505,7 +505,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector, sector += agglomerate <<GRUB_DISK_CACHE_BITS ; size -= agglomerate << (GRUB_DISK_CACHE_BITS +GRUB_DISK_SECTOR_BITS ); - buf = (char *) buf + buf = (char *) buf + (agglomerate << (GRUB_DISK_CACHE_BITS +GRUB_DISK_SECTOR_BITS )); }
grub-core/kern/dl.c +1 -1
@@ -483,7 +483,7 @@ grub_dl_resolve_name (grub_dl_t mod, Elf_Ehdr *e) s =grub_dl_find_section (e,".modname" );if (!s)return grub_error (GRUB_ERR_BAD_MODULE ,"no module name found" ); - + mod->name =grub_strdup ((char *) e + s->sh_offset);if (! mod->name)return grub_errno;
grub-core/kern/efi/efi.c +1 -1
@@ -219,7 +219,7 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, r = grub_efi_system_table->runtime_services; - status = efi_call_5 (r->set_variable, var16, guid, + status = efi_call_5 (r->set_variable, var16, guid, (GRUB_EFI_VARIABLE_NON_VOLATILE | GRUB_EFI_VARIABLE_BOOTSERVICE_ACCESS | GRUB_EFI_VARIABLE_RUNTIME_ACCESS),
grub-core/kern/efi/init.c +1 -1
@@ -111,7 +111,7 @@ grub_efi_init (void)grub_efidisk_init (); } -void (*grub_efi_net_config) (grub_efi_handle_t hnd, +void (*grub_efi_net_config) (grub_efi_handle_t hnd,char **device,char **path);
grub-core/kern/efi/mm.c +1 -1
@@ -522,7 +522,7 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map, addr =grub_efi_allocate_pages_real (start, pages,GRUB_EFI_ALLOCATE_ADDRESS , -GRUB_EFI_LOADER_CODE ); +GRUB_EFI_LOADER_CODE );if (! addr) grub_fatal ("cannot allocate conventional memory %p with %u pages", (void *) ((grub_addr_t) start),
grub-core/kern/emu/hostdisk.c +1 -1
@@ -538,7 +538,7 @@ read_device_map (const char *dev_map) map[drive].device =grub_canonicalize_file_name (p);if (! map[drive].device) map[drive].device =xstrdup (p); - +if (!map[drive].drive) {char c;
grub-core/kern/emu/hostfs.c +1 -1
@@ -122,7 +122,7 @@ grub_hostfs_open (struct grub_file *file, const char *name)return grub_errno; } - data->f = f; + data->f = f; file->data = data;
grub-core/kern/emu/main.c +1 -1
@@ -194,7 +194,7 @@ int main (int argc, char *argv[]) { struct arguments arguments = - { + { .dev_map = DEFAULT_DEVICE_MAP, .hold = 0, .mem_disk = 0,
grub-core/kern/emu/misc.c +4 -4
@@ -135,16 +135,16 @@ xstrdup (const char *str)#if !defined (GRUB_MKFONT ) && !defined (GRUB_BUILD )char *xasprintf (const char *fmt, ...) -{ +{va_list ap;char *result; - +va_start (ap, fmt); result =grub_xvasprintf (fmt, ap);va_end (ap);if (!result)grub_util_error ("%s" ,_ ("out of memory" )); - +return result; }#endif
@@ -180,7 +180,7 @@ grub_util_get_image_size (const char *path)grub_util_error (_ ("cannot open `%s': %s" ), path,strerror (errno));fseeko (f,0 ,SEEK_END ); - + sz =ftello (f);if (sz <0 )grub_util_error (_ ("cannot open `%s': %s" ), path,strerror (errno));
grub-core/kern/env.c +2 -2
@@ -226,12 +226,12 @@ grub_env_export (const char *name)if (! var) {grub_err_t err; - + err =grub_env_set (name,"" );if (err)return err; var =grub_env_find (name); - } + } var->global =1 ;return GRUB_ERR_NONE ;
grub-core/kern/file.c +2 -2
@@ -210,9 +210,9 @@ grub_file_seek (grub_file_t file, grub_off_t offset) N_("attempt to seek outside of the file"));return -1 ; } - + old = file->offset; file->offset = offset; - +return old; }
grub-core/kern/i386/coreboot/init.c +1 -1
@@ -77,7 +77,7 @@ heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,if (modend && begin < modend) begin = modend; - +if (end <= begin)return 0 ;
grub-core/kern/i386/pc/mmap.c +4 -4
@@ -73,9 +73,9 @@ grub_get_ext_memsize (void)in 1KB parts, and upper 16 bits are above 16MB in 64KB parts. If error, return zero. BIOS call "INT 15H, AH=E801H" to get EISA memory map, AX = memory between 1M and 16M in 1K parts. -BX = memory above 16M in 64K parts. +BX = memory above 16M in 64K parts. */ - +static inline grub_uint32_t grub_get_eisa_mmap (void ) {
@@ -114,7 +114,7 @@ grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,/* place address (+4) in ES:DI */ regs.es = ((grub_addr_t) &entry->addr) >>4 ; regs.edi = ((grub_addr_t) &entry->addr) &0xf ; - +/* set continuation value */ regs.ebx = cont;
@@ -127,7 +127,7 @@ grub_get_mmap_entry (struct grub_machine_mmap_entry *entry, regs.eax =0xe820 ;grub_bios_interrupt (0x15 , ®s); -/* write length of buffer (zero if error) into ADDR */ +/* write length of buffer (zero if error) into ADDR */ if ((regs.flags &GRUB_CPU_INT_FLAGS_CARRY ) || regs.eax !=0x534d4150 || regs.ecx <0x14 || regs.ecx >0x400 ) entry->size =0 ;
grub-core/kern/i386/qemu/init.c +2 -2
@@ -174,7 +174,7 @@ enable_cards (grub_pci_device_t dev,if (class ==GRUB_PCI_CLASS_SUBCLASS_USB )return 0 ; - + addr =grub_pci_make_address (dev,GRUB_PCI_REG_COMMAND );grub_pci_write (addr, cmd);
@@ -237,7 +237,7 @@ grub_pci_assign_addresses (void) + 4 * resources[i].bar + 4);grub_pci_write (addr,0 ); } - } + } }grub_pci_iterate (enable_cards,NULL ); }
grub-core/kern/ia64/dl_helper.c +3 -3
@@ -73,7 +73,7 @@ grub_ia64_add_value_to_slot_20b (grub_addr_t addr, grub_uint32_t value)case 0 : val =grub_le_to_cpu32 (grub_get_unaligned32 (((grub_uint8_t *) (addr &MASK3 ) +2 ))); - val = (((((val &MASK20 ) + value) &MASK20 ) <<2 ) + val = (((((val &MASK20 ) + value) &MASK20 ) <<2 ) | (val & ~(MASK20 <<2 )));grub_set_unaligned32 (((grub_uint8_t *) (addr &MASK3 ) +2 ),grub_cpu_to_le32 (val));
@@ -161,9 +161,9 @@ static grub_uint8_t jump[0x20] =/* [MIB] ld8 r1=[r15] */ 0x11 ,0x08 ,0x00 ,0x1e ,0x18 ,0x10 ,/* mov b6=r16 */ -0x60 ,0x80 ,0x04 ,0x80 ,0x03 ,0x00 , +0x60 ,0x80 ,0x04 ,0x80 ,0x03 ,0x00 ,/* br.few b6;; */ -0x60 ,0x00 ,0x80 ,0x00 +0x60 ,0x00 ,0x80 ,0x00 };#else static const grub_uint8_t jump[0x20] =
grub-core/kern/ieee1275/ieee1275.c +1 -1
@@ -306,7 +306,7 @@ grub_ieee1275_seek (grub_ieee1275_ihandle_t ihandle, grub_disk_addr_t pos, args.pos_lo = pos;#else args.pos_hi = (grub_ieee1275_cell_t) (pos >> (8 *GRUB_IEEE1275_CELL_SIZEOF )); - args.pos_lo = (grub_ieee1275_cell_t) + args.pos_lo = (grub_ieee1275_cell_t) (pos & ((1ULL << (8 *GRUB_IEEE1275_CELL_SIZEOF )) -1 ));#endif
grub-core/kern/ieee1275/init.c +3 -3
@@ -138,7 +138,7 @@ grub_machine_get_bootlocation (char **device, char **path)/* Claim some available memory in the first /memory node. */ #ifdef __sparc__ -static void +static void grub_claim_heap (void ) { grub_mm_init_region ((void *) (grub_modules_get_end ()
@@ -200,7 +200,7 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,return 0 ; } -static void +static void grub_claim_heap (void ) {unsigned long total =0 ;
@@ -254,7 +254,7 @@ grub_addr_t grub_modbase;void grub_machine_init (void ) { - grub_modbase =ALIGN_UP ((grub_addr_t ) _end + grub_modbase =ALIGN_UP ((grub_addr_t ) _end +GRUB_KERNEL_MACHINE_MOD_GAP ,GRUB_KERNEL_MACHINE_MOD_ALIGN );grub_ieee1275_init ();
grub-core/kern/ieee1275/openfw.c +1 -1
@@ -404,7 +404,7 @@ grub_ieee1275_parse_args (const char *path, enum grub_ieee1275_parse_type ptype)if (comma) {char *filepath = comma +1 ; - +/* Make sure filepath has leading backslash. */ if (filepath[0 ] !='\\' ) ret =grub_xasprintf ("\\%s" , filepath);
grub-core/kern/main.c +2 -2
@@ -208,7 +208,7 @@ grub_set_prefix_and_root (void)if (device) {char *prefix_set; - + prefix_set =grub_xasprintf ("(%s)%s" , device, path ? :"" );if (prefix_set) {
@@ -286,7 +286,7 @@ grub_main (void)grub_register_exported_symbols ();#ifdef GRUB_LINKER_HAVE_INIT grub_arch_dl_init_linker (); -#endif +#endif grub_load_modules ();grub_boot_time ("After loading embedded modules." );
grub-core/kern/mips/dl.c +4 -4
@@ -164,7 +164,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,#endif /* Handle partner lo16 relocation. Lower part is -treated as signed. Hence add 0x8000 to compensate. +treated as signed. Hence add 0x8000 to compensate. */ value = (*(grub_uint16_t *) addr <<16 ) + sym_value +0x8000 ;
@@ -206,8 +206,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, value = raw <<2 ; value += sym_value; raw = (value >>2 ) &0x3ffffff ; - - *(grub_uint32_t *) addr = + + *(grub_uint32_t *) addr = raw | ((*(grub_uint32_t *) addr) &0xfc000000 ); }break ;
@@ -265,7 +265,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,return GRUB_ERR_NONE ; } -void +void grub_arch_dl_init_linker (void ) {grub_dl_register_symbol ("__gnu_local_gp" , &__gnu_local_gp_dummy,0 ,0 );
grub-core/kern/mips/loongson/init.c +3 -3
@@ -107,10 +107,10 @@ init_pci (void) *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER +GRUB_PCI_REG_CACHELINE )) =0xff ; - *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER + *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER +GRUB_PCI_REG_ADDRESS_REG0 )) =0x80000000 |GRUB_PCI_ADDR_MEM_TYPE_64 |GRUB_PCI_ADDR_MEM_PREFETCH ; - *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER + *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER +GRUB_PCI_REG_ADDRESS_REG1 )) =0 ;grub_pci_iterate (set_card,NULL );
@@ -183,7 +183,7 @@ grub_machine_init (void)else totalmem = ((spd.ddr2.num_of_ranks &GRUB_SMBUS_SPD_MEMORY_NUM_OF_RANKS_MASK ) +1 ) << (i +2 ); - +if (totalmem >=256 ) { grub_arch_memsize =256 ;
grub-core/kern/mips/qemu_mips/init.c +2 -2
@@ -41,7 +41,7 @@ grub_machine_init (void)if (grub_arch_memsize ==0 ) {int i; - +for (i =27 ; i >=0 ; i--)if (probe_mem (grub_arch_memsize | (1 << i))) grub_arch_memsize |= (1 << i);
@@ -87,7 +87,7 @@ grub_halt (void)while (1 ); } -grub_err_t +grub_err_t grub_machine_mmap_iterate (grub_memory_hook_t hook,void *hook_data) {hook (0 , grub_arch_memsize,GRUB_MEMORY_AVAILABLE , hook_data);
grub-core/kern/misc.c +2 -2
@@ -1233,7 +1233,7 @@ static void __attribute__ ((noreturn))grub_abort (void) {grub_printf ("\nAborted." ); - +#ifndef GRUB_UTIL if (grub_term_inputs)#endif
@@ -1288,7 +1288,7 @@ grub_real_boot_time (const char *file, n->next =0 ;va_start (args, fmt); - n->msg =grub_xvasprintf (fmt, args); + n->msg =grub_xvasprintf (fmt, args);va_end (args); *boot_time_last = n;
grub-core/kern/mm.c +2 -2
@@ -283,7 +283,7 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)else if (extra ==0 ) {grub_mm_header_t r; - + r = cur + extra + n; r->magic =GRUB_MM_FREE_MAGIC ; r->size = cur->size - extra - n;
@@ -707,7 +707,7 @@ grub_debug_memalign (const char *file, int line, grub_size_t align,void *ptr;if (grub_mm_debug) -grub_printf ("%s:%d: memalign (0x%" PRIxGRUB_SIZE", 0x%" PRIxGRUB_SIZE +grub_printf ("%s:%d: memalign (0x%" PRIxGRUB_SIZE", 0x%" PRIxGRUB_SIZE") = " , file, line, align, size); ptr =grub_memalign (align, size);if (grub_mm_debug)
grub-core/kern/partition.c +1 -1
@@ -128,7 +128,7 @@ grub_partition_probe (struct grub_disk *disk, const char *str) partname = ptr;while (*ptr &&grub_isalpha (*ptr)) ptr++; - partname_end = ptr; + partname_end = ptr; num =grub_strtoul (ptr, &ptr,0 ) -1 ; curpart =0 ;
grub-core/kern/powerpc/dl.c +4 -4
@@ -47,7 +47,7 @@ struct trampolinegrub_uint32_t bctr; }; -static const struct trampoline trampoline_template = +static const struct trampoline trampoline_template = {0x3d800000 ,0x618c0000 ,
@@ -74,7 +74,7 @@ grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,if (s->sh_type ==SHT_RELA ) {const Elf_Rela *rel, *max; - + for (rel = (const Elf_Rela *) ((const char *) e + s->sh_offset), max = rel + s->sh_size / s->sh_entsize; rel < max;
@@ -82,7 +82,7 @@ grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,if (ELF_R_TYPE (rel->r_info) ==GRUB_ELF_R_PPC_REL24 ||ELF_R_TYPE (rel->r_info) ==GRUB_ELF_R_PPC_PLTREL24 ) (*tramp)++; - + } *tramp *=sizeof (struct trampoline );
@@ -138,7 +138,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, tptr->ori |= ((value) &0xffff ); mod->trampptr = tptr +1 ; } - +if (delta <<6 >>6 != delta)return grub_error (GRUB_ERR_BAD_MODULE ,"relocation overflow" );
Signature · 1 line
2.35.1
PATCH 10/21 lib: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/lib/arg.c | 2 +- grub-core/lib/crypto.c | 14 ++--- grub-core/lib/efi/relocator.c | 8 +-- grub-core/lib/fdt.c | 4 +- grub-core/lib/i386/reboot.c | 2 +- grub-core/lib/i386/relocator.c | 2 +- grub-core/lib/ieee1275/cmos.c | 4 +- grub-core/lib/ieee1275/relocator.c | 4 +- grub-core/lib/legacy_parse.c | 26 +++++----- .../lib/libgcrypt/cipher/test-getrusage.c | 14 ++--- .../lib/libgcrypt/mpi/generic/mpih-add1.c | 6 +-- .../lib/libgcrypt/mpi/generic/mpih-lshift.c | 2 +- .../lib/libgcrypt/mpi/generic/mpih-mul1.c | 4 +- .../lib/libgcrypt/mpi/generic/mpih-mul2.c | 6 +-- .../lib/libgcrypt/mpi/generic/mpih-mul3.c | 4 +- .../lib/libgcrypt/mpi/generic/mpih-sub1.c | 4 +- grub-core/lib/libgcrypt/mpi/i386/syntax.h | 2 +- grub-core/lib/libgcrypt/mpi/m68k/syntax.h | 2 +- grub-core/lib/mips/loongson/reboot.c | 2 +- grub-core/lib/mips/relocator.c | 2 +- grub-core/lib/posix_wrap/ctype.h | 14 ++--- grub-core/lib/posix_wrap/stdlib.h | 2 +- grub-core/lib/posix_wrap/string.h | 4 +- grub-core/lib/posix_wrap/wctype.h | 2 +- grub-core/lib/powerpc/relocator.c | 4 +- grub-core/lib/priority_queue.c | 2 +- grub-core/lib/reed_solomon.c | 6 +-- grub-core/lib/relocator.c | 48 ++++++++--------- grub-core/lib/syslinux_parse.c | 52 +++++++++---------- grub-core/lib/xzembed/xz_dec_stream.c | 6 +-- 30 files changed, 127 insertions(+), 127 deletions(-)
grub-core/lib/arg.c +1 -1
@@ -270,7 +270,7 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,for (curshort = arg +1 ; *curshort; curshort++)if (!find_short (cmd->options, *curshort))break ; - +if (*curshort) {if (add_arg (&argl, &num, arg) !=0 )
grub-core/lib/crypto.c +7 -7
@@ -59,7 +59,7 @@ _gcry_burn_stack (int size)void __attribute__ ((noreturn))_gcry_assert_failed (const char *expr,const char *file,int line,const char *func) - + {grub_fatal ("assertion %s at %s:%d (%s) failed\n" , expr, file, line, func); }
@@ -83,7 +83,7 @@ void _gcry_log_error (const char *fmt, ...) } } -void +void grub_cipher_register (gcry_cipher_spec_t *cipher) { cipher->next = grub_ciphers;
@@ -102,14 +102,14 @@ grub_cipher_unregister (gcry_cipher_spec_t *cipher) } } -void +void grub_md_register (gcry_md_spec_t *digest) { digest->next = grub_digests; grub_digests = digest; } -void +void grub_md_unregister (gcry_md_spec_t *cipher) {gcry_md_spec_t **ciph;
@@ -314,7 +314,7 @@ grub_crypto_hmac_init (const struct gcry_md_spec *md,if (!ctx) goto err; -if ( keylen > md->blocksize ) +if ( keylen > md->blocksize ) { helpkey =grub_malloc (md->mdlen);if (!helpkey)
@@ -335,7 +335,7 @@ grub_crypto_hmac_init (const struct gcry_md_spec *md,grub_memcpy ( ipad, key, keylen );grub_memcpy ( opad, key, keylen ); -for (i=0 ; i < md->blocksize; i++ ) +for (i=0 ; i < md->blocksize; i++ ) { ipad[i] ^=0x36 ; opad[i] ^=0x5c ;
@@ -458,7 +458,7 @@ grub_password_get (char buf[], unsigned buf_size)while (1 ) { - key =grub_getkey (); + key =grub_getkey ();if (key =='\n' || key =='\r' )break ;
grub-core/lib/efi/relocator.c +4 -4
@@ -26,7 +26,7 @@#define NEXT_MEMORY_DESCRIPTOR (desc, size) \ ((grub_efi_memory_descriptor_t *) ((char *) (desc) + (size))) -unsigned +unsigned grub_relocator_firmware_get_max_events (void ) {grub_efi_uintn_t mmapsize =0 , descriptor_size =0 ;
@@ -39,7 +39,7 @@ grub_relocator_firmware_get_max_events (void)return 2 * (mmapsize / descriptor_size +10 ); } -unsigned +unsigned grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events) {grub_efi_uintn_t mmapsize =0 , desc_size =0 ;
@@ -65,7 +65,7 @@ grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events)grub_uint64_t start = desc->physical_start;grub_uint64_t end = desc->physical_start + (desc->num_pages <<12 ); -/* post-4G addresses are never supported on 32-bit EFI. +/* post-4G addresses are never supported on 32-bit EFI. Moreover it has been reported that some 64-bit EFI contrary to the spec don't map post-4G pages. So if you enable post-4G allocations, map pages manually or check that they are mapped.
@@ -81,7 +81,7 @@ grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events) counter++; events[counter].type =REG_FIRMWARE_END ; events[counter].pos = end; - counter++; + counter++; }return counter;
grub-core/lib/fdt.c +2 -2
@@ -335,7 +335,7 @@ int grub_fdt_next_node (const void *fdt, unsigned int currentoffset)return -1 ;return (int ) ((grub_addr_t ) token - (grub_addr_t ) fdt -grub_fdt_get_off_dt_struct (fdt)); -} +}int grub_fdt_first_node (const void *fdt,unsigned int parentoffset) {
@@ -355,7 +355,7 @@ int grub_fdt_first_node (const void *fdt, unsigned int parentoffset)return -1 ;return (int ) ((grub_addr_t ) token - (grub_addr_t ) fdt -grub_fdt_get_off_dt_struct (fdt)); -} +}/* Find a direct sub-node of a given parent node. */ int grub_fdt_find_subnode (const void *fdt, unsigned int parentoffset,
grub-core/lib/i386/reboot.c +1 -1
@@ -55,7 +55,7 @@ grub_reboot (void) state.a20 =0 ;grub_stop_floppy (); - + err =grub_relocator16_boot (relocator, state);while (1 );
grub-core/lib/i386/relocator.c +1 -1
@@ -131,7 +131,7 @@ grub_relocator16_boot (struct grub_relocator *rel,if (err)return err; - grub_relocator16_cs = state.cs; + grub_relocator16_cs = state.cs; grub_relocator16_ip = state.ip; grub_relocator16_ds = state.ds;
grub-core/lib/ieee1275/cmos.c +2 -2
@@ -52,7 +52,7 @@ grub_cmos_find_port_iter (struct grub_ieee1275_devalias *alias)#if GRUB_CPU_SIZEOF_VOID_P ==8 if (actual ==8 ) { - grub_cmos_port = (volatile grub_uint8_t *) + grub_cmos_port = (volatile grub_uint8_t *) ((((grub_addr_t ) addr[0 ]) <<32 ) | addr[1 ]);return 1 ; }
@@ -72,6 +72,6 @@ grub_cmos_find_port (void)grub_ieee1275_devices_iterate (grub_cmos_find_port_iter);if (!grub_cmos_port)return grub_error (GRUB_ERR_IO ,"no cmos found" ); - +return GRUB_ERR_NONE ; }
grub-core/lib/ieee1275/relocator.c +2 -2
@@ -33,7 +33,7 @@ count (grub_uint64_t addr __attribute__ ((unused)),return 0 ; } -unsigned +unsigned grub_relocator_firmware_get_max_events (void ) {int counter =0 ;
@@ -82,7 +82,7 @@ grub_relocator_firmware_fill_events_iter (grub_uint64_t addr,return 0 ; } -unsigned +unsigned grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events) {struct grub_relocator_firmware_fill_events_ctx ctx = {
grub-core/lib/legacy_parse.c +13 -13
@@ -92,7 +92,7 @@ static struct legacy_command legacy_commands[] = 2, {TYPE_FILE, TYPE_FILE}, FLAG_IGNORE_REST, "FILE1 FILE2","Compare the file FILE1 with the FILE2 and inform the different values" " if any."}, - {"color", "set color_normal='%s'; set color_highlight='%s'\n", NULL, 0, + {"color", "set color_normal='%s'; set color_highlight='%s'\n", NULL, 0, 2, {TYPE_VERBATIM, TYPE_VERBATIM},FLAG_IGNORE_REST |FLAG_FALLBACK_AVAILABLE ,"NORMAL [HIGHLIGHT]" ,"Change the menu colors. The color NORMAL is used for most"
@@ -115,7 +115,7 @@ static struct legacy_command legacy_commands[] = 0, {}, 0, 0, "Turn on/off the debug mode."}, {"default" ,"set default='%s'; if [ x\"$default\" = xsaved ]; then load_env; " - "set default=\"$saved_entry\"; fi\n", NULL, 0, 1, {TYPE_VERBATIM}, 0, + "set default=\"$saved_entry\"; fi\n", NULL, 0, 1, {TYPE_VERBATIM}, 0,"[NUM | `saved']" ,"Set the default entry to entry number NUM (if not specified, it is" " 0, the first entry) or the entry number saved by savedefault."},
@@ -128,7 +128,7 @@ static struct legacy_command legacy_commands[] = " tag."}, {"displayapm", "lsapm\n", NULL, 0, 0, {}, 0, 0, "Display APM BIOS information."}, - {"displaymem", "lsmmap\n", NULL, 0, 0, {}, 0, 0, + {"displaymem", "lsmmap\n", NULL, 0, 0, {}, 0, 0,"Display what GRUB thinks the system address space map of the" " machine is, including all regions of physical RAM installed."}, /* FIXME: device and efimap unsupported. */
@@ -213,7 +213,7 @@ static struct legacy_command legacy_commands[] = 1, {TYPE_BOOL}, FLAG_FALLBACK_AVAILABLE, "[FLAG]","Toggle pager mode with no argument. If FLAG is given and its value" " is `on', turn on the mode. If FLAG is `off', turn off the mode."}, - {"pager", + {"pager","if [ \"$pager\" = 1 ]; then pager=0; echo Internal pager is now off;" "else pager=1; echo Internal pager is now on; fi\n", NULL, 0, 0, {}, FLAG_FALLBACK, NULL, NULL},
@@ -291,7 +291,7 @@ static struct legacy_command legacy_commands[] ="Save the current entry as the default boot entry if no argument is" " specified. If a number is specified, this number is saved. If" " `fallback' is used, next fallback entry is saved."}, - {"serial", "serial %s\n", NULL, 0, 1, {TYPE_REST_VERBATIM}, 0, + {"serial", "serial %s\n", NULL, 0, 1, {TYPE_REST_VERBATIM}, 0,"[--unit=UNIT] [--port=PORT] [--speed=SPEED] [--word=WORD] " "[--parity=PARITY] [--stop=STOP] [--device=DEV]" ,"Initialize a serial device. UNIT is a digit that specifies which serial"
@@ -438,7 +438,7 @@ adjust_file (const char *in, grub_size_t len) {if (*ptr =='\'' || *ptr =='\\' ) *outptr++ ='\\' ; - + *outptr++ = *ptr; }if (subpart !=-1 )
@@ -451,7 +451,7 @@ adjust_file (const char *in, grub_size_t len) {if (*ptr =='\'' || *ptr =='\\' ) *outptr++ ='\\' ; - + *outptr++ = *ptr; } *outptr =0 ;
@@ -489,7 +489,7 @@ is_option (enum arg_type opt, const char *curarg, grub_size_t len)return (len >=2 && curarg[0 ] =='-' && curarg[1 ] =='-' );default :return 0 ; - } + } } char *
@@ -635,7 +635,7 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix) {int hold_arg =0 ; -const char *curarg =NULL ; +const char *curarg =NULL ;for (i =0 ; i < legacy_commands[cmdnum].argc; i++) {grub_size_t curarglen;
@@ -685,7 +685,7 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix) ptr++; overhead +=3 ; } - + outptr0 = args[i] =grub_malloc (overhead + (ptr - curarg));if (!outptr0)return NULL ;
@@ -819,14 +819,14 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix)case TYPE_FORCE_OPTION :case TYPE_NOAPM_OPTION :case TYPE_TYPE_OR_NOMEM_OPTION : -case TYPE_OPTION : +case TYPE_OPTION : args[i] =grub_strdup ("" );break ;case TYPE_BOOL :case TYPE_INT : args[i] =grub_strdup ("0" );break ; -case TYPE_VBE_MODE : +case TYPE_VBE_MODE : args[i] =grub_strdup ("auto" );break ; }
@@ -849,7 +849,7 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix)if (!invert)return NULL ;grub_memcpy (invert, slash +1 , len - (slash - corig) -1 ); - invert[len - (slash - args[0 ]) -1 ] ='/' ; + invert[len - (slash - args[0 ]) -1 ] ='/' ;grub_memcpy (invert + len - (slash - corig), corig, slash - corig); invert[len] =0 ; args[legacy_commands[cmdnum].argc] = invert;
grub-core/lib/libgcrypt/cipher/test-getrusage.c +7 -7
@@ -27,7 +27,7 @@ main (int argc, char **argv) }printf ("ru_utime = %ld.%06ld\n" , - buf.ru_utime.tv_sec, buf.ru_utime.tv_usec); + buf.ru_utime.tv_sec, buf.ru_utime.tv_usec);printf ("ru_stime = %ld.%06ld\n" , buf.ru_stime.tv_sec, buf.ru_stime.tv_usec);printf ("ru_maxrss = %ld\n" , buf.ru_maxrss );
@@ -60,7 +60,7 @@ collect_rusage_stats (struct rusage *rb) {static int idx;static struct rusage buf[100 ]; - +if (!rb) {int i;
@@ -68,12 +68,12 @@ collect_rusage_stats (struct rusage *rb)fprintf (stderr,"ru_utime ru_stime ru_minflt ru_nvcsw ru_nivcsw\n" );for (i=0 ; i < idx; i++)fprintf (stderr,"%ld.%06ld %ld.%06ld %5ld %5ld %5ld\n" , - buf[i].ru_utime.tv_sec, buf[i].ru_utime.tv_usec, - buf[i].ru_stime.tv_sec, buf[i].ru_stime.tv_usec, - buf[i].ru_minflt, + buf[i].ru_utime.tv_sec, buf[i].ru_utime.tv_usec, + buf[i].ru_stime.tv_sec, buf[i].ru_stime.tv_usec, + buf[i].ru_minflt, buf[i].ru_nvcsw, buf[i].ru_nivcsw); - } + }else if (idx <DIM (buf)) { buf[idx++] = *rb;
@@ -99,7 +99,7 @@ collect_rusage_stats (struct rusage *rb)add_randomness( &buf, sizeof buf, 1 ); memset( &buf, 0, sizeof buf ); } -+ */
grub-core/lib/libgcrypt/mpi/generic/mpih-add1.c +3 -3
@@ -1,5 +1,5 @@/* mpihelp-add_1.c - MPI helper functions -* Copyright (C) 1994, 1996, 1997, 1998, +* Copyright (C) 1994, 1996, 1997, 1998, * 2000, 2002 Free Software Foundation, Inc. * * This file is part of Libgcrypt.
@@ -48,7 +48,7 @@ _gcry_mpih_add_n (mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, res_ptr -= j; cy =0 ; - do + do { y = s2_ptr[j]; x = s1_ptr[j];
@@ -57,7 +57,7 @@ _gcry_mpih_add_n (mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, y += x;/* add other addend */ cy += y < x;/* get out carry from that add, combine */ res_ptr[j] = y; - } + }while ( ++j );return cy;
grub-core/lib/libgcrypt/mpi/generic/mpih-lshift.c +1 -1
@@ -54,7 +54,7 @@ _gcry_mpih_lshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize, low_limb = up[i]; retval = low_limb >> sh_2; high_limb = low_limb; -while ( --i >=0 ) +while ( --i >=0 ) { low_limb = up[i]; wp[i] = (high_limb << sh_1) | (low_limb >> sh_2);
grub-core/lib/libgcrypt/mpi/generic/mpih-mul1.c +2 -2
@@ -48,13 +48,13 @@ _gcry_mpih_mul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, res_ptr -= j; cy_limb =0 ; -do +do {umul_ppmm ( prod_high, prod_low, s1_ptr[j], s2_limb ); prod_low += cy_limb; cy_limb = (prod_low < cy_limb?1 :0 ) + prod_high; res_ptr[j] = prod_low; - } + }while ( ++j );return cy_limb;
grub-core/lib/libgcrypt/mpi/generic/mpih-mul2.c +3 -3
@@ -48,7 +48,7 @@ _gcry_mpih_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, s1_ptr -= j; cy_limb =0 ; - do + do { umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb );
@@ -59,9 +59,9 @@ _gcry_mpih_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, prod_low = x + prod_low; cy_limb += prod_low < x?1 :0 ; res_ptr[j] = prod_low; - } + }while ( ++j ); - +return cy_limb; }
grub-core/lib/libgcrypt/mpi/generic/mpih-mul3.c +2 -2
@@ -48,7 +48,7 @@ _gcry_mpih_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, s1_ptr -= j; cy_limb =0 ; - do + do { umul_ppmm( prod_high, prod_low, s1_ptr[j], s2_limb);
@@ -59,7 +59,7 @@ _gcry_mpih_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, prod_low = x - prod_low; cy_limb += prod_low > x?1 :0 ; res_ptr[j] = prod_low; - } + }while ( ++j );return cy_limb;
grub-core/lib/libgcrypt/mpi/generic/mpih-sub1.c +2 -2
@@ -48,7 +48,7 @@ _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, res_ptr -= j; cy =0 ; - do + do { y = s2_ptr[j]; x = s1_ptr[j];
@@ -57,7 +57,7 @@ _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, y = x - y;/* main subtract */ cy += y > x;/* get out carry from the subtract, combine */ res_ptr[j] = y; - } + }while ( ++j );return cy;
grub-core/lib/libgcrypt/mpi/i386/syntax.h +1 -1
@@ -1,6 +1,6 @@/* syntax.h -- Definitions for x86 syntax variations. * -* Copyright (C) 1992, 1994, 1995, 1998, +* Copyright (C) 1992, 1994, 1995, 1998, * 2001, 2002 Free Software Foundation, Inc. * * This file is part of Libgcrypt.
grub-core/lib/libgcrypt/mpi/m68k/syntax.h +1 -1
@@ -2,7 +2,7 @@* * Copyright (C) 1992, 1994, 1996, 1998, * 2001, 2002 Free Software Foundation, Inc. -* +* * This file is part of Libgcrypt. * * Libgcrypt is free software; you can redistribute it and/or modify
grub-core/lib/mips/loongson/reboot.c +1 -1
@@ -42,7 +42,7 @@ grub_reboot (void)break ;grub_cs5536_write_msr (dev,GRUB_CS5536_MSR_DIVIL_RESET ,grub_cs5536_read_msr (dev, -GRUB_CS5536_MSR_DIVIL_RESET ) +GRUB_CS5536_MSR_DIVIL_RESET ) |1 );break ; }
grub-core/lib/mips/relocator.c +1 -1
@@ -103,7 +103,7 @@ grub_cpu_relocator_forward (void *ptr0, void *src, void *dest,write_reg (8 , (grub_uint32_t ) src, &ptr);write_reg (9 , (grub_uint32_t ) dest, &ptr);write_reg (10 , (grub_uint32_t ) size, &ptr); -grub_memcpy (ptr, &grub_relocator_forward_start, +grub_memcpy (ptr, &grub_relocator_forward_start,RELOCATOR_SRC_SIZEOF (forward)); }
grub-core/lib/posix_wrap/ctype.h +7 -7
@@ -27,13 +27,13 @@ toupper (int c)return grub_toupper (c); } -static inline int +static inline int isspace (int c) {return grub_isspace (c); } -static inline int +static inline int isdigit (int c) {return grub_isdigit (c);
@@ -63,19 +63,19 @@ isxdigit (int c)return grub_isxdigit (c); } -static inline int +static inline int isprint (int c) {return grub_isprint (c); } -static inline int +static inline int iscntrl (int c) {return !grub_isprint (c); } -static inline int +static inline int isgraph (int c) {return grub_isprint (c) && !grub_isspace (c);
@@ -87,13 +87,13 @@ isalnum (int c)return grub_isalpha (c) ||grub_isdigit (c); } -static inline int +static inline int ispunct (int c) {return grub_isprint (c) && !grub_isspace (c) && !isalnum (c); } -static inline int +static inline int isalpha (int c) {return grub_isalpha (c);
grub-core/lib/posix_wrap/stdlib.h +1 -1
@@ -23,7 +23,7 @@#include <grub/misc.h> #include <grub/safemath.h> -static inline void +static inline void free (void *ptr) {grub_free (ptr);
grub-core/lib/posix_wrap/string.h +2 -2
@@ -30,13 +30,13 @@ strlen (const char *s)return grub_strlen (s); } -static inline int +static inline int strcmp (const char *s1,const char *s2) {return grub_strcmp (s1, s2); } -static inline int +static inline int strcasecmp (const char *s1,const char *s2) {return grub_strcasecmp (s1, s2);
grub-core/lib/posix_wrap/wctype.h +1 -1
@@ -37,7 +37,7 @@ static inline wctype_t wctype (const char *name) {wctype_t i; -static const char names[][10 ] = {"" , +static const char names[][10 ] = {"" ,"alnum" ,"cntrl" ,"lower" ,"space" ,"alpha" ,"digit" ,"print" ,"upper" ,"blank" ,
grub-core/lib/powerpc/relocator.c +2 -2
@@ -55,7 +55,7 @@ static void write_reg (int regn, grub_uint32_t val, void **target) {/* lis r, val >> 16 */ - *(grub_uint32_t *) *target = + *(grub_uint32_t *) *target = ((0x3c00 | (regn <<5 )) <<16 ) | (val >>16 ); *target = ((grub_uint32_t *) *target) +1 ;/* ori r, r, val & 0xffff. */
@@ -99,7 +99,7 @@ grub_cpu_relocator_forward (void *ptr0, void *src, void *dest,write_reg (8 , (grub_uint32_t ) src, &ptr);write_reg (9 , (grub_uint32_t ) dest, &ptr);write_reg (10 , (grub_uint32_t ) size, &ptr); -grub_memcpy (ptr, &grub_relocator_forward_start, +grub_memcpy (ptr, &grub_relocator_forward_start,RELOCATOR_SRC_SIZEOF (forward)); }
grub-core/lib/priority_queue.c +1 -1
@@ -139,7 +139,7 @@ void grub_priority_queue_pop (grub_priority_queue_t pq) {grub_size_t p; - +swap (pq,0 , pq->used -1 ); pq->used--;for (p =0 ;left_child (p) < pq->used; )
grub-core/lib/reed_solomon.c +3 -3
@@ -265,7 +265,7 @@ rs_recover (gf_single_t *mm, grub_size_t s, grub_size_t rs) sigma[i] =0 ;gauss_solve (eqstat, rs2, rs2, sigma); - } + }for (i =0 ; i < (int ) (rs + s); i++)if (pol_evaluate (sigma, rs2 -1 ,255 - i) == gf_powx[i])
@@ -338,7 +338,7 @@ encode_block (gf_single_t *ptr, grub_size_t s,for (j =0 ; j < ds; j++) m[j] = ptr[SECTOR_SIZE * j + i];rs_encode (m, ds, rr); -for (j =0 ; j < rr; j++) +for (j =0 ; j < rr; j++) rptr[SECTOR_SIZE * j + i] = m[j + ds];free (m); }
@@ -473,7 +473,7 @@ main (int argc, char **argv) buf =xmalloc (s + rs +SECTOR_SIZE );fread (buf,1 , s + rs, out); -fclose (out); +fclose (out);#endif #if 1 grub_memset (buf +512 *15 ,0 ,512 );
grub-core/lib/relocator.c +24 -24
184 lines not on this page · raw message
grub-core/lib/syslinux_parse.c +26 -26
196 lines not on this page · raw message
grub-core/lib/xzembed/xz_dec_stream.c +3 -3
@@ -381,7 +381,7 @@ static enum xz_ret hash_validate(struct xz_dec *s, struct xz_buf *b, {#ifndef GRUB_EMBED_DECOMPRESSOR const gcry_md_spec_t *hash = crc32 ? s->crc32 : s->hash; -void *hash_context = crc32 ? s->crc32_context +void *hash_context = crc32 ? s->crc32_context : s->hash_context;if (!s->have_hash_value && hash &&sizeof (s->hash_value) >= hash->mdlen)
@@ -512,7 +512,7 @@ static enum xz_ret dec_stream_header(struct xz_dec *s)kfree (s->crc32_context);return XZ_MEMLIMIT_ERROR ; } - + s->index.hash.hash_context =kmalloc (s->hash->contextsize,GFP_KERNEL );if (s->index.hash.hash_context ==NULL )
@@ -521,7 +521,7 @@ static enum xz_ret dec_stream_header(struct xz_dec *s)kfree (s->crc32_context);return XZ_MEMLIMIT_ERROR ; } - + s->block.hash.hash_context =kmalloc (s->hash->contextsize,GFP_KERNEL );if (s->block.hash.hash_context ==NULL ) {
Signature · 1 line
2.35.1
PATCH 11/21 loader: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/loader/arm/linux.c | 2 +- grub-core/loader/efi/appleloader.c | 2 +- grub-core/loader/i386/bsd.c | 26 ++++++++-------- grub-core/loader/i386/bsdXX.c | 10 +++--- grub-core/loader/i386/coreboot/chainloader.c | 2 +- grub-core/loader/i386/linux.c | 8 ++--- grub-core/loader/i386/multiboot_mbi.c | 32 ++++++++++---------- grub-core/loader/i386/pc/chainloader.c | 6 ++-- grub-core/loader/i386/pc/freedos.c | 4 +-- grub-core/loader/i386/pc/linux.c | 2 +- grub-core/loader/i386/pc/ntldr.c | 4 +-- grub-core/loader/i386/pc/plan9.c | 10 +++--- grub-core/loader/i386/pc/pxechainloader.c | 4 +-- grub-core/loader/i386/pc/truecrypt.c | 4 +-- grub-core/loader/i386/xnu.c | 6 ++-- grub-core/loader/ia64/efi/linux.c | 28 ++++++++--------- grub-core/loader/linux.c | 2 +- grub-core/loader/lzss.c | 2 +- grub-core/loader/mips/linux.c | 8 ++--- grub-core/loader/multiboot.c | 2 +- grub-core/loader/multiboot_elfxx.c | 8 ++--- grub-core/loader/multiboot_mbi2.c | 30 +++++++++--------- grub-core/loader/xnu.c | 10 +++--- 23 files changed, 106 insertions(+), 106 deletions(-)
grub-core/loader/arm/linux.c +1 -1
@@ -452,7 +452,7 @@ load_dtb (grub_file_t dtb, int size)grub_fdt_set_totalsize (new_fdt, size); current_fdt = new_fdt; -/* +/* * We've successfully loaded an FDT, so any machine type passed * from firmware is now obsolete. */
grub-core/loader/efi/appleloader.c +1 -1
@@ -126,7 +126,7 @@ static struct piwg_full_device_path devpath_6 = MAKE_PIWG_PATH (0xffcc4000,static struct piwg_full_device_path devpath_7 =MAKE_PIWG_PATH (0xff981000 ,0xffc8ffff ); -/* mid-2012 MBP retina (MacBookPro10,1) */ +/* mid-2012 MBP retina (MacBookPro10,1) */ static struct piwg_full_device_path devpath_8 =MAKE_PIWG_PATH (0xff990000 ,0xffb2ffff );
grub-core/loader/i386/bsd.c +13 -13
@@ -135,7 +135,7 @@ static const struct grub_arg_option openbsd_opts[] = {"single", 's', 0, N_("Boot into single mode."), 0, 0}, {"kdb", 'd', 0, N_("Enter in KDB on boot."), 0, 0}, {"root", 'r', 0, N_("Set root device."), "wdXY", ARG_TYPE_STRING}, - {"serial", 'h', GRUB_ARG_OPTION_OPTIONAL, + {"serial", 'h', GRUB_ARG_OPTION_OPTIONAL,N_ ("Use serial console." ),/* TRANSLATORS: "com" is static and not to be translated. It refers to serial ports e.g. com1.
@@ -168,7 +168,7 @@ static const struct grub_arg_option netbsd_opts[] = {"debug", 'x', 0, N_("Boot with debug messages."), 0, 0}, {"silent", 'z', 0, N_("Suppress normal output (warnings remain)."), 0, 0}, {"root", 'r', 0, N_("Set root device."), N_("DEVICE"), ARG_TYPE_STRING}, - {"serial", 'h', GRUB_ARG_OPTION_OPTIONAL, + {"serial", 'h', GRUB_ARG_OPTION_OPTIONAL,N_ ("Use serial console." ),/* TRANSLATORS: "com" is static and not to be translated. It refers to serial ports e.g. com1.
@@ -231,7 +231,7 @@ grub_bsd_add_meta_ptr (grub_uint32_t type, void **ptr, grub_uint32_t len) newtag->next =NULL ; *ptr = newtag->data; -if (kernel_type ==KERNEL_TYPE_FREEBSD +if (kernel_type ==KERNEL_TYPE_FREEBSD && type == (FREEBSD_MODINFO_METADATA |FREEBSD_MODINFOMD_SMAP )) {struct bsd_tag *p;
@@ -435,7 +435,7 @@ grub_freebsd_add_meta_module (const char *filename, const char *type, {grub_uint64_t addr64 = addr, size64 = size;if (grub_bsd_add_meta (FREEBSD_MODINFO_TYPE , type,grub_strlen (type) +1 ) - ||grub_bsd_add_meta (FREEBSD_MODINFO_ADDR , &addr64,sizeof (addr64)) + ||grub_bsd_add_meta (FREEBSD_MODINFO_ADDR , &addr64,sizeof (addr64)) ||grub_bsd_add_meta (FREEBSD_MODINFO_SIZE , &size64,sizeof (size64)))return grub_errno; }
@@ -633,7 +633,7 @@ grub_freebsd_boot (void) err =grub_bsd_add_meta (FREEBSD_MODINFO_END ,0 ,0 );if (err)return err; - + tag_buf_len =0 ;for (tag = tags; tag; tag = tag->next) tag_buf_len = ALIGN_VAR (tag_buf_len
@@ -678,7 +678,7 @@ grub_freebsd_boot (void) {grub_uint8_t *p_tag = p;struct bsd_tag *tag; - +for (tag = tags; tag; tag = tag->next) {struct freebsd_tag_header *head
@@ -842,7 +842,7 @@ grub_openbsd_boot (void)if (regs.edx ==0x20494350 ) {struct grub_openbsd_bootarg_pcibios pcibios; - + pcibios.characteristics = regs.eax &0xff ; pcibios.revision = regs.ebx &0xffff ; pcibios.pm_entry = regs.edi;
@@ -1500,7 +1500,7 @@ grub_bsd_load (int argc, char *argv[]) fail:if (grub_errno !=GRUB_ERR_NONE ) -grub_dl_unref (my_mod); +grub_dl_unref (my_mod);return grub_errno; }
@@ -1658,7 +1658,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) "only com0-com3 are supported");if (*ptr ==',' ) { - ptr++; + ptr++; speed =grub_strtoul (ptr, &ptr,0 );if (grub_errno)return grub_errno;
@@ -1668,7 +1668,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) serial.device = (GRUB_OPENBSD_COM_MAJOR <<8 ) | port; serial.speed = speed; serial.addr =grub_ns8250_hw_get_port (port); - +grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE , &serial,sizeof (serial)); bootflags |=OPENBSD_RB_SERCONS ; }
@@ -1755,7 +1755,7 @@ grub_cmd_netbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])if (grub_memcmp (ptr,"com" ,sizeof ("com" ) -1 ) ==0 ) { ptr +=sizeof ("com" ) -1 ; - serial.addr + serial.addr =grub_ns8250_hw_get_port (grub_strtoul (ptr, &ptr,0 )); }else
@@ -1925,7 +1925,7 @@ grub_cmd_freebsd_module (grub_command_t cmd __attribute__ ((unused)), {grub_relocator_chunk_t ch; - err =grub_relocator_alloc_chunk_addr (relocator, &ch, kern_end, + err =grub_relocator_alloc_chunk_addr (relocator, &ch, kern_end, file->size);if (err) goto fail;
@@ -1976,7 +1976,7 @@ grub_netbsd_module_load (char *filename, grub_uint32_t type) {grub_relocator_chunk_t ch; - err =grub_relocator_alloc_chunk_addr (relocator, &ch, kern_end, + err =grub_relocator_alloc_chunk_addr (relocator, &ch, kern_end, file->size);if (err) goto fail;
grub-core/loader/i386/bsdXX.c +5 -5
@@ -151,7 +151,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator, argc -1 , argv +1 , module, curload - module);if (! err) - err =grub_bsd_add_meta (FREEBSD_MODINFO_METADATA + err =grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |FREEBSD_MODINFOMD_ELFHDR , &e,sizeof (e));if (! err)
@@ -479,7 +479,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator, symtab.esyms = symtarget + chunk_size; curload = sym_chunk; - + e2 = (Elf_Ehdr *) curload;grub_memcpy (curload, &e,sizeof (e)); e2->e_phoff =0 ;
@@ -539,7 +539,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator, goto out; } - err =grub_bsd_add_meta (NETBSD_BTINFO_SYMTAB , + err =grub_bsd_add_meta (NETBSD_BTINFO_SYMTAB , &symtab,sizeof (symtab)); out:
@@ -566,7 +566,7 @@ SUFFIX(grub_openbsd_find_ramdisk) (grub_file_t file,Elf_Ehdr e;Elf_Shdr *s;char *shdr =NULL ; - + err =read_headers (file, filename, &e, &shdr);if (err) {
@@ -588,7 +588,7 @@ SUFFIX(grub_openbsd_find_ramdisk) (grub_file_t file, symsize = s->sh_size; symentsize = s->sh_entsize; symoff = s->sh_offset; - + s = (Elf_Shdr *) (shdr + e.e_shentsize * s->sh_link); stroff = s->sh_offset; strsize = s->sh_size;
grub-core/loader/i386/coreboot/chainloader.c +1 -1
@@ -461,7 +461,7 @@ grub_cmd_chain (grub_command_t cmd __attribute__ ((unused)), "payload is too short");return grub_errno; } - +switch (head) {case ELFMAG0 | (ELFMAG1 <<8 ) | (ELFMAG2 <<16 ) | (ELFMAG3 <<24 ):
grub-core/loader/i386/linux.c +4 -4
@@ -286,7 +286,7 @@ grub_linux_setup_video (struct linux_kernel_params *params) params->lfb_size >>=16 ; params->have_vga =GRUB_VIDEO_LINUX_TYPE_VESA ;break ; - +case GRUB_VIDEO_DRIVER_EFI_UGA :case GRUB_VIDEO_DRIVER_EFI_GOP : params->have_vga =GRUB_VIDEO_LINUX_TYPE_EFIFB ;
@@ -591,9 +591,9 @@ grub_linux_boot (void) &efi_desc_size, &efi_desc_version);if (err)return err; - +/* Note that no boot services are available from here. */ - efi_mmap_target = ctx.real_mode_target + efi_mmap_target = ctx.real_mode_target + ((grub_uint8_t *) efi_mmap_buf - (grub_uint8_t *) real_mode_mem);/* Pass EFI parameters. */ if (grub_le_to_cpu16 (ctx.params->version) >=0x0208 )
@@ -743,7 +743,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), align =0 ; relocatable =0 ; } - +if (grub_le_to_cpu16 (lh.version) >=0x020a ) { min_align = lh.min_alignment;
grub-core/loader/i386/multiboot_mbi.c +16 -16
@@ -103,7 +103,7 @@ load_kernel (grub_file_t file, const char *filename,else code_size = load_size; - err =grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, + err =grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, &ch, header->load_addr, code_size);if (err)
@@ -200,7 +200,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)switch (header->mode_type) {case 1 : - err =grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT , + err =grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT ,GRUB_MULTIBOOT_CONSOLE_EGA_TEXT |GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER ,0 ,0 ,0 ,0 );
@@ -213,14 +213,14 @@ grub_multiboot_load (grub_file_t file, const char *filename) header->depth, 0);break ;default : - err =grub_error (GRUB_ERR_BAD_OS , + err =grub_error (GRUB_ERR_BAD_OS ,"unsupported graphical mode type %d" , header->mode_type);break ; } }else - err =grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT , + err =grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT ,GRUB_MULTIBOOT_CONSOLE_EGA_TEXT ,0 ,0 ,0 ,0 );return err;
@@ -238,7 +238,7 @@ grub_multiboot_get_mbi_size (void) ret =sizeof (struct multiboot_info ) +ALIGN_UP (cmdline_size,4 ) + modcnt *sizeof (struct multiboot_mod_list ) + total_modcmd - +ALIGN_UP (sizeof (PACKAGE_STRING ),4 ) + +ALIGN_UP (sizeof (PACKAGE_STRING ),4 ) +grub_multiboot_get_mmap_count () *sizeof (struct multiboot_mmap_entry ) + elf_sec_entsize * elf_sec_num +256 *sizeof (struct multiboot_color )
@@ -294,11 +294,11 @@ fill_vbe_info (struct multiboot_info *mbi, grub_uint8_t *ptrorig,#if GRUB_MACHINE_HAS_VBE grub_vbe_status_t status;void *scratch = (void *)GRUB_MEMORY_MACHINE_SCRATCH_ADDR ; - + status =grub_vbe_bios_get_controller_info (scratch);if (status !=GRUB_VBE_STATUS_OK )return grub_error (GRUB_ERR_IO ,"Can't get controller info." ); - + mbi->vbe_control_info = ptrdest;grub_memcpy (ptrorig, scratch,sizeof (struct grub_vbe_info_block )); ptrorig +=sizeof (struct grub_vbe_info_block );
@@ -307,7 +307,7 @@ fill_vbe_info (struct multiboot_info *mbi, grub_uint8_t *ptrorig, mbi->vbe_control_info =0 ;#endif -#if GRUB_MACHINE_HAS_VBE +#if GRUB_MACHINE_HAS_VBE status =grub_vbe_bios_get_mode (scratch); vbe_mode = *(grub_uint32_t *) scratch;if (status !=GRUB_VBE_STATUS_OK )
@@ -329,7 +329,7 @@ fill_vbe_info (struct multiboot_info *mbi, grub_uint8_t *ptrorig, }else { -#if GRUB_MACHINE_HAS_VBE +#if GRUB_MACHINE_HAS_VBE status =grub_vbe_bios_get_mode_info (vbe_mode, scratch);if (status !=GRUB_VBE_STATUS_OK )return grub_error (GRUB_ERR_IO ,"can't get mode info" );
@@ -340,19 +340,19 @@ fill_vbe_info (struct multiboot_info *mbi, grub_uint8_t *ptrorig, ptrorig +=sizeof (struct grub_vbe_mode_info_block ); ptrdest +=sizeof (struct grub_vbe_mode_info_block ); -#if GRUB_MACHINE_HAS_VBE +#if GRUB_MACHINE_HAS_VBE grub_vbe_bios_get_pm_interface (&mbi->vbe_interface_seg, &mbi->vbe_interface_off, &mbi->vbe_interface_len);#endif - + mbi->flags |=MULTIBOOT_INFO_VBE_INFO ;if (fill_generic && mode_info->memory_model ==GRUB_VBE_MEMORY_MODEL_TEXT ) { mbi->framebuffer_addr =0xb8000 ; - mbi->framebuffer_pitch =2 * mode_info->x_resolution; + mbi->framebuffer_pitch =2 * mode_info->x_resolution; mbi->framebuffer_width = mode_info->x_resolution; mbi->framebuffer_height = mode_info->y_resolution;
@@ -406,7 +406,7 @@ retrieve_video_parameters (struct multiboot_info *mbi, mbi->framebuffer_height = mode_info.height; mbi->framebuffer_bpp = mode_info.bpp; - +if (mode_info.mode_type &GRUB_VIDEO_MODE_TYPE_INDEX_COLOR ) {struct multiboot_color *mb_palette;
@@ -457,7 +457,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)unsigned i;struct module *cur;grub_size_t mmap_size; -grub_uint8_t *ptrorig; +grub_uint8_t *ptrorig;grub_addr_t ptrdest;grub_err_t err;
@@ -541,7 +541,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target) mbi->mods_count =0 ; } - mmap_size =grub_multiboot_get_mmap_count () + mmap_size =grub_multiboot_get_mmap_count () *sizeof (struct multiboot_mmap_entry );grub_fill_multiboot_mmap ((struct multiboot_mmap_entry *) ptrorig); mbi->mmap_length = mmap_size;
@@ -750,7 +750,7 @@ grub_multiboot_set_bootdev (void)if (dev)grub_device_close (dev); - bootdev = ((biosdev &0xff ) <<24 ) | ((slice &0xff ) <<16 ) + bootdev = ((biosdev &0xff ) <<24 ) | ((slice &0xff ) <<16 ) | ((part &0xff ) <<8 ) |0xff ; bootdev_set =1 ; }
grub-core/loader/i386/pc/chainloader.c +3 -3
@@ -57,7 +57,7 @@ typedef enumstatic grub_err_t grub_chainloader_boot (void ) { -struct grub_relocator16_state state = { +struct grub_relocator16_state state = { .edx = boot_drive, .esi = boot_part_addr, .ds =0 ,
@@ -118,7 +118,7 @@ grub_chainloader_patch_bpb (void *bs, grub_device_t dev, grub_uint8_t dl) || (grub_le_to_cpu16 (bpb->bytes_per_sector) & (grub_le_to_cpu16 (bpb->bytes_per_sector) - 1)))break ; - +if (bpb->sectors_per_cluster ==0 || (bpb->sectors_per_cluster & (bpb->sectors_per_cluster -1 )))break ;
@@ -243,7 +243,7 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)if (dev)grub_device_close (dev); - +/* Ignore errors. Perhaps it's not fatal. */ grub_errno =GRUB_ERR_NONE ;
grub-core/loader/i386/pc/freedos.c +2 -2
@@ -62,7 +62,7 @@ static grub_uint32_t ebx = 0xffffffff;static grub_err_t grub_freedos_boot (void ) { -struct grub_relocator16_state state = { +struct grub_relocator16_state state = { .cs =GRUB_FREEDOS_SEGMENT , .ip =0 ,
@@ -161,7 +161,7 @@ grub_cmd_freedos (grub_command_t cmd __attribute__ ((unused)),if (grub_file_read (file, kernelsys, kernelsyssize) != (grub_ssize_t ) kernelsyssize) goto fail; - +grub_loader_set (grub_freedos_boot, grub_freedos_unload,1 );return GRUB_ERR_NONE ;
grub-core/loader/i386/pc/linux.c +1 -1
@@ -67,7 +67,7 @@ grub_linux16_boot (void)grub_video_set_mode ("text" ,0 ,0 );grub_stop_floppy (); - +return grub_relocator16_boot (relocator, state); }
grub-core/loader/i386/pc/ntldr.c +2 -2
@@ -45,7 +45,7 @@ static grub_uint32_t edx = 0xffffffff;static grub_err_t grub_ntldr_boot (void ) { -struct grub_relocator16_state state = { +struct grub_relocator16_state state = { .cs =GRUB_NTLDR_SEGMENT , .ip =0 , .ds =0 ,
@@ -133,7 +133,7 @@ grub_cmd_ntldr (grub_command_t cmd __attribute__ ((unused)),if (grub_file_read (file, ntldr, ntldrsize) != (grub_ssize_t ) ntldrsize) goto fail; - +grub_loader_set (grub_ntldr_boot, grub_ntldr_unload,1 );return GRUB_ERR_NONE ;
grub-core/loader/i386/pc/plan9.c +5 -5
@@ -56,7 +56,7 @@ static const struct grub_arg_option options[] =means that the GRUBDEVICE and PLAN9DEVICE are actually the same device, just named differently in OS and GRUB. */ -N_ ("Override guessed mapping of Plan9 devices." ), +N_ ("Override guessed mapping of Plan9 devices." ),N_ ("GRUBDEVICE=PLAN9DEVICE" ), ARG_TYPE_STRING}, {0, 0, 0, 0, 0, 0}
@@ -78,7 +78,7 @@ struct grub_plan9_headerstatic grub_err_t grub_plan9_boot (void ) { -struct grub_relocator32_state state = { +struct grub_relocator32_state state = { .eax =0 , .eip = eip, .ebx =0 ,
@@ -122,7 +122,7 @@ static const char prefixes[5][10] = {#include <grub/err.h> -static inline grub_err_t +static inline grub_err_t grub_extend_alloc (grub_size_t sz,grub_size_t *allocated,char **ptr) {void *n;
@@ -302,7 +302,7 @@ fill_disk (const char *name, void *data)grub_device_close (dev);return 0 ; } - +/* if it's the disk the kernel is loaded from we need to name it nevertheless. */ plan9name =grub_strdup ("sdZ0" );
@@ -331,7 +331,7 @@ fill_disk (const char *name, void *data) plan9name =grub_xasprintf ("sd%c%d" ,'C' + unit /2 , unit %2 );break ; } - +/* FIXME: how does Plan9 number controllers? We probably need save the SCSI devices and sort them */ plan9name
grub-core/loader/i386/pc/pxechainloader.c +2 -2
@@ -46,7 +46,7 @@ GRUB_MOD_LICENSE ("GPLv3+");static grub_err_t grub_pxechain_boot (void ) { -struct grub_relocator16_state state = { +struct grub_relocator16_state state = { .cs =0 , .ip =0x7c00 , .ds =0 ,
@@ -138,7 +138,7 @@ grub_cmd_pxechain (grub_command_t cmd __attribute__ ((unused)),if (grub_file_read (file, image, imagesize) != (grub_ssize_t ) imagesize) goto fail; - +grub_loader_set (grub_pxechain_boot, grub_pxechain_unload,GRUB_LOADER_FLAG_NORETURN |GRUB_LOADER_FLAG_PXE_NOT_UNLOAD );return GRUB_ERR_NONE ;
grub-core/loader/i386/pc/truecrypt.c +2 -2
@@ -48,7 +48,7 @@ static grub_err_tgrub_truecrypt_boot (void) {grub_uint16_t segment = destaddr >>4 ; -struct grub_relocator16_state state = { +struct grub_relocator16_state state = { .cs = segment, .ds = segment, .es = segment,
@@ -194,7 +194,7 @@ grub_cmd_truecrypt (grub_command_t cmd __attribute__ ((unused)),grub_memset ((char *) truecrypt + truecryptsize +0x100 ,0 , truecryptmemsize - truecryptsize -0x100 ); sp = truecryptmemsize -4 ; - +grub_loader_set (grub_truecrypt_boot, grub_truecrypt_unload,1 );grub_free (uncompressed);
grub-core/loader/i386/xnu.c +3 -3
@@ -812,7 +812,7 @@ grub_xnu_boot_resume (void) state.eip = grub_xnu_entry_point; state.eax = grub_xnu_arg1; -return grub_relocator32_boot (grub_xnu_relocator, state,0 ); +return grub_relocator32_boot (grub_xnu_relocator, state,0 ); }/* Setup video for xnu. */
@@ -912,7 +912,7 @@ grub_xnu_set_video (struct grub_xnu_boot_params_common *params) params->lfb_line_len = mode_info.pitch; params->lfb_base = (grub_addr_t ) framebuffer; - params->lfb_mode = bitmap ?GRUB_XNU_VIDEO_SPLASH + params->lfb_mode = bitmap ?GRUB_XNU_VIDEO_SPLASH :GRUB_XNU_VIDEO_TEXT_IN_VIDEO ;return GRUB_ERR_NONE ;
@@ -1069,7 +1069,7 @@ grub_xnu_boot (void)if (v2) bootparams->v2.efi_system_table = (grub_addr_t ) grub_autoefi_system_table;else - bootparams->v1.efi_system_table = (grub_addr_t ) grub_autoefi_system_table; + bootparams->v1.efi_system_table = (grub_addr_t ) grub_autoefi_system_table; firstruntimepage = (((grub_addr_t ) grub_xnu_heap_target_start + grub_xnu_heap_size + GRUB_XNU_PAGESIZE - 1)
grub-core/loader/ia64/efi/linux.c +14 -14
@@ -106,7 +106,7 @@ query_fpswa (void)grub_efi_boot_services_t *bs;grub_efi_status_t status;grub_efi_uintn_t size; -static const grub_efi_guid_t fpswa_protocol = +static const grub_efi_guid_t fpswa_protocol = {0xc41b6531 ,0x97b9 ,0x11d3 , {0x9a ,0x29 ,0x0 ,0x90 ,0x27 ,0x3f ,0xc1 ,0x4d } };
@@ -114,7 +114,7 @@ query_fpswa (void)return ; size =sizeof (grub_efi_handle_t); - + bs = grub_efi_system_table->boot_services; status = bs->locate_handle (GRUB_EFI_BY_PROTOCOL, (void *) &fpswa_protocol,
@@ -131,7 +131,7 @@ query_fpswa (void)grub_printf ("%s\n" ,_ ("FPSWA protocol wasn't able to find the interface" ));return ; - } + } } static void
@@ -188,7 +188,7 @@ allocate_pages (grub_uint64_t align, grub_uint64_t size_pages, } mmap_end =NEXT_MEMORY_DESCRIPTOR (mmap, tmp_mmap_size); - +/* First, find free pages for the real mode code and the memory map buffer. */ for (desc = mmap;
@@ -240,7 +240,7 @@ set_boot_param_console (void) {grub_efi_simple_text_output_interface_t *conout;grub_efi_uintn_t cols, rows; - + conout = grub_efi_system_table->con_out;if (conout->query_mode (conout, conout->mode->mode, &cols, &rows) !=GRUB_EFI_SUCCESS )
@@ -250,7 +250,7 @@ set_boot_param_console (void)"Console info: cols=%lu rows=%lu x=%u y=%u\n" , cols, rows, conout->mode->cursor_column, conout->mode->cursor_row); - + boot_param->console_info.num_cols = cols; boot_param->console_info.num_rows = rows; boot_param->console_info.orig_x = conout->mode->cursor_column;
@@ -300,7 +300,7 @@ grub_linux_boot (void)/* See you next boot. */ asmvolatile ("mov r28=%1; br.sptk.few %0" ::"b" (entry),"r" (boot_param)); - +/* Never reach here. */ return GRUB_ERR_NONE ; }
@@ -411,7 +411,7 @@ grub_load_elf64 (grub_file_t file, void *buffer, const char *filename)"off=%lx flags=%x]\n" , phdr->p_paddr, phdr->p_paddr + reloc_offset, phdr->p_memsz, phdr->p_offset, phdr->p_flags); - +if (grub_file_seek (file, phdr->p_offset) == (grub_off_t)-1 )return grub_errno;
@@ -424,7 +424,7 @@ grub_load_elf64 (grub_file_t file, void *buffer, const char *filename) filename);return grub_errno; } - +if (phdr->p_filesz < phdr->p_memsz) grub_memset ((char *)(phdr->p_paddr + reloc_offset + phdr->p_filesz),
@@ -453,7 +453,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),grub_dl_ref (my_mod);grub_loader_unset (); - +if (argc ==0 ) {grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("filename expected" ));
@@ -507,7 +507,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),if (grub_verify_string (cmdline,GRUB_VERIFY_KERNEL_CMDLINE )) goto fail; - + boot_param->command_line = (grub_uint64_t ) cmdline; boot_param->efi_systab = (grub_uint64_t ) grub_efi_system_table;
@@ -539,7 +539,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("filename expected" )); goto fail; } - +if (! loaded) {grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("you need to load the kernel first" ));
@@ -559,7 +559,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),grub_error (GRUB_ERR_OUT_OF_MEMORY ,"cannot allocate pages" ); goto fail; } - +grub_dprintf ("linux" ,"[addr=0x%lx, size=0x%lx]\n" , (grub_uint64_t ) initrd_mem, initrd_size);
@@ -589,7 +589,7 @@ GRUB_MOD_INIT(linux) { cmd_linux =grub_register_command ("linux" , grub_cmd_linux,N_ ("FILE [ARGS...]" ),N_ ("Load Linux." )); - + cmd_initrd =grub_register_command ("initrd" , grub_cmd_initrd,N_ ("FILE" ),N_ ("Load initrd." ));
grub-core/loader/linux.c +1 -1
@@ -239,7 +239,7 @@ grub_initrd_init (int argc, char *argv[],free_dir (root); root =0 ; } - +return GRUB_ERR_NONE ; overflow:
grub-core/loader/lzss.c +1 -1
@@ -31,7 +31,7 @@ grub_decompress_lzss (grub_uint8_t *dst, grub_uint8_t *dstend,unsigned int flags;static unsigned char text_buf[N +F -1 ];grub_uint8_t *dst0 = dst; - +for (i =0 ; i <N -F ; i++) text_buf[i] =' ' ; r =N -F ; flags =0 ;for ( ; ; ) {
grub-core/loader/mips/linux.c +4 -4
@@ -100,7 +100,7 @@ grub_linux_boot (void) str = (char *) (magic +1 ); grub_strcpy (str, params); } -#endif +#endif #ifndef GRUB_MACHINE_MIPS_QEMU_MIPS state.gpr[4 ] = linux_argc;
@@ -261,11 +261,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), linux_argc++;#endif /* Main arguments. */ - size = (linux_argc) *sizeof (grub_uint32_t); + size = (linux_argc) *sizeof (grub_uint32_t);/* Initrd address and size. */ - size +=2 *sizeof (grub_uint32_t); + size +=2 *sizeof (grub_uint32_t);/* NULL terminator. */ - size +=sizeof (grub_uint32_t); + size +=sizeof (grub_uint32_t);/* First argument is always "a0". */ size +=ALIGN_UP (sizeof ("a0" ),4 );
grub-core/loader/multiboot.c +1 -1
@@ -238,7 +238,7 @@ GRUB_MULTIBOOT (set_console) (int console_type, int accepted_consoles, int console_req) { console_required = console_req; -if (!(accepted_consoles +if (!(accepted_consoles & (GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER | (GRUB_MACHINE_HAS_VGA_TEXT ?GRUB_MULTIBOOT_CONSOLE_EGA_TEXT :0 )))) {
grub-core/loader/multiboot_elfxx.c +4 -4
@@ -206,7 +206,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)return grub_error (GRUB_ERR_BAD_OS ,"entry point isn't in a segment" );#if defined (__i386__) || defined (__x86_64__) - +#elif defined (__mips)GRUB_MULTIBOOT (payload_eip) |=0x80000000 ;#else
@@ -220,7 +220,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) shdr =grub_calloc (ehdr->e_shnum, ehdr->e_shentsize);if (!shdr)return grub_errno; - +if (grub_file_seek (mld->file, ehdr->e_shoff) == (grub_off_t) -1 ) {grub_free (shdr);
@@ -235,7 +235,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) mld->filename);return grub_errno; } - +for (shdrptr = shdr, i =0 ; i < ehdr->e_shnum; shdrptr += ehdr->e_shentsize, i++) {
@@ -250,7 +250,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)so we don't care. */ if (sh->sh_addr !=0 )continue ; - +/* This section is empty, so we don't care. */ if (sh->sh_size ==0 )continue ;
grub-core/loader/multiboot_mbi2.c +15 -15
@@ -196,7 +196,7 @@ grub_multiboot2_load (grub_file_t file, const char *filename) }break ; } - +case MULTIBOOT_HEADER_TAG_ADDRESS : addr_tag = (struct multiboot_header_tag_address *) tag;break ;
@@ -274,7 +274,7 @@ grub_multiboot2_load (grub_file_t file, const char *filename)return grub_error (GRUB_ERR_UNKNOWN_OS ,"load address tag without entry address tag" ); } - +if (addr_tag) {grub_uint64_t load_addr = (addr_tag->load_addr +1 )
@@ -492,7 +492,7 @@ grub_fill_multiboot_mmap (struct multiboot_tag_mmap *tag) tag->type =MULTIBOOT_TAG_TYPE_MMAP ; tag->size =sizeof (struct multiboot_tag_mmap ) - +sizeof (struct multiboot_mmap_entry ) *grub_multiboot2_get_mmap_count (); + +sizeof (struct multiboot_mmap_entry ) *grub_multiboot2_get_mmap_count (); tag->entry_size =sizeof (struct multiboot_mmap_entry ); tag->entry_version =0 ;
@@ -508,14 +508,14 @@ fill_vbe_tag (struct multiboot_tag_vbe *tag) tag->type =MULTIBOOT_TAG_TYPE_VBE ; tag->size =0 ; - + status =grub_vbe_bios_get_controller_info (scratch);if (status !=GRUB_VBE_STATUS_OK )return ; - +grub_memcpy (&tag->vbe_control_info, scratch,sizeof (struct grub_vbe_info_block )); - + status =grub_vbe_bios_get_mode (scratch); tag->vbe_mode = *(grub_uint32_t *) scratch;if (status !=GRUB_VBE_STATUS_OK )
@@ -538,7 +538,7 @@ fill_vbe_tag (struct multiboot_tag_vbe *tag)return ;grub_memcpy (&tag->vbe_mode_info, scratch,sizeof (struct grub_vbe_mode_info_block )); - } + }grub_vbe_bios_get_pm_interface (&tag->vbe_interface_seg, &tag->vbe_interface_off, &tag->vbe_interface_len);
@@ -616,13 +616,13 @@ retrieve_video_parameters (grub_properly_aligned_t **ptrorig) tag->common.size =0 ; tag->common.framebuffer_addr =0xb8000 ; - - tag->common.framebuffer_pitch =2 * vbe_mode_info.x_resolution; + + tag->common.framebuffer_pitch =2 * vbe_mode_info.x_resolution; tag->common.framebuffer_width = vbe_mode_info.x_resolution; tag->common.framebuffer_height = vbe_mode_info.y_resolution; tag->common.framebuffer_bpp =16 ; - + tag->common.framebuffer_type =MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT ; tag->common.size =sizeof (tag->common); tag->common.reserved =0 ;
@@ -664,7 +664,7 @@ retrieve_video_parameters (grub_properly_aligned_t **ptrorig) tag->common.framebuffer_bpp = mode_info.bpp; tag->common.reserved =0 ; - +if (mode_info.mode_type &GRUB_VIDEO_MODE_TYPE_INDEX_COLOR ) {unsigned i;
@@ -748,7 +748,7 @@ grub_multiboot2_make_mbi (grub_uint32_t *target) {struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig; tag->type =MULTIBOOT_TAG_TYPE_CMDLINE ; - tag->size =sizeof (struct multiboot_tag_string ) + cmdline_size; + tag->size =sizeof (struct multiboot_tag_string ) + cmdline_size;grub_memcpy (tag->string, cmdline, cmdline_size); ptrorig +=ALIGN_UP (tag->size,MULTIBOOT_TAG_ALIGN ) /sizeof (grub_properly_aligned_t);
@@ -757,7 +757,7 @@ grub_multiboot2_make_mbi (grub_uint32_t *target) {struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig; tag->type =MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME ; - tag->size =sizeof (struct multiboot_tag_string ) +sizeof (PACKAGE_STRING ); + tag->size =sizeof (struct multiboot_tag_string ) +sizeof (PACKAGE_STRING );grub_memcpy (tag->string,PACKAGE_STRING ,sizeof (PACKAGE_STRING )); ptrorig +=ALIGN_UP (tag->size,MULTIBOOT_TAG_ALIGN ) /sizeof (grub_properly_aligned_t);
@@ -771,7 +771,7 @@ grub_multiboot2_make_mbi (grub_uint32_t *target)struct multiboot_tag_apm *tag = (struct multiboot_tag_apm *) ptrorig; tag->type =MULTIBOOT_TAG_TYPE_APM ; - tag->size =sizeof (struct multiboot_tag_apm ); + tag->size =sizeof (struct multiboot_tag_apm ); tag->cseg = info.cseg; tag->offset = info.offset;
@@ -864,7 +864,7 @@ grub_multiboot2_make_mbi (grub_uint32_t *target)struct multiboot_tag_bootdev *tag = (struct multiboot_tag_bootdev *) ptrorig; tag->type =MULTIBOOT_TAG_TYPE_BOOTDEV ; - tag->size =sizeof (struct multiboot_tag_bootdev ); + tag->size =sizeof (struct multiboot_tag_bootdev ); tag->biosdev = biosdev; tag->slice = slice;
grub-core/loader/xnu.c +5 -5
@@ -64,7 +64,7 @@ grub_xnu_heap_malloc (int size, void **src, grub_addr_t *target)if (grub_add (grub_xnu_heap_target_start, grub_xnu_heap_size, &tgt))return GRUB_ERR_OUT_OF_RANGE ; - + err =grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &ch, tgt, size);if (err)return err;
@@ -1399,10 +1399,10 @@ grub_xnu_fill_devicetree (void) nextdot = curdot +grub_strlen (curdot) +1 ; name =grub_realloc (name, nextdot - curdot +1 ); - +if (!name)return grub_errno; - +unescape (name, curdot, nextdot, &len); name[len] =0 ;
@@ -1410,11 +1410,11 @@ grub_xnu_fill_devicetree (void)grub_free (name);if (!curvalue)return grub_errno; - + data =grub_malloc (grub_strlen (var->value) +1 );if (!data)return grub_errno; - +unescape (data, var->value, var->value +grub_strlen (var->value), &len); curvalue->datasize = len;
Signature · 1 line
2.35.1
PATCH 12/21 net: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/net/bootp.c | 4 +-- grub-core/net/dns.c | 10 +++--- grub-core/net/drivers/efi/efinet.c | 2 +- grub-core/net/drivers/emu/emunet.c | 8 ++--- grub-core/net/drivers/i386/pc/pxe.c | 4 +-- grub-core/net/drivers/ieee1275/ofnet.c | 2 +- grub-core/net/drivers/uboot/ubootnet.c | 2 +- grub-core/net/ethernet.c | 2 +- grub-core/net/http.c | 10 +++--- grub-core/net/icmp6.c | 12 ++++---- grub-core/net/ip.c | 14 ++++----- grub-core/net/net.c | 42 +++++++++++++------------- grub-core/net/tcp.c | 14 ++++----- grub-core/net/tftp.c | 4 +-- grub-core/net/udp.c | 4 +-- 15 files changed, 67 insertions(+), 67 deletions(-)
grub-core/net/bootp.c +2 -2
@@ -416,7 +416,7 @@ grub_net_configure_by_dhcp_ack (const char *name, opt =find_dhcp_option (bp, size,GRUB_NET_BOOTP_EXTENSIONS_PATH , &opt_len);if (opt && opt_len)grub_env_set_net_property (name,"extensionspath" , (const char *) opt, opt_len); - + opt =find_dhcp_option (bp, size,GRUB_NET_BOOTP_CLIENT_ID , &opt_len);if (opt && opt_len)grub_env_set_net_property (name,"clientid" , (const char *) opt, opt_len);
@@ -825,7 +825,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),return grub_errno; } ifaces[j].address.type =GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV ; -grub_memcpy (&ifaces[j].hwaddress, &card->default_address, +grub_memcpy (&ifaces[j].hwaddress, &card->default_address,sizeof (ifaces[j].hwaddress)); ifaces[j].dhcp_tmo = ifaces[j].dhcp_tmo_left =1 ; j++;
grub-core/net/dns.c +5 -5
@@ -174,7 +174,7 @@ check_name_real (const grub_uint8_t *name_at, const grub_uint8_t *head, }if (readable_ptr &&grub_memcmp (ptr +1 , readable_ptr, *ptr) !=0 )return 0 ; -if (grub_memchr (ptr +1 ,0 , *ptr) +if (grub_memchr (ptr +1 ,0 , *ptr) ||grub_memchr (ptr +1 ,'.' , *ptr))return 0 ;if (readable_ptr)
@@ -232,7 +232,7 @@ enum DNS_CLASS_AAAA = 28 }; -static grub_err_t +static grub_err_t recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)),struct grub_net_buff *nb,void *data_)
@@ -261,7 +261,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)),grub_netbuff_free (nb);return GRUB_ERR_NONE ; } - +if (head->id != data->id) {grub_netbuff_free (nb);
@@ -615,7 +615,7 @@ grub_net_dns_lookup (const char *name,grub_netbuff_free (nb);for (j =0 ; j < send_servers; j++)grub_net_udp_close (sockets[j]); - +grub_free (sockets);if (*data.naddresses)
@@ -623,7 +623,7 @@ grub_net_dns_lookup (const char *name,if (data.dns_err)return grub_error (GRUB_ERR_NET_NO_DOMAIN ,N_ ("no DNS record found" )); - +if (err) { grub_errno = err;
grub-core/net/drivers/efi/efinet.c +1 -1
@@ -406,7 +406,7 @@ GRUB_MOD_FINI(efinet) {struct grub_net_card *card, *next; - FOR_NET_CARDS_SAFE (card, next) + FOR_NET_CARDS_SAFE (card, next)if (card->driver == &efidriver)grub_net_card_unregister (card); }
grub-core/net/drivers/emu/emunet.c +4 -4
@@ -25,21 +25,21 @@GRUB_MOD_LICENSE ("GPLv3+" ); -static grub_err_t +static grub_err_t send_card_buffer (struct grub_net_card *dev __attribute__ ((unused)),struct grub_net_buff *pack);static struct grub_net_buff *get_card_packet (struct grub_net_card *dev __attribute__ ((unused))); -static struct grub_net_card_driver emudriver = +static struct grub_net_card_driver emudriver = { .name ="emu" , .send = send_card_buffer, .recv = get_card_packet }; -static struct grub_net_card emucard = +static struct grub_net_card emucard = { .name ="emu0" , .driver = &emudriver,
@@ -51,7 +51,7 @@ static struct grub_net_card emucard = .flags = 0 }; -static grub_err_t +static grub_err_t send_card_buffer (struct grub_net_card *dev __attribute__ ((unused)),struct grub_net_buff *pack) {
grub-core/net/drivers/i386/pc/pxe.c +2 -2
@@ -248,7 +248,7 @@ grub_pxe_recv (struct grub_net_card *dev __attribute__ ((unused)))return buf; } -static grub_err_t +static grub_err_t grub_pxe_send (struct grub_net_card *dev __attribute__ ((unused)),struct grub_net_buff *pack) {
@@ -295,7 +295,7 @@ grub_pxe_open (struct grub_net_card *dev __attribute__ ((unused)))if (ou->status)return grub_error (GRUB_ERR_IO ,"can't open UNDI" );return GRUB_ERR_NONE ; -} +}struct grub_net_card_driver grub_pxe_card_driver = {
grub-core/net/drivers/ieee1275/ofnet.c +1 -1
@@ -546,7 +546,7 @@ GRUB_MOD_FINI(ofnet) {struct grub_net_card *card, *next; - FOR_NET_CARDS_SAFE (card, next) + FOR_NET_CARDS_SAFE (card, next)if (card->driver &&grub_strcmp (card->driver->name,"ofnet" ) ==0 )grub_net_card_unregister (card); grub_ieee1275_net_config =0 ;
grub-core/net/drivers/uboot/ubootnet.c +1 -1
@@ -155,7 +155,7 @@ GRUB_MOD_FINI (ubootnet) {struct grub_net_card *card, *next; - FOR_NET_CARDS_SAFE (card, next) + FOR_NET_CARDS_SAFE (card, next)if (card->driver &&grub_strcmp (card->driver->name,"ubnet" ) ==0 )grub_net_card_unregister (card); }
grub-core/net/ethernet.c +1 -1
@@ -45,7 +45,7 @@ struct llchdrstruct snaphdr { -grub_uint8_t oui[3 ]; +grub_uint8_t oui[3 ];grub_uint16_t type; }GRUB_PACKED ;
grub-core/net/http.c +5 -5
@@ -145,7 +145,7 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)return GRUB_ERR_NONE ; } -return GRUB_ERR_NONE ; +return GRUB_ERR_NONE ; } static void
@@ -205,7 +205,7 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),grub_net_tcp_close (data->sock,GRUB_NET_TCP_ABORT );return grub_errno; } - + data->current_line = t;grub_memcpy (data->current_line + data->current_line_len, nb->data, ptr - (char *) nb->data);
@@ -261,7 +261,7 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)), {grub_netbuff_free (nb);return GRUB_ERR_NONE ; - } + } err =grub_netbuff_pull (nb, ptr - (char *) nb->data);if (err) {
@@ -370,7 +370,7 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial) grub_strlen (file->device->net->server)); ptr = nb->tail; - err =grub_netbuff_put (nb, + err =grub_netbuff_put (nb,sizeof ("\r\nUser-Agent: " PACKAGE_STRING "\r\n" ) -1 );if (err)
@@ -578,7 +578,7 @@ http_packets_pulled (struct grub_file *file)return 0 ; } -static struct grub_net_app_protocol grub_http_protocol = +static struct grub_net_app_protocol grub_http_protocol = { .name ="http" , .open = http_open,
grub-core/net/icmp6.c +6 -6
@@ -225,7 +225,7 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,if (ohdr->len ==0 || ptr +8 * ohdr->len > nb->tail) {grub_netbuff_free (nb); -return GRUB_ERR_NONE ; +return GRUB_ERR_NONE ; }if (ohdr->type ==OPTION_SOURCE_LINK_LAYER_ADDRESS && ohdr->len ==1 )
@@ -329,7 +329,7 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,if (ohdr->len ==0 || ptr +8 * ohdr->len > nb->tail) {grub_netbuff_free (nb); -return GRUB_ERR_NONE ; +return GRUB_ERR_NONE ; }if (ohdr->type ==OPTION_TARGET_LINK_LAYER_ADDRESS && ohdr->len ==1 )
@@ -378,7 +378,7 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,if (ohdr->len ==0 || ptr +8 * ohdr->len > nb->tail) {grub_netbuff_free (nb); -return GRUB_ERR_NONE ; +return GRUB_ERR_NONE ; }if (ohdr->type ==OPTION_SOURCE_LINK_LAYER_ADDRESS && ohdr->len ==1 )
@@ -448,7 +448,7 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb, grub_errno =GRUB_ERR_NONE ;continue ; } - inf =grub_net_add_addr (name, + inf =grub_net_add_addr (name, card, &addr, &slaac->address,0 );if (!route_inf)
@@ -523,7 +523,7 @@ grub_net_icmp6_send_request (struct grub_net_network_level_interface *inf, multicast.ipv6[1 ] = (grub_be_to_cpu64_compile_time (0x01ff000000ULL ) | (proto_addr->ipv6[1 ] &grub_be_to_cpu64_compile_time (0xffffff ))); - + err =grub_net_link_layer_resolve (inf, &multicast, &ll_multicast);if (err)return err;
@@ -555,7 +555,7 @@ grub_net_icmp6_send_request (struct grub_net_network_level_interface *inf, ohdr = (struct option_header *) nb->data; ohdr->type =OPTION_SOURCE_LINK_LAYER_ADDRESS ; ohdr->len =1 ; - err =grub_netbuff_push (nb,sizeof (*sol)); + err =grub_netbuff_push (nb,sizeof (*sol));if (err) goto fail;
grub-core/net/ip.c +7 -7
@@ -157,7 +157,7 @@ send_fragmented (struct grub_net_network_level_interface * inf, iph->service =0 ; iph->len =grub_cpu_to_be16 (len +sizeof (struct iphdr )); iph->ident =grub_cpu_to_be16 (id); - iph->frags =grub_cpu_to_be16 (off | (((grub_ssize_t ) len + iph->frags =grub_cpu_to_be16 (off | (((grub_ssize_t ) len == nb->tail - nb->data) ?0 :MORE_FRAGMENTS )); iph->ttl =0xff ;
@@ -254,7 +254,7 @@ handle_dgram (struct grub_net_buff *nb,if (expected != chk) {grub_dprintf ("net" ,"Invalid UDP checksum. " -"Expected %x, got %x\n" , +"Expected %x, got %x\n" ,grub_be_to_cpu16 (expected),grub_be_to_cpu16 (chk));grub_netbuff_free (nb);
@@ -271,7 +271,7 @@ handle_dgram (struct grub_net_buff *nb, } bootp = (const struct grub_net_bootp_packet *) nb->data; - +FOR_NET_NETWORK_LEVEL_INTERFACES (inf) if (inf->card == card && inf->address.type == GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV
@@ -314,7 +314,7 @@ handle_dgram (struct grub_net_buff *nb, && hwaddress->type ==GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET && hwaddress->mac[0 ] ==0x33 && hwaddress->mac[1 ] ==0x33 && hwaddress->mac[2 ] ==0xff - && hwaddress->mac[3 ] == ((grub_be_to_cpu64 (inf->address.ipv6[1 ]) + && hwaddress->mac[3 ] == ((grub_be_to_cpu64 (inf->address.ipv6[1 ]) >>16 ) &0xff ) && hwaddress->mac[4 ] == ((grub_be_to_cpu64 (inf->address.ipv6[1 ]) >>8 ) &0xff )
@@ -325,7 +325,7 @@ handle_dgram (struct grub_net_buff *nb,break ; } } - + if (!inf && !(dest->type == GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6 && dest->ipv6[0] == grub_be_to_cpu64_compile_time (0xff02ULL << 48)
@@ -439,7 +439,7 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb, }if (actual_size < expected_size) { -grub_dprintf ("net" ,"Cut IP packet actual: %" PRIuGRUB_SIZE +grub_dprintf ("net" ,"Cut IP packet actual: %" PRIuGRUB_SIZE", expected %" PRIuGRUB_SIZE"\n" , actual_size, expected_size);grub_netbuff_free (nb);
@@ -701,7 +701,7 @@ grub_net_recv_ip6_packets (struct grub_net_buff *nb, }if (actual_size < expected_size) { -grub_dprintf ("net" ,"Cut IP packet actual: %" PRIuGRUB_SIZE +grub_dprintf ("net" ,"Cut IP packet actual: %" PRIuGRUB_SIZE", expected %" PRIuGRUB_SIZE"\n" , actual_size, expected_size);grub_netbuff_free (nb);
grub-core/net/net.c +21 -21
162 lines not on this page · raw message
grub-core/net/tcp.c +7 -7
@@ -376,7 +376,7 @@ grub_net_tcp_retransmit (void)if (unack->last_try > limit_time)continue ; - +if (unack->try_count >TCP_RETRANSMISSION_COUNT ) {error (sock);
@@ -581,7 +581,7 @@ grub_net_tcp_open (char *server,grub_error (GRUB_ERR_BUG ,"not an IP address" );return NULL ; } - + err =grub_net_route_address (addr, &gateway, &inf);if (err)return NULL ;
@@ -592,7 +592,7 @@ grub_net_tcp_open (char *server, socket =grub_zalloc (sizeof (*socket));if (socket ==NULL ) -return NULL ; +return NULL ; socket->out_port = out_port; socket->inf = inf;
@@ -657,7 +657,7 @@ grub_net_tcp_open (char *server, {int j; nb->data = nbd; - err =grub_net_send_ip_packet (socket->inf, &(socket->out_nla), + err =grub_net_send_ip_packet (socket->inf, &(socket->out_nla), &(socket->ll_target_addr), nb,GRUB_NET_IP_TCP );if (err)
@@ -667,7 +667,7 @@ grub_net_tcp_open (char *server,grub_netbuff_free (nb);return NULL ; } -for (j =0 ; (j <TCP_SYN_RETRANSMISSION_TIMEOUT /50 +for (j =0 ; (j <TCP_SYN_RETRANSMISSION_TIMEOUT /50 && !socket->established); j++)grub_net_poll_cards (50 , &socket->established);if (socket->established)
@@ -956,7 +956,7 @@ grub_net_recv_tcp_packet (struct grub_net_buff *nb,if (sock->fin_hook && just_closed) sock->fin_hook (sock, sock->hook_data); } - +return GRUB_ERR_NONE ; }if (grub_be_to_cpu16 (tcph->flags) &TCP_SYN )
@@ -971,7 +971,7 @@ grub_net_recv_tcp_packet (struct grub_net_buff *nb, sock =grub_zalloc (sizeof (*sock));if (sock ==NULL )return grub_errno; - + sock->out_port =grub_be_to_cpu16 (tcph->src); sock->in_port =grub_be_to_cpu16 (tcph->dst); sock->inf = inf;
grub-core/net/tftp.c +2 -2
@@ -157,7 +157,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), {case TFTP_OACK : data->block_size =TFTP_DEFAULTSIZE_PACKET ; - data->have_oack =1 ; + data->have_oack =1 ;for (ptr = nb->data +sizeof (tftph->opcode); ptr < nb->tail;) {if (grub_memcmp (ptr,"tsize\0" ,sizeof ("tsize\0" ) -1 ) ==0 )
@@ -460,7 +460,7 @@ tftp_packets_pulled (struct grub_file *file)return ack (data, data->block); } -static struct grub_net_app_protocol grub_tftp_protocol = +static struct grub_net_app_protocol grub_tftp_protocol = { .name ="tftp" , .open = tftp_open,
grub-core/net/udp.c +2 -2
@@ -79,7 +79,7 @@ grub_net_udp_open (grub_net_network_level_address_t addr,grub_error (GRUB_ERR_BUG ,"not an IP address" );return NULL ; } - + err =grub_net_route_address (addr, &gateway, &inf);if (err)return NULL ;
@@ -90,7 +90,7 @@ grub_net_udp_open (grub_net_network_level_address_t addr, socket =grub_zalloc (sizeof (*socket));if (socket ==NULL ) -return NULL ; +return NULL ; socket->out_port = out_port; socket->inf = inf;
Signature · 1 line
2.35.1
PATCH 13/21 normal: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/normal/auth.c | 2 +- grub-core/normal/charset.c | 56 ++++++++++++++--------------- grub-core/normal/cmdline.c | 2 +- grub-core/normal/context.c | 4 +-- grub-core/normal/crypto.c | 20 +++++------ grub-core/normal/main.c | 10 +++--- grub-core/normal/menu_entry.c | 14 ++++---- grub-core/normal/menu_text.c | 24 ++++++------- grub-core/normal/misc.c | 2 +- grub-core/normal/term.c | 66 +++++++++++++++++------------------ 10 files changed, 100 insertions(+), 100 deletions(-)
grub-core/normal/auth.c +1 -1
@@ -162,7 +162,7 @@ grub_username_get (char buf[], unsigned buf_size)while (1 ) { - key =grub_getkey (); + key =grub_getkey ();if (key =='\n' || key =='\r' )break ;
grub-core/normal/charset.c +28 -28
210 lines not on this page · raw message
grub-core/normal/cmdline.c +1 -1
@@ -167,7 +167,7 @@ print_completion (const char *item, grub_completion_type_t type, int count)if (count ==0 ) {/* If this is the first time, print a label. */ - +grub_puts ("" );switch (type) {
grub-core/normal/context.c +2 -2
@@ -168,11 +168,11 @@ grub_env_extractor_close (int source) {grub_menu_t menu2; menu2 =grub_env_get_menu (); - + last = &menu2->entry_list;while (*last) last = &(*last)->next; - + *last = menu->entry_list; menu2->size += menu->size; }
grub-core/normal/crypto.c +10 -10
@@ -33,7 +33,7 @@ struct load_specstatic struct load_spec *crypto_specs =NULL ; -static void +static void grub_crypto_autoload (const char *name) {struct load_spec *cur;
@@ -57,7 +57,7 @@ grub_crypto_autoload (const char *name) depth--; } -static void +static void grub_crypto_spec_free (void ) {struct load_spec *cur, *next;
@@ -85,7 +85,7 @@ read_crypto_list (const char *prefix) grub_errno =GRUB_ERR_NONE ;return ; } - + filename =grub_xasprintf ("%s/" GRUB_TARGET_CPU "-" GRUB_PLATFORM "/crypto.lst" , prefix);if (!filename)
@@ -109,12 +109,12 @@ read_crypto_list (const char *prefix) {char *p, *name;struct load_spec *cur; - + buf =grub_file_getline (file); - +if (! buf)break ; - + name = buf;while (grub_isspace (name[0 ])) name++;
@@ -122,7 +122,7 @@ read_crypto_list (const char *prefix) p =grub_strchr (name,':' );if (! p)continue ; - + *p ='\0' ; p++;while (*p ==' ' || *p =='\t' )
@@ -134,7 +134,7 @@ read_crypto_list (const char *prefix) grub_errno =GRUB_ERR_NONE ;continue ; } - + cur->name =grub_strdup (name);if (! cur->name) {
@@ -142,7 +142,7 @@ read_crypto_list (const char *prefix)grub_free (cur);continue ; } - + cur->modname =grub_strdup (p);if (! cur->modname) {
@@ -154,7 +154,7 @@ read_crypto_list (const char *prefix) cur->next = crypto_specs; crypto_specs = cur; } - +grub_file_close (file); grub_errno =GRUB_ERR_NONE ;
grub-core/normal/main.c +5 -5
@@ -206,17 +206,17 @@ grub_normal_init_page (struct grub_term_output *term,char *msg_formatted;grub_uint32_t *unicode_msg;grub_uint32_t *last_position; - +grub_term_cls (term); msg_formatted =grub_xasprintf (_ ("GNU GRUB version %s" ),PACKAGE_VERSION );if (!msg_formatted)return ; - + msg_len =grub_utf8_to_ucs4_alloc (msg_formatted, &unicode_msg, &last_position);grub_free (msg_formatted); - +if (msg_len <0 ) {return ;
@@ -399,7 +399,7 @@ grub_normal_reader_init (int nested)grub_putcode ('\n' , term); }grub_free (msg_formatted); - +return 0 ; }
@@ -431,7 +431,7 @@ grub_normal_read_line_real (char **line, int cont, int nested)return grub_errno; } } - + } static grub_err_t
grub-core/normal/menu_entry.c +7 -7
@@ -333,7 +333,7 @@ update_screen (struct screen *screen, struct per_term_screen *term_screen,while (y < term_screen->geo.num_entries);/* Draw up and down arrows. */ - +if (term_screen->geo.num_entries ==1 ) {if (up || down)
@@ -361,12 +361,12 @@ update_screen (struct screen *screen, struct per_term_screen *term_screen,for (i =0 ; i < screen->line; i++) y +=get_logical_num_lines (screen->lines + i, term_screen);if (cpos >= &(screen->lines[screen->line].pos[term_screen - screen->terms])[0 ]) -grub_term_gotoxy (term_screen->term, +grub_term_gotoxy (term_screen->term, (struct grub_term_coordinate ) { cpos->x + term_screen->geo.first_entry_x, cpos->y + y + term_screen->geo.first_entry_y });else -grub_term_gotoxy (term_screen->term, +grub_term_gotoxy (term_screen->term, (struct grub_term_coordinate ) { term_screen->geo.first_entry_x, y + term_screen->geo.first_entry_y });
@@ -659,14 +659,14 @@ backward_char (struct screen *screen, int update) linep = screen->lines + screen->line; screen->column--; - screen->column =grub_unicode_get_comb_start (linep->buf, + screen->column =grub_unicode_get_comb_start (linep->buf, linep->buf + screen->column) - linep->buf;grub_unicode_aglomerate_comb (screen->lines[screen->line].buf + screen->column, screen->lines[screen->line].len - screen->column, &glyph); - screen->column =grub_unicode_get_comb_start (linep->buf, + screen->column =grub_unicode_get_comb_start (linep->buf, linep->buf + screen->column) - linep->buf;
@@ -1028,12 +1028,12 @@ complete (struct screen *screen, int continuous, int update)return 1 ; insert =grub_normal_do_completion (u8, &restore, store_completion); - +if (completion_buffer.buf) { buflen =grub_strlen (completion_buffer.buf); ucs4 =grub_calloc (buflen +1 ,sizeof (grub_uint32_t)); - +if (!ucs4) {grub_print_error ();
grub-core/normal/menu_text.c +12 -12
@@ -35,8 +35,8 @@ struct menu_viewer_data {int first, offset;struct grub_term_screen_geometry geo; -enum { -TIMEOUT_UNKNOWN , +enum { +TIMEOUT_UNKNOWN ,TIMEOUT_NORMAL ,TIMEOUT_TERSE ,TIMEOUT_TERSE_NO_MARGIN
@@ -79,13 +79,13 @@ grub_print_message_indented_real (const char *msg, int margin_left,int ret =0 ; unicode_msg =grub_calloc (msg_len,sizeof (grub_uint32_t)); - +if (!unicode_msg)return 0 ; msg_len =grub_utf8_to_ucs4 (unicode_msg, msg_len, (grub_uint8_t *) msg,-1 ,0 ); - + last_position = unicode_msg + msg_len; *last_position =0 ;
@@ -193,7 +193,7 @@ command-line or ESC to discard edits and return to the GRUB menu."),"`e' to edit the commands before booting " "or `c' for a command-line."), STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run); - } + } }return ret; }
@@ -233,7 +233,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry, ? GRUB_TERM_COLOR_HIGHLIGHT : GRUB_TERM_COLOR_NORMAL); -grub_term_gotoxy (data->term, (struct grub_term_coordinate ) { +grub_term_gotoxy (data->term, (struct grub_term_coordinate ) { data->geo.first_entry_x, y });for (i =0 ; i < len; i++)
@@ -253,7 +253,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,grub_term_setcolorstate (data->term,GRUB_TERM_COLOR_NORMAL );grub_term_gotoxy (data->term, - (struct grub_term_coordinate ) { + (struct grub_term_coordinate ) {grub_term_cursor_x (&data->geo), y }); grub_term_normal_color = old_color_normal;
@@ -270,7 +270,7 @@ print_entries (grub_menu_t menu, const struct menu_viewer_data *data)int i;grub_term_gotoxy (data->term, - (struct grub_term_coordinate ) { + (struct grub_term_coordinate ) { data->geo.first_entry_x + data->geo.entry_width + data->geo.border +1 , data->geo.first_entry_y });
@@ -472,7 +472,7 @@ menu_text_print_timeout (int timeout, void *dataptr)grub_free (msg_translated);grub_term_gotoxy (data->term, - (struct grub_term_coordinate ) { + (struct grub_term_coordinate ) {grub_term_cursor_x (&data->geo), data->geo.first_entry_y + data->offset });grub_term_refresh (data->term);
@@ -537,7 +537,7 @@ menu_text_clear_timeout (void *dataptr)if (data->geo.num_entries <=5 && !data->geo.border) { grub_term_gotoxy (data->term, - (struct grub_term_coordinate) { + (struct grub_term_coordinate) { data->geo.first_entry_x + data->geo.entry_width + data->geo.border + 1, data->geo.first_entry_y + data->geo.num_entries - 1
@@ -555,8 +555,8 @@ menu_text_clear_timeout (void *dataptr)grub_term_refresh (data->term); } -grub_err_t -grub_menu_try_text (struct grub_term_output *term, +grub_err_t +grub_menu_try_text (struct grub_term_output *term,int entry,grub_menu_t menu,int nested) {struct menu_viewer_data *data;
grub-core/normal/misc.c +1 -1
@@ -39,7 +39,7 @@ static const char *grub_human_sizes[3][6] =/* TRANSLATORS: that's the list of binary unit prefixes. */ { "", N_("K"), N_("M"), N_("G"), N_("T"), N_("P") },/* TRANSLATORS: that's the list of binary unit prefixes. */ - { N_("B/s"), N_("KiB/s"), N_("MiB/s"), N_("GiB/s"), N_("TiB/s"), N_("PiB/s"), }, + { N_("B/s"), N_("KiB/s"), N_("MiB/s"), N_("GiB/s"), N_("TiB/s"), N_("PiB/s"), }, }; const char *
grub-core/normal/term.c +33 -33
224 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 14/21 osdep: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/osdep/aros/getroot.c | 2 +- grub-core/osdep/aros/hostdisk.c | 2 +- grub-core/osdep/basic/compress.c | 6 +++--- grub-core/osdep/basic/platform.c | 2 +- grub-core/osdep/bsd/getroot.c | 2 +- grub-core/osdep/devmapper/hostdisk.c | 2 +- grub-core/osdep/freebsd/getroot.c | 10 +++++----- grub-core/osdep/haiku/getroot.c | 2 +- grub-core/osdep/haiku/hostdisk.c | 2 +- grub-core/osdep/linux/blocklist.c | 2 +- grub-core/osdep/linux/getroot.c | 8 ++++---- grub-core/osdep/unix/compress.c | 6 +++--- grub-core/osdep/unix/cputime.c | 2 +- grub-core/osdep/unix/exec.c | 2 +- grub-core/osdep/unix/getroot.c | 6 +++--- grub-core/osdep/unix/platform.c | 6 +++--- grub-core/osdep/unix/relpath.c | 2 +- grub-core/osdep/windows/getroot.c | 10 +++++----- grub-core/osdep/windows/hostdisk.c | 8 ++++---- grub-core/osdep/windows/init.c | 2 +- grub-core/osdep/windows/password.c | 4 ++-- grub-core/osdep/windows/platform.c | 4 ++-- 22 files changed, 46 insertions(+), 46 deletions(-)
grub-core/osdep/aros/getroot.c +1 -1
@@ -193,7 +193,7 @@ grub_guess_root_devices (const char *path) os_dev =xmalloc (2 *sizeof (os_dev[0 ])); sz =strlen (nm); - + os_dev[0 ] =xmalloc (sz +4 ); os_dev[0 ][0 ] ='/' ; os_dev[0 ][1 ] ='/' ;
grub-core/osdep/aros/hostdisk.c +1 -1
@@ -572,7 +572,7 @@ get_temp_name (void)static int ctr =0 ;char *t;struct stat st; - +while (1 ) { t = xasprintf ("T:grub.%d.%d.%d.%d", (int) getpid (), (int) getppid (),
grub-core/osdep/basic/compress.c +3 -3
@@ -2,19 +2,19 @@#include <grub/util/install.h> #include <grub/util/misc.h> -int +int grub_install_compress_gzip (const char *src,const char *dest) {grub_util_error (_ ("no compression is available for your platform" )); } -int +int grub_install_compress_xz (const char *src,const char *dest) {grub_util_error (_ ("no compression is available for your platform" )); } -int +int grub_install_compress_lzop (const char *src,const char *dest) {grub_util_error (_ ("no compression is available for your platform" ));
grub-core/osdep/basic/platform.c +1 -1
@@ -26,7 +26,7 @@ grub_install_get_default_arm_platform (void)const char *grub_install_get_default_x86_platform (void ) -{ +{return "i386-pc" ; }
grub-core/osdep/bsd/getroot.c +1 -1
@@ -193,7 +193,7 @@ grub_util_find_partition_start_os (const char *dev) p_index = dev[strlen (dev) -1 ] -'a' ; else p_index =-1 ; - +if (p_index >= label.d_npartitions || p_index <0 ) { grub_error (GRUB_ERR_BAD_DEVICE,
grub-core/osdep/devmapper/hostdisk.c +1 -1
@@ -122,7 +122,7 @@ grub_util_get_dm_node_linear_info (dev_t dev, dmt =dm_task_create (DM_DEVICE_TABLE );if (!dmt)break ; - +if (! (dm_task_set_major_minor (dmt, major, minor,0 ))) {dm_task_destroy (dmt);
grub-core/osdep/freebsd/getroot.c +5 -5
@@ -85,7 +85,7 @@ grub_util_get_geom_abstraction (const char *dev) {struct ggeom *geom; LIST_FOREACH (geom, &class->lg_geom, lg_geom) - { + {struct gprovider *provider;LIST_FOREACH (provider, &geom->lg_provider, lg_provider) if (strcmp (provider->lg_name, name) == 0)
@@ -167,7 +167,7 @@ grub_util_pull_device_os (const char *os_dev, {struct ggeom *geom; LIST_FOREACH (geom, &class->lg_geom, lg_geom) - { + {struct gprovider *provider;LIST_FOREACH (provider, &geom->lg_provider, lg_provider) if (strcmp (provider->lg_name, name) == 0)
@@ -261,7 +261,7 @@ grub_util_get_grub_dev_os (const char *os_dev) {struct ggeom *geom; LIST_FOREACH (geom, &class->lg_geom, lg_geom) - { + {struct gprovider *provider;LIST_FOREACH (provider, &geom->lg_provider, lg_provider) if (strcmp (provider->lg_name, name) == 0)
@@ -289,7 +289,7 @@ grub_util_get_grub_dev_os (const char *os_dev) }break ; -default : +default :break ; }
@@ -325,7 +325,7 @@ grub_util_follow_gpart_up (const char *name, grub_disk_addr_t *off_out, char **ngrub_util_error ("%s" ,_ ("couldn't find geom `part' class" )); LIST_FOREACH (geom, &class->lg_geom, lg_geom) - { + {struct gprovider *provider;LIST_FOREACH (provider, &geom->lg_provider, lg_provider) if (strcmp (provider->lg_name, name) == 0)
grub-core/osdep/haiku/getroot.c +1 -1
@@ -66,7 +66,7 @@ grub_util_find_partition_start_os (const char *dev)if (ioctl (fd,B_GET_GEOMETRY , &geo,sizeof (geo)) <0 )return 0 ; ret /= geo.bytes_per_sector ? :512 ; -close (fd); +close (fd);return ret; }
grub-core/osdep/haiku/hostdisk.c +1 -1
@@ -52,7 +52,7 @@ grub_util_get_fd_size_os (grub_util_fd_t fd, {device_geometry part;unsigned lg; -if (ioctl (fd,B_GET_GEOMETRY , &part,sizeof (part)) <0 ) +if (ioctl (fd,B_GET_GEOMETRY , &part,sizeof (part)) <0 )return -1 ;for (lg =0 ; (1 << lg) < part.bytes_per_sector; lg++);if (log_secsize)
grub-core/osdep/linux/blocklist.c +1 -1
@@ -95,7 +95,7 @@ grub_install_get_blocklist (grub_device_t root_dev,if (ioctl (fd,FIBMAP , &blk) <0 )grub_util_error (_ ("can't retrieve blocklists: %s" ),strerror (errno)); - + rest = core_size - ((i * mul) <<GRUB_DISK_SECTOR_BITS );if (rest <=0 )break ;
grub-core/osdep/linux/getroot.c +4 -4
@@ -278,12 +278,12 @@ get_btrfs_fs_prefix (const char *mount_path)char *ret =NULL ; fd =open (mount_path,O_RDONLY ); - +if (fd <0 )return NULL ;memset (&args,0 ,sizeof (args)); args.objectid =GRUB_BTRFS_TREE_ROOT_OBJECTID ; - +if (ioctl (fd,BTRFS_IOC_INO_LOOKUP , &args) <0 ) goto fail; tree_id = args.treeid;
@@ -620,7 +620,7 @@ get_mdadm_uuid (const char *os_dev)if (strncmp (buf,"MD_UUID=" ,sizeof ("MD_UUID=" ) -1 ) ==0 ) {char *name_start, *ptri, *ptro; - +free (name); name_start = buf +sizeof ("MD_UUID=" ) -1 ; ptro = name =xmalloc (strlen (name_start) +1 );
@@ -708,7 +708,7 @@ grub_util_is_imsm (const char *os_dev) sizeof ("MD_METADATA=imsm") - 1) == 0) { is_imsm =1 ; -grub_util_info ("%s is imsm" , dev); +grub_util_info ("%s is imsm" , dev);break ; } }
grub-core/osdep/unix/compress.c +3 -3
@@ -19,21 +19,21 @@#include <grub/emu/exec.h> #include <grub/util/install.h> -int +int grub_install_compress_gzip (const char *src,const char *dest) {return grub_util_exec_redirect ((const char * []) {"gzip" ,"--best" ,"--stdout" ,NULL }, src, dest); } -int +int grub_install_compress_xz (const char *src,const char *dest) {return grub_util_exec_redirect ((const char * []) {"xz" ,"--lzma2=dict=128KiB" ,"--check=none" ,"--stdout" ,NULL }, src, dest); } -int +int grub_install_compress_lzop (const char *src,const char *dest) { return grub_util_exec_redirect ((const char * []) { "lzop", "-9", "-c",
grub-core/osdep/unix/cputime.c +1 -1
@@ -17,6 +17,6 @@ grub_util_get_cpu_time_ms (void) sc_clk_tck =1000 ; } -times (&tm); +times (&tm);return (tm.tms_utime *1000ULL ) / sc_clk_tck; }
grub-core/osdep/unix/exec.c +1 -1
@@ -88,7 +88,7 @@ grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file, {int fd;/* Child. */ - +/* Close fd's. */ #ifdef GRUB_UTIL grub_util_devmapper_cleanup ();
grub-core/osdep/unix/getroot.c +3 -3
@@ -257,7 +257,7 @@ grub_util_find_root_devices_from_poolname (char *poolname) ret =getline (&line, &len, fp);if (ret ==-1 )break ; - +if (sscanf (line," %s %256s %256s %256s %256s %256s" , name, state, readlen, writelen, cksum, notes) >=5 ) switch (st)
@@ -305,7 +305,7 @@ grub_util_find_root_devices_from_poolname (char *poolname) }break ; } - +free (line); }
@@ -449,7 +449,7 @@ grub_find_device (const char *dir, dev_t dev) cwd =xgetcwd (); res =xmalloc (strlen (cwd) +strlen (ent->d_name) +3 ); - sprintf (res, + sprintf (res,#if defined(__NetBSD__) || defined(__OpenBSD__)/* Convert this block device to its character (raw) device. */ "%s/r%s",
grub-core/osdep/unix/platform.c +3 -3
@@ -164,13 +164,13 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, ret =grub_util_exec ((const char * []){"efibootmgr" ,"-q" ,"-c" ,"-d" , efidir_disk,"-p" , efidir_part_str,"-w" , -"-L" , efi_distributor,"-l" , +"-L" , efi_distributor,"-l" , efifile_path,NULL }); else ret =grub_util_exec ((const char * []){"efibootmgr" ,"-c" ,"-d" , efidir_disk,"-p" , efidir_part_str,"-w" , -"-L" , efi_distributor,"-l" , +"-L" , efi_distributor,"-l" , efifile_path,NULL });free (efidir_part_str);return ret;
@@ -235,7 +235,7 @@ grub_install_sgi_setup (const char *install_device, const char *imgfile, const char *destname) { grub_util_exec ((const char * []){ "dvhtool", "-d", - install_device, "--unix-to-vh", + install_device, "--unix-to-vh", imgfile, destname, NULL });grub_util_warn ("%s" ,_ ("You will have to set `SystemPartition' and `OSLoader' manually." )); }
grub-core/osdep/unix/relpath.c +1 -1
@@ -128,7 +128,7 @@ grub_make_system_path_relative_to_its_root (const char *path)free (buf); buf3 =xstrdup (buf2 + offset); buf2[offset] =0 ; - +free (buf2);/* Remove trailing slashes, return empty string if root directory. */
grub-core/osdep/windows/getroot.c +5 -5
@@ -119,16 +119,16 @@ grub_guess_root_devices (const char *dir) {free (dirwindows);grub_util_info ("can't get volume path name: %d" , (int )GetLastError ()); -return 0 ; +return 0 ; }if (!mntpointwindows[0 ]) {free (dirwindows);free (mntpointwindows); -return 0 ; +return 0 ; } - +for (ptr = mntpointwindows; *ptr; ptr++);if (*(ptr -1 ) !='\\' ) {
@@ -255,7 +255,7 @@ grub_util_part_to_disk (const char *os_dev,free (name);return ret; } - +CloseHandle (hd); *is_part =1 ;
@@ -323,7 +323,7 @@ grub_util_find_partition_start_os (const char *os_dev)free (name);return 0 ; } - +CloseHandle (hd);free (name);return exts.Extents[0 ].StartingOffset.QuadPart /512 ;
grub-core/osdep/windows/hostdisk.c +4 -4
@@ -351,7 +351,7 @@ grub_canonicalize_file_name (const char *path)return NULL ; ret =grub_util_tchar_to_utf8 (windows_path);free (windows_path); - +return ret; }
@@ -359,7 +359,7 @@ void grub_util_mkdir (const char *dir) {LPTSTR windows_name; - + windows_name =grub_util_get_windows_path (dir);CreateDirectory (windows_name,NULL );free (windows_name);
@@ -522,7 +522,7 @@ get_temp_name (void) *ptr++ ='0' + r; else *ptr++ = 'a' + (r - 10); - } + } *ptr ='\0' ;return grub_util_tchar_to_utf8 (rt);
@@ -606,7 +606,7 @@ grub_util_get_mtime (const char *path) us_ul.LowPart = attr.ftLastWriteTime.dwLowDateTime; us_ul.HighPart = attr.ftLastWriteTime.dwHighDateTime; -return (us_ul.QuadPart /10000000 ) +return (us_ul.QuadPart /10000000 ) -86400ULL *365 * (1970 -1601 ) -86400ULL * ((1970 -1601 ) /4 ) +86400ULL * ((1970 -1601 ) /100 ); }
grub-core/osdep/windows/init.c +1 -1
@@ -164,7 +164,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)), *argv =xcalloc (*argc +1 ,sizeof (argv[0 ]));for (i =0 ; i < *argc; i++) - (*argv)[i] =grub_util_tchar_to_utf8 (targv[i]); + (*argv)[i] =grub_util_tchar_to_utf8 (targv[i]); (*argv)[i] =NULL ;#else #error "Unsupported TCHAR size"
grub-core/osdep/windows/password.c +2 -2
@@ -29,12 +29,12 @@int grub_password_get (char buf[],unsigned buf_size) { -HANDLE hStdin =GetStdHandle (STD_INPUT_HANDLE ); +HANDLE hStdin =GetStdHandle (STD_INPUT_HANDLE );DWORD mode =0 ;char *ptr;grub_refresh (); - +GetConsoleMode (hStdin, &mode);SetConsoleMode (hStdin, mode & (~ENABLE_ECHO_INPUT ));
grub-core/osdep/windows/platform.c +2 -2
@@ -104,14 +104,14 @@ get_platform (void) { platform =PLAT_BIOS ;return ; - } + } platform =PLAT_EFI ;return ; }const char *grub_install_get_default_x86_platform (void ) -{ +{SYSTEM_INFO si;get_platform ();
Signature · 1 line
2.35.1
PATCH 15/21 partmap: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/partmap/bsdlabel.c | 4 ++-- grub-core/partmap/dvh.c | 4 ++-- grub-core/partmap/msdos.c | 4 ++-- grub-core/partmap/sun.c | 2 +- grub-core/partmap/sunpc.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
grub-core/partmap/bsdlabel.c +2 -2
@@ -132,14 +132,14 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,return iterate_real (disk,GRUB_PC_PARTITION_BSD_LABEL_SECTOR ,1 , &grub_bsdlabel_partition_map, hook, hook_data); -if (disk->partition +if (disk->partition && (grub_strcmp (disk->partition->partmap->name,"msdos" ) ==0 || disk->partition->partmap == &grub_bsdlabel_partition_map || disk->partition->partmap == &grub_netbsdlabel_partition_map || disk->partition->partmap == &grub_openbsdlabel_partition_map))return grub_error (GRUB_ERR_BAD_PART_TABLE ,"no embedding supported" ); -return iterate_real (disk,GRUB_PC_PARTITION_BSD_LABEL_SECTOR ,0 , +return iterate_real (disk,GRUB_PC_PARTITION_BSD_LABEL_SECTOR ,0 , &grub_bsdlabel_partition_map, hook, hook_data); }
grub-core/partmap/dvh.c +2 -2
@@ -33,7 +33,7 @@ struct grub_dvh_partition_descriptor {grub_uint32_t length;grub_uint32_t start; -grub_uint32_t type; +grub_uint32_t type; }GRUB_PACKED ;struct grub_dvh_block
@@ -86,7 +86,7 @@ dvh_partition_map_iterate (grub_disk_t disk,if (!grub_dvh_is_valid (block.raw))return grub_error (GRUB_ERR_BAD_PART_TABLE ,"invalid checksum" ); - +/* Maybe another error value would be better, because partition table _is_ recognized but invalid. */ for (partnum =0 ; partnum <ARRAY_SIZE (block.dvh.parts); partnum++)
grub-core/partmap/msdos.c +2 -2
@@ -55,7 +55,7 @@ const char message_warn[][200] = {" avoiding it. " "This software may cause boot or other problems in " "future. Please ask its authors not to store data " - "in the boot track") + "in the boot track") };
@@ -312,7 +312,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,if (grub_msdos_partition_is_extended (e->type)) { - offset = ext_offset + offset = ext_offset + ((grub_disk_addr_t )grub_le_to_cpu32 (e->start) << (disk->log_sector_size -GRUB_DISK_SECTOR_BITS ));if (! ext_offset)
grub-core/partmap/sun.c +1 -1
@@ -108,7 +108,7 @@ sun_partition_map_iterate (grub_disk_t disk,if (!grub_sun_is_valid (block.raw))return grub_error (GRUB_ERR_BAD_PART_TABLE ,"invalid checksum" ); - +/* Maybe another error value would be better, because partition table _is_ recognized but invalid. */ for (partnum =0 ; partnum <GRUB_PARTMAP_SUN_MAX_PARTS ; partnum++)
grub-core/partmap/sunpc.c +2 -2
@@ -91,11 +91,11 @@ sun_pc_partition_map_iterate (grub_disk_t disk,grub_free (p);return err; } - +if (GRUB_PARTMAP_SUN_PC_MAGIC !=grub_le_to_cpu16 (block.sun_block.magic)) {grub_free (p); -return grub_error (GRUB_ERR_BAD_PART_TABLE , +return grub_error (GRUB_ERR_BAD_PART_TABLE ,"not a sun_pc partition table" ); }
Signature · 1 line
2.35.1
PATCH 16/21 script: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/script/execute.c | 2 +- grub-core/script/lexer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
grub-core/script/execute.c +1 -1
@@ -788,7 +788,7 @@ cleanup:grub_free (expansions[j]); }grub_free (expansions); - +if (failed) {grub_script_argv_free (&unexpanded);
grub-core/script/lexer.c +1 -1
@@ -303,7 +303,7 @@ grub_script_yylex (union YYSTYPE *value,if (lexerstate->eof)return GRUB_PARSER_TOKEN_EOF ; -/* +/* * Words with environment variables, like foo${bar}baz needs * multiple tokens to be merged into a single grub_script_arg. We * use two variables to achieve this: lexerstate->merge_start and
Signature · 1 line
2.35.1
PATCH 17/21 term: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/term/arc/console.c | 2 +- grub-core/term/gfxterm.c | 30 ++++---- grub-core/term/gfxterm_background.c | 4 +- grub-core/term/i386/pc/console.c | 16 ++--- grub-core/term/ieee1275/console.c | 2 +- grub-core/term/ieee1275/escc.c | 2 +- grub-core/term/ieee1275/serial.c | 2 +- grub-core/term/ns8250.c | 2 +- grub-core/term/ps2.c | 106 ++++++++++++++-------------- grub-core/term/serial.c | 6 +- grub-core/term/terminfo.c | 12 ++-- grub-core/term/uboot/console.c | 2 +- grub-core/term/usb_keyboard.c | 16 ++--- 13 files changed, 101 insertions(+), 101 deletions(-)
grub-core/term/arc/console.c +1 -1
@@ -122,7 +122,7 @@ check_is_serial (void)return is_serial =0 ;return is_serial =grub_arc_is_device_serial (consout,0 ); } - +static void set_console_dimensions (void ) {
grub-core/term/gfxterm.c +15 -15
@@ -306,10 +306,10 @@ grub_gfxterm_set_window (struct grub_video_render_target *target, render_target = target;/* Create virtual screen. */ -if (grub_virtual_screen_setup (border_width, border_width, - width -2 * border_width, - height -2 * border_width, - font) +if (grub_virtual_screen_setup (border_width, border_width, + width -2 * border_width, + height -2 * border_width, + font) !=GRUB_ERR_NONE ) {return grub_errno;
@@ -439,9 +439,9 @@ redraw_screen_rect (unsigned int x, unsigned int y,grub_video_set_active_render_target (render_target);/* Save viewport and set it to our window. */ -grub_video_get_viewport ((unsigned *) &saved_view.x, - (unsigned *) &saved_view.y, - (unsigned *) &saved_view.width, +grub_video_get_viewport ((unsigned *) &saved_view.x, + (unsigned *) &saved_view.y, + (unsigned *) &saved_view.width, (unsigned *) &saved_view.height);grub_video_set_viewport (window.x, window.y, window.width, window.height);
@@ -679,7 +679,7 @@ draw_cursor (int show)unsigned int height;unsigned int ascent;grub_video_color_t color; - +write_char ();if (!show)
@@ -702,12 +702,12 @@ draw_cursor (int show) * virtual_screen.normal_char_height + ascent); height =2 ; - +/* Render cursor to text layer. */ grub_video_set_active_render_target (text_layer);grub_video_fill_rect (color, x, y, width, height);grub_video_set_active_render_target (render_target); - +/* Mark cursor to be redrawn. */ dirty_region_add (virtual_screen.offset_x + x, virtual_screen.offset_y + y,
@@ -751,9 +751,9 @@ real_scroll (void)while (i--) {/* Save viewport and set it to our window. */ -grub_video_get_viewport ((unsigned *) &saved_view.x, - (unsigned *) &saved_view.y, - (unsigned *) &saved_view.width, +grub_video_get_viewport ((unsigned *) &saved_view.x, + (unsigned *) &saved_view.y, + (unsigned *) &saved_view.width, (unsigned *) &saved_view.height); grub_video_set_viewport (window.x, window.y, window.width,
@@ -818,7 +818,7 @@ scroll_up (void)/* Clear first line in text buffer. */ for (i =0 ; i < virtual_screen.columns; i++)grub_unicode_destroy_glyph (&virtual_screen.text_buffer[i].code); - +/* Scroll text buffer with one line to up. */ grub_memmove (virtual_screen.text_buffer, virtual_screen.text_buffer + virtual_screen.columns,
@@ -904,7 +904,7 @@ grub_gfxterm_putchar (struct grub_term_output *term, {unsigned i; -for (i =1 ; i < char_width && p + i < +for (i =1 ; i < char_width && p + i < virtual_screen.text_buffer + virtual_screen.columns * virtual_screen.rows; i++) {
grub-core/term/gfxterm_background.c +2 -2
@@ -43,7 +43,7 @@ enumstatic const struct grub_arg_option background_image_cmd_options[] = { {"mode" ,'m' ,0 ,N_ ("Background image mode." ), -/* TRANSLATORS: This refers to background image mode (stretched or +/* TRANSLATORS: This refers to background image mode (stretched or in left-top corner). Note that GRUB will accept only original keywords stretch and normal, not the translated ones. So please put both in translation
@@ -100,7 +100,7 @@ grub_gfxterm_background_image_cmd (grub_extcmd_context_t ctxt, {struct grub_video_bitmap *scaled_bitmap;grub_video_bitmap_create_scaled (&scaled_bitmap, - width, + width, height, grub_gfxterm_background.bitmap,GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST );
grub-core/term/i386/pc/console.c +8 -8
@@ -32,7 +32,7 @@ int10_9 (grub_uint8_t ch, grub_uint16_t n) regs.eax = ch |0x0900 ; regs.ebx = grub_console_cur_color &0xff ; regs.ecx = n; - regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ; + regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s); }
@@ -54,7 +54,7 @@ grub_console_getxy (struct grub_term_output *term __attribute__ ((unused))) regs.eax =0x0300 ; regs.ebx =0 ; - regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ; + regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s);return (struct grub_term_coordinate ) {
@@ -78,7 +78,7 @@ grub_console_gotoxy (struct grub_term_output *term __attribute__ ((unused)), regs.ebx =0 ; regs.eax =0x0200 ; regs.edx = (pos.y <<8 ) | pos.x; - regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ; + regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s); }
@@ -101,14 +101,14 @@ grub_console_putchar_real (grub_uint8_t c) { regs.eax = c |0x0e00 ; regs.ebx =0x0001 ; - regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ; + regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s);return ; }/* get the current position */ pos =grub_console_getxy (NULL ); - +/* write the character with the attribute */ int10_9 (c,1 );
@@ -158,7 +158,7 @@ grub_console_cls (struct grub_term_output *term)* %ch = cursor starting scanline * %cl = cursor ending scanline */ -static void +static void grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),int on) {
@@ -170,7 +170,7 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)), { regs.eax =0x0300 ; regs.ebx =0 ; - regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ; + regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s); console_cursor_shape = regs.ecx;if ((console_cursor_shape >>8 ) >= (console_cursor_shape &0xff ))
@@ -179,7 +179,7 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),/* set %cx to the designated cursor shape */ regs.ecx = on ? console_cursor_shape :0x2000 ; regs.eax =0x0100 ; - regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ; + regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s); }
grub-core/term/ieee1275/console.c +1 -1
@@ -88,7 +88,7 @@ grub_console_dimensions (void) val, sizeof (val) - 1, 0)) { grub_ieee1275_ihandle_t stdout_options; - val[sizeof (val) - 1] = 0; + val[sizeof (val) - 1] = 0; if (! grub_ieee1275_finddevice (val, &stdout_options) && ! grub_ieee1275_get_property (stdout_options, "device_type",
grub-core/term/ieee1275/escc.c +1 -1
@@ -90,7 +90,7 @@ do_real_config (struct grub_serial_port *port)break ;case GRUB_SERIAL_STOP_BITS_2 : parity_stop_spec |=0xc ; -break ; +break ; } *port->escc_desc->escc_ctrl =4 ;
grub-core/term/ieee1275/serial.c +1 -1
@@ -276,7 +276,7 @@ grub_ofserial_init (void)dev_iterate_real (&alias,1 );grub_ieee1275_devices_iterate (dev_iterate); - +for (i =0 ; i <ARRAY_SIZE (ofserial_hash); i++) {struct ofserial_hash_ent *ent;
grub-core/term/ns8250.c +1 -1
@@ -312,7 +312,7 @@ grub_serial_ns8250_add_port (grub_port_t port) p->driver = &grub_ns8250_driver;grub_serial_config_defaults (p); p->port = port; -grub_serial_register (p); +grub_serial_register (p);return p->name; }
grub-core/term/ps2.c +53 -53
146 lines not on this page · raw message
grub-core/term/serial.c +3 -3
@@ -79,7 +79,7 @@ struct grub_serial_input_statestruct grub_serial_port *port; }; -static void +static void serial_put (grub_term_output_t term,const int c) {struct grub_serial_output_state *data = term->data;
@@ -214,7 +214,7 @@ grub_cmd_serial (grub_extcmd_context_t ctxt, int argc, char **args) port =grub_serial_find (name);if (!port) -return grub_error (GRUB_ERR_BAD_ARGUMENT , +return grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("serial port `%s' isn't found" ), name);
@@ -400,7 +400,7 @@ grub_serial_unregister (struct grub_serial_port *port) {if (port->driver->fini) port->driver->fini (port); - +if (port->term_in)grub_term_unregister_input (port->term_in);if (port->term_out)
grub-core/term/terminfo.c +6 -6
@@ -286,7 +286,7 @@ grub_terminfo_setcolorstate (struct grub_term_output *term,int fg;int bg;/* Map from VGA to terminal colors. */ -const int colormap[8 ] +const int colormap[8 ] = {0 ,/* Black. */ 4 ,/* Blue. */ 2 ,/* Green. */
@@ -479,10 +479,10 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, int ma [23] = GRUB_TERM_KEY_F11, [24] = GRUB_TERM_KEY_F12, }; -char fx_key[] = +char fx_key[] = {'P' ,'Q' ,'w' ,'x' ,'t' ,'u' ,'q' ,'r' ,'p' ,'M' ,'A' ,'B' ,'H' ,'F' }; -unsigned fx_code[] = +unsigned fx_code[] = {GRUB_TERM_KEY_F1 ,GRUB_TERM_KEY_F2 ,GRUB_TERM_KEY_F3 ,GRUB_TERM_KEY_F4 ,GRUB_TERM_KEY_F5 ,GRUB_TERM_KEY_F6 ,GRUB_TERM_KEY_F7 ,GRUB_TERM_KEY_F8 ,GRUB_TERM_KEY_F9 ,
@@ -512,7 +512,7 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, int ma }CONTINUE_READ ; - +for (i =0 ; i <ARRAY_SIZE (three_code_table); i++)if (three_code_table[i].key == c) {
@@ -562,7 +562,7 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, int ma keys[0 ] = fx_code[num -1 ]; *len =1 ;return ; - } + } case '1' ... '9': {
@@ -662,7 +662,7 @@ grub_terminfo_output_init (struct grub_term_output *term)static grub_err_t print_terminfo (void ) { -const char *encoding_names[(GRUB_TERM_CODE_TYPE_MASK +const char *encoding_names[(GRUB_TERM_CODE_TYPE_MASK >>GRUB_TERM_CODE_TYPE_SHIFT ) +1 ] = {/* VGA and glyph descriptor types are just for completeness,
grub-core/term/uboot/console.c +1 -1
@@ -110,7 +110,7 @@ grub_console_init_early (void)* grub_console_init_lately(): * Initializes terminfo formatting by registering terminal type. * Called after heap has been configured. -* +* */ void grub_console_init_lately (void )
grub-core/term/usb_keyboard.c +8 -8
@@ -162,7 +162,7 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)if (curnum ==ARRAY_SIZE (grub_usb_keyboards))return 0 ; -if (usbdev->descdev.class !=0 +if (usbdev->descdev.class !=0 || usbdev->descdev.subclass !=0 || usbdev->descdev.protocol !=0 )return 0 ;
@@ -199,7 +199,7 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)/* Configure device */ grub_usb_set_configuration (usbdev, configno +1 ); - +/* Place the device in boot mode. */ grub_usb_control_msg (usbdev,GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT ,USB_HID_SET_PROTOCOL ,0 , interfno,0 ,0 );
@@ -291,7 +291,7 @@ parse_keycode (struct grub_usb_keyboard_data *termdata)for ( ; index < termdata->max_index; index++) { keycode = termdata->current_report[index]; - +if (keycode ==KEY_NO_KEY || keycode ==KEY_ERR_BUFFER || keycode == KEY_ERR_POST
@@ -316,7 +316,7 @@ parse_keycode (struct grub_usb_keyboard_data *termdata)/* Keycode is in last report, it means it was not released, * ignore it. */ continue ; - +if (keycode ==KEY_CAPS_LOCK ) { termdata->mods ^=GRUB_TERM_STATUS_CAPS ;
@@ -367,7 +367,7 @@ grub_usb_keyboard_getkey (struct grub_term_input *term) keycode =parse_keycode (termdata);if (keycode !=GRUB_TERM_NO_KEY )return keycode; - +/* Poll interrupt pipe. */ err =grub_usb_check_transfer (termdata->transfer, &actual);
@@ -387,7 +387,7 @@ grub_usb_keyboard_getkey (struct grub_term_input *term)grub_memcpy (termdata->last_report, termdata->current_report,sizeof (termdata->report)); - +grub_memcpy (termdata->current_report, termdata->report,sizeof (termdata->report));
@@ -424,7 +424,7 @@ grub_usb_keyboard_getkey (struct grub_term_input *term) termdata->index =2 ;/* New data received. */ termdata->max_index = actual; - +return parse_keycode (termdata); }
@@ -457,7 +457,7 @@ GRUB_MOD_FINI(usb_keyboard)if (!data)continue ; - +if (data->transfer)grub_usb_cancel_transfer (data->transfer);
Signature · 1 line
2.35.1
PATCH 18/21 tests: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/tests/cmdline_cat_test.c | 8 ++++---- grub-core/tests/gfxterm_menu.c | 6 +++--- grub-core/tests/shift_test.c | 2 +- grub-core/tests/signature_test.c | 12 ++++++------ grub-core/tests/video_checksum.c | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-)
grub-core/tests/cmdline_cat_test.c +4 -4
@@ -60,7 +60,7 @@ get_test_txt (grub_size_t *sz)return grub_strdup (testfile); } -struct grub_procfs_entry test_txt = +struct grub_procfs_entry test_txt = { .name ="test.txt" , .get_contents = get_test_txt
@@ -91,14 +91,14 @@ cmdline_cat_test (void) }grub_procfs_register ("test.txt" , &test_txt); - +for (i =0 ; i <GRUB_TEST_VIDEO_SMALL_N_MODES ; i++) {grub_video_capture_start (&grub_test_video_modes[i], grub_video_fbstd_colors, grub_test_video_modes[i].number_of_colors); - grub_terminal_input_fake_sequence ((int []) - { 'c', 'a', 't', ' ', + grub_terminal_input_fake_sequence ((int []) + { 'c', 'a', 't', ' ', '(', 'p', 'r', 'o', 'c', ')', '/', 't', 'e', 's', 't', '.', 't', 'x', 't', '\n',
grub-core/tests/gfxterm_menu.c +3 -3
@@ -63,7 +63,7 @@ get_test_cfg (grub_size_t *sz)return grub_strdup (testfile); } -struct grub_procfs_entry test_cfg = +struct grub_procfs_entry test_cfg = { .name ="test.cfg" , .get_contents = get_test_cfg
@@ -73,7 +73,7 @@ struct {const char *name;const char *var; -const char *val; +const char *val; } tests[] = { { "gfxterm_menu", NULL, NULL },
@@ -121,7 +121,7 @@ gfxterm_menu (void) }grub_procfs_register ("test.cfg" , &test_cfg); - +for (j =0 ; j <ARRAY_SIZE (tests); j++)for (i =0 ; i <GRUB_TEST_VIDEO_SMALL_N_MODES ; i++) {
grub-core/tests/shift_test.c +1 -1
@@ -99,7 +99,7 @@ arithmetic_right_shift64 (grub_uint64_t v, int s)if (get_bit64 (v,63 ))for (i -= s; i <64 ; i++) r =set_bit64 (r, i); - +return r; }
grub-core/tests/signature_test.c +6 -6
@@ -40,7 +40,7 @@ get_hi_dsa_sig (grub_size_t *sz)return ret; } -static struct grub_procfs_entry hi_dsa_sig_entry = +static struct grub_procfs_entry hi_dsa_sig_entry = { .name ="hi_dsa.sig" , .get_contents = get_hi_dsa_sig
@@ -57,7 +57,7 @@ get_hi_dsa_pub (grub_size_t *sz)return ret; } -static struct grub_procfs_entry hi_dsa_pub_entry = +static struct grub_procfs_entry hi_dsa_pub_entry = { .name ="hi_dsa.pub" , .get_contents = get_hi_dsa_pub
@@ -74,7 +74,7 @@ get_hi_rsa_sig (grub_size_t *sz)return ret; } -static struct grub_procfs_entry hi_rsa_sig_entry = +static struct grub_procfs_entry hi_rsa_sig_entry = { .name ="hi_rsa.sig" , .get_contents = get_hi_rsa_sig
@@ -91,7 +91,7 @@ get_hi_rsa_pub (grub_size_t *sz)return ret; } -static struct grub_procfs_entry hi_rsa_pub_entry = +static struct grub_procfs_entry hi_rsa_pub_entry = { .name ="hi_rsa.pub" , .get_contents = get_hi_rsa_pub
@@ -104,7 +104,7 @@ get_hi (grub_size_t *sz)return grub_strdup ("hi\n" ); } -struct grub_procfs_entry hi = +struct grub_procfs_entry hi = { .name ="hi" , .get_contents = get_hi
@@ -117,7 +117,7 @@ get_hj (grub_size_t *sz)return grub_strdup ("hj\n" ); } -struct grub_procfs_entry hj = +struct grub_procfs_entry hj = { .name ="hj" , .get_contents = get_hj
grub-core/tests/video_checksum.c +6 -6
@@ -499,9 +499,9 @@ write_time (void) cur =grub_util_get_cpu_time_ms ();grub_snprintf (buf,sizeof (buf),"%s_%dx%dx%s:%d: %" PRIuGRUB_UINT64_T" ms\n" , - basename, + basename, capt_mode_info.width, - capt_mode_info.height, + capt_mode_info.height,grub_video_checksum_get_modename (), ctr, cur - prev); prev = cur;
@@ -605,9 +605,9 @@ checksum (void)if (!checksums || ctr >= nchk) {grub_test_assert (0 ,"Unexpected checksum %s_%dx%dx%s:%d: 0x%x" , - basename, + basename, capt_mode_info.width, - capt_mode_info.height, + capt_mode_info.height,grub_video_checksum_get_modename (), ctr, crc); }else if (crc != checksums[ctr])
@@ -628,7 +628,7 @@ checksum (void) }#endif #ifdef GRUB_MACHINE_EMU - char *name = grub_xasprintf ("%s_%dx%dx%s_%d.bmp", basename, + char *name = grub_xasprintf ("%s_%dx%dx%s_%d.bmp", basename, capt_mode_info.width, capt_mode_info.height, grub_video_checksum_get_modename (),
@@ -785,7 +785,7 @@ grub_test_use_gfxterm (void) }if (gfxterm->init (gfxterm)) - { + {grub_test_assert (0 ,"terminal `%s' failed: %s" ,"gfxterm" , grub_errmsg);return 1 ; }
Signature · 1 line
2.35.1
PATCH 19/21 video: Remove trailing whitespaces
In reply to Elyes Haouas--- grub-core/video/bochs.c | 2 +- grub-core/video/capture.c | 2 +- grub-core/video/cirrus.c | 4 ++-- grub-core/video/coreboot/cbfb.c | 2 +- grub-core/video/efi_gop.c | 22 +++++++++---------- grub-core/video/fb/fbblit.c | 8 +++---- grub-core/video/fb/video_fb.c | 10 ++++----- grub-core/video/i386/pc/vbe.c | 34 ++++++++++++++--------------- grub-core/video/i386/pc/vga.c | 6 ++--- grub-core/video/ieee1275.c | 4 ++-- grub-core/video/radeon_fuloong2e.c | 6 ++--- grub-core/video/radeon_yeeloong3a.c | 6 ++--- grub-core/video/readers/png.c | 2 +- grub-core/video/readers/tga.c | 2 +- grub-core/video/sis315_init.c | 2 +- grub-core/video/sis315pro.c | 8 +++---- grub-core/video/sm712.c | 10 ++++----- grub-core/video/video.c | 8 +++---- 18 files changed, 69 insertions(+), 69 deletions(-)
grub-core/video/bochs.c +1 -1
@@ -212,7 +212,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)if (((class >>16 ) &0xffff ) !=0x0300 || pciid !=0x11111234 )return 0 ; - + addr =grub_pci_make_address (dev,GRUB_PCI_REG_ADDRESS_REG0 ); framebuffer.base =grub_pci_read (addr) &GRUB_PCI_ADDR_MEM_MASK ;if (!framebuffer.base)
grub-core/video/capture.c +1 -1
@@ -92,7 +92,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info, framebuffer.ptr =grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch);if (!framebuffer.ptr)return grub_errno; - + err =grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
grub-core/video/cirrus.c +2 -2
@@ -354,11 +354,11 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,grub_uint8_t sr_ext =0 , hidden_dac =0 ;grub_vga_set_geometry (&config, grub_vga_cr_write); - +grub_vga_gr_write (GRUB_VGA_GR_MODE_256_COLOR |GRUB_VGA_GR_MODE_READ_MODE1 ,GRUB_VGA_GR_MODE );grub_vga_gr_write (GRUB_VGA_GR_GR6_GRAPHICS_MODE ,GRUB_VGA_GR_GR6 ); - +grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL ,GRUB_VGA_SR_MEMORY_MODE ); grub_vga_cr_write ((config.pitch >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT)
grub-core/video/coreboot/cbfb.c +1 -1
@@ -106,7 +106,7 @@ grub_video_cbfb_setup (unsigned int width, unsigned int height,grub_video_fb_set_palette (0 ,GRUB_VIDEO_FBSTD_NUMCOLORS , grub_video_fbstd_colors); - +return err; }
grub-core/video/efi_gop.c +11 -11
@@ -273,7 +273,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vogrub_efi_status_t status;struct grub_efi_gop_mode_info *info =NULL ;struct grub_video_mode_info mode_info; - + status =efi_call_4 (gop->query_mode, gop, mode, &size, &info);if (status)
@@ -390,7 +390,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, found =1 ; } } - +if (!found) {unsigned mode;
@@ -399,7 +399,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, {grub_efi_uintn_t size;grub_efi_status_t status; - + status =efi_call_4 (gop->query_mode, gop, mode, &size, &info);if (status) {
@@ -472,11 +472,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, framebuffer.ptr = (void *) (grub_addr_t ) gop->mode->fb_base; framebuffer.offscreen =grub_malloc (framebuffer.mode_info.height - * framebuffer.mode_info.width + * framebuffer.mode_info.width *sizeof (struct grub_efi_gop_blt_pixel )); buffer = framebuffer.offscreen; - +if (!buffer) {grub_dprintf ("video" ,"GOP: couldn't allocate shadow\n" );
@@ -485,11 +485,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, &framebuffer.mode_info); buffer = framebuffer.ptr; } - +grub_dprintf ("video" ,"GOP: initialising FB @ %p %dx%dx%d\n" , framebuffer.ptr, framebuffer.mode_info.width, framebuffer.mode_info.height, framebuffer.mode_info.bpp); - + err =grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, buffer);
@@ -498,15 +498,15 @@ grub_video_gop_setup (unsigned int width, unsigned int height,grub_dprintf ("video" ,"GOP: Couldn't create FB target\n" );return err; } - + err =grub_video_fb_set_active_render_target (framebuffer.render_target); - +if (err) {grub_dprintf ("video" ,"GOP: Couldn't set FB target\n" );return err; } - + err =grub_video_fb_set_palette (0 ,GRUB_VIDEO_FBSTD_NUMCOLORS , grub_video_fbstd_colors);
@@ -514,7 +514,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height,grub_dprintf ("video" ,"GOP: Couldn't set palette\n" ); else grub_dprintf ("video", "GOP: Success\n"); - +return err; }
grub-core/video/fb/fbblit.c +4 -4
@@ -466,7 +466,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst,for (i =0 ; i < width; i++) { registergrub_uint32_t col; -if (*srcptr ==0xf0 ) +if (*srcptr ==0xf0 ) col = palette[16 ];else col = palette[*srcptr &0xf ];
@@ -478,7 +478,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, *dstptr++ = col >>0 ; *dstptr++ = col >>8 ; *dstptr++ = col >>16 ; -#endif +#endif srcptr++; }
@@ -651,7 +651,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst,for (i =0 ; i < width; i++) { registergrub_uint32_t col; -if (*srcptr !=0xf0 ) +if (*srcptr !=0xf0 ) { col = palette[*srcptr &0xf ];#ifdef GRUB_CPU_WORDS_BIGENDIAN
@@ -662,7 +662,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, *dstptr++ = col >>0 ; *dstptr++ = col >>8 ; *dstptr++ = col >>16 ; -#endif +#endif }else dstptr +=3 ;
grub-core/video/fb/video_fb.c +5 -5
@@ -754,7 +754,7 @@ grub_video_fb_unmap_color_int (struct grub_video_fbblit_info * source, *alpha =0 ;return ; } - +/* If we have an out-of-bounds color, return transparent black. */ if (color >255 ) {
@@ -1141,7 +1141,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)/* If everything is aligned on 32-bit use 32-bit copy. */ if ((grub_addr_t )grub_video_fb_get_video_ptr (&target, src_x, src_y) %sizeof (grub_uint32_t) ==0 - && (grub_addr_t )grub_video_fb_get_video_ptr (&target, dst_x, dst_y) + && (grub_addr_t )grub_video_fb_get_video_ptr (&target, dst_x, dst_y) %sizeof (grub_uint32_t) ==0 && linelen %sizeof (grub_uint32_t) ==0 && linedelta %sizeof (grub_uint32_t) ==0 )
@@ -1155,7 +1155,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)else if ((grub_addr_t )grub_video_fb_get_video_ptr (&target, src_x, src_y) %sizeof (grub_uint16_t) ==0 && (grub_addr_t )grub_video_fb_get_video_ptr (&target, - dst_x, dst_y) + dst_x, dst_y) %sizeof (grub_uint16_t) ==0 && linelen %sizeof (grub_uint16_t) ==0 && linedelta %sizeof (grub_uint16_t) ==0 )
@@ -1170,7 +1170,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) {grub_uint8_t *src, *dst; DO_SCROLL - } + } }/* 4. Fill empty space with specified color. In this implementation
@@ -1615,7 +1615,7 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask, framebuffer.render_target = framebuffer.back_target;return GRUB_ERR_NONE ; } - + mode_info->mode_type &= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED |GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP );
grub-core/video/i386/pc/vbe.c +17 -17
@@ -219,7 +219,7 @@ grub_vbe_disable_mtrr (int mtrr) }/* Call VESA BIOS 0x4f09 to set palette data, return status. */ -static grub_vbe_status_t +static grub_vbe_status_t grub_vbe_bios_set_palette_data (grub_uint32_t color_count,grub_uint32_t start_index,struct grub_vbe_palette_data *palette_data)
@@ -237,7 +237,7 @@ grub_vbe_bios_set_palette_data (grub_uint32_t color_count, }/* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) {struct grub_bios_int_registers regs;
@@ -251,7 +251,7 @@ grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) }/* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_mode_info (grub_uint32_t mode,struct grub_vbe_mode_info_block *mode_info) {
@@ -285,7 +285,7 @@ grub_vbe_bios_set_mode (grub_uint32_t mode, }/* Call VESA BIOS 0x4f03 to return current VBE Mode, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_mode (grub_uint32_t *mode) {struct grub_bios_int_registers regs;
@@ -298,7 +298,7 @@ grub_vbe_bios_get_mode (grub_uint32_t *mode)return regs.eax &0xffff ; } -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_getset_dac_palette_width (int set,int *dac_mask_size) {struct grub_bios_int_registers regs;
@@ -346,7 +346,7 @@ grub_vbe_bios_get_memory_window (grub_uint32_t window, }/* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_set_scanline_length (grub_uint32_t length) {struct grub_bios_int_registers regs;
@@ -354,14 +354,14 @@ grub_vbe_bios_set_scanline_length (grub_uint32_t length) regs.ecx = length; regs.eax =0x4f06 ;/* BL = 2, Set Scan Line in Bytes. */ - regs.ebx =0x0002 ; + regs.ebx =0x0002 ; regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s);return regs.eax &0xffff ; }/* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_scanline_length (grub_uint32_t *length) {struct grub_bios_int_registers regs;
@@ -377,7 +377,7 @@ grub_vbe_bios_get_scanline_length (grub_uint32_t *length) }/* Call VESA BIOS 0x4f07 to set display start, return status. */ -static grub_vbe_status_t +static grub_vbe_status_t grub_vbe_bios_set_display_start (grub_uint32_t x,grub_uint32_t y) {struct grub_bios_int_registers regs;
@@ -390,7 +390,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) regs.edx = y; regs.eax =0x4f07 ;/* BL = 80h, Set Display Start during Vertical Retrace. */ - regs.ebx =0x0080 ; + regs.ebx =0x0080 ; regs.flags =GRUB_CPU_INT_FLAGS_DEFAULT ;grub_bios_interrupt (0x10 , ®s);
@@ -401,7 +401,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) }/* Call VESA BIOS 0x4f07 to get display start, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_display_start (grub_uint32_t *x,grub_uint32_t *y) {
@@ -419,7 +419,7 @@ grub_vbe_bios_get_display_start (grub_uint32_t *x, }/* Call VESA BIOS 0x4f0a. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_pm_interface (grub_uint16_t *segment,grub_uint16_t *offset,grub_uint16_t *length) {
@@ -896,7 +896,7 @@ vbe2videoinfo (grub_uint32_t mode,case GRUB_VBE_MEMORY_MODEL_YUV : mode_info->mode_type |=GRUB_VIDEO_MODE_TYPE_YUV ;break ; - +case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR : mode_info->mode_type |=GRUB_VIDEO_MODE_TYPE_RGB ;break ;
@@ -923,10 +923,10 @@ vbe2videoinfo (grub_uint32_t mode,break ;case 8 : mode_info->bytes_per_pixel =1 ; -break ; +break ;case 4 : mode_info->bytes_per_pixel =0 ; -break ; +break ; }if (controller_info.version >=0x300 )
@@ -976,7 +976,7 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info, vostatic grub_err_t grub_video_vbe_setup (unsigned int width,unsigned int height, -grub_video_mode_type_t mode_type, +grub_video_mode_type_t mode_type,grub_video_mode_type_t mode_mask) {grub_uint16_t *p;
@@ -1193,7 +1193,7 @@ grub_video_vbe_print_adapter_specific_info (void) controller_info.version &0xFF , controller_info.oem_software_rev >>8 , controller_info.oem_software_rev & 0xFF); - +/* The total_memory field is in 64 KiB units. */ grub_printf_ (N_ (" total memory: %d KiB\n" ), (controller_info.total_memory <<6 ));
grub-core/video/i386/pc/vga.c +3 -3
@@ -48,7 +48,7 @@ static structint back_page; } framebuffer; -static unsigned char +static unsigned char grub_vga_set_mode (unsigned char mode) {struct grub_bios_int_registers regs;
@@ -182,10 +182,10 @@ grub_video_vga_setup (unsigned int width, unsigned int height, is_target =1 ; err =grub_video_fb_set_active_render_target (framebuffer.render_target); - +if (err)return err; - + err =grub_video_fb_set_palette (0 ,GRUB_VIDEO_FBSTD_NUMCOLORS , grub_video_fbstd_colors);
grub-core/video/ieee1275.c +2 -2
@@ -233,7 +233,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,/* TODO. */ return grub_error (GRUB_ERR_IO ,"can't set mode %dx%d" , width, height); } - + err =grub_video_ieee1275_fill_mode_info (dev, &framebuffer.mode_info);if (err) {
@@ -260,7 +260,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,grub_video_ieee1275_set_palette (0 , framebuffer.mode_info.number_of_colors, grub_video_fbstd_colors); - +return err; }
grub-core/video/radeon_fuloong2e.c +3 -3
@@ -75,7 +75,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)if (((class >>16 ) &0xffff ) !=GRUB_PCI_CLASS_SUBCLASS_VGA || pciid !=0x515a1002 )return 0 ; - + *found =1 ; addr =grub_pci_make_address (dev,GRUB_PCI_REG_ADDRESS_REG0 );
@@ -139,7 +139,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, framebuffer.mapped =1 ;/* Prevent garbage from appearing on the screen. */ -grub_memset (framebuffer.ptr,0x55 , +grub_memset (framebuffer.ptr,0x55 , framebuffer.mode_info.height * framebuffer.mode_info.pitch);#ifndef TEST
@@ -152,7 +152,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height,return err; err =grub_video_fb_set_active_render_target (framebuffer.render_target); - +if (err)return err;
grub-core/video/radeon_yeeloong3a.c +3 -3
@@ -74,7 +74,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)if (((class >>16 ) &0xffff ) !=GRUB_PCI_CLASS_SUBCLASS_VGA || pciid !=0x96151002 )return 0 ; - + *found =1 ; addr =grub_pci_make_address (dev,GRUB_PCI_REG_ADDRESS_REG0 );
@@ -137,7 +137,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height,#endif /* Prevent garbage from appearing on the screen. */ -grub_memset (framebuffer.ptr,0 , +grub_memset (framebuffer.ptr,0 , framebuffer.mode_info.height * framebuffer.mode_info.pitch);#ifndef TEST
@@ -150,7 +150,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height,return err; err =grub_video_fb_set_active_render_target (framebuffer.render_target); - +if (err)return err;
grub-core/video/readers/png.c +1 -1
@@ -916,7 +916,7 @@ grub_png_convert_image (struct grub_png_data *data) }return ; } - +if (data->is_gray) { switch (data->bpp)
grub-core/video/readers/tga.c +1 -1
@@ -127,7 +127,7 @@ tga_load_palette (struct tga_data *data)if (len >sizeof (data->palette)) len =sizeof (data->palette); - +if (grub_file_read (data->file, &data->palette, len) != (grub_ssize_t ) len)return grub_errno;
grub-core/video/sis315_init.c +1 -1
@@ -1,4 +1,4 @@ -static const struct {grub_uint8_t reg;grub_uint8_t val; } sr_dump [] = +static const struct {grub_uint8_t reg;grub_uint8_t val; } sr_dump [] = { {0x28 ,0x81 }, {0x2a ,0x00 },
grub-core/video/sis315pro.c +4 -4
@@ -103,7 +103,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)if (((class >>16 ) &0xffff ) !=GRUB_PCI_CLASS_SUBCLASS_VGA || pciid !=GRUB_SIS315PRO_PCIID )return 0 ; - + *found =1 ; addr =grub_pci_make_address (dev,GRUB_PCI_REG_ADDRESS_REG0 );
@@ -218,7 +218,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height,#ifndef TEST /* Prevent garbage from appearing on the screen. */ -grub_memset (framebuffer.ptr,0 , +grub_memset (framebuffer.ptr,0 , framebuffer.mode_info.height * framebuffer.mode_info.pitch);grub_arch_sync_dma_caches (framebuffer.ptr, framebuffer.mode_info.height
@@ -231,7 +231,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 |GRUB_VGA_IO_MISC_28MHZ |GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS - |GRUB_VGA_IO_MISC_COLOR , + |GRUB_VGA_IO_MISC_COLOR , GRUB_VGA_IO_MISC_WRITE + GRUB_MACHINE_PCI_IO_BASE);grub_vga_sr_write (0x86 ,5 );
@@ -335,7 +335,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, {if (read_sis_cmd (0x5 ) !=0xa1 )write_sis_cmd (0x86 ,0x5 ); - +write_sis_cmd (read_sis_cmd (0x20 ) |0xa1 ,0x20 );write_sis_cmd (read_sis_cmd (0x1e ) |0xda ,0x1e );
grub-core/video/sm712.c +5 -5
@@ -167,7 +167,7 @@ enumGRUB_SM712_CR_SHADOW_VGA_VBLANK_START =0x46 ,GRUB_SM712_CR_SHADOW_VGA_VBLANK_END =0x47 ,GRUB_SM712_CR_SHADOW_VGA_VRETRACE_START =0x48 , -GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END =0x49 , +GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END =0x49 ,GRUB_SM712_CR_SHADOW_VGA_OVERFLOW =0x4a ,GRUB_SM712_CR_SHADOW_VGA_CELL_HEIGHT =0x4b , GRUB_SM712_CR_SHADOW_VGA_HDISPLAY_END = 0x4c,
@@ -375,7 +375,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)if (((class >>16 ) &0xffff ) !=GRUB_PCI_CLASS_SUBCLASS_VGA || pciid !=GRUB_SM712_PCIID )return 0 ; - + *found =1 ; addr =grub_pci_make_address (dev,GRUB_PCI_REG_ADDRESS_REG0 );
@@ -471,7 +471,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,#if !defined (TEST ) && !defined(GENINIT )/* Prevent garbage from appearing on the screen. */ -grub_memset ((void *) framebuffer.cached_ptr,0 , +grub_memset ((void *) framebuffer.cached_ptr,0 , framebuffer.mode_info.height * framebuffer.mode_info.pitch);#endif
@@ -482,7 +482,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,grub_sm712_sr_write (0x2 ,0x6b );grub_sm712_write_reg (0 ,GRUB_VGA_IO_PIXEL_MASK );grub_sm712_sr_write (GRUB_VGA_SR_RESET_ASYNC ,GRUB_VGA_SR_RESET ); -grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY +grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY |GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY |GRUB_VGA_IO_MISC_UPPER_64K | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0
@@ -694,7 +694,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,for (i =0 ; i <ARRAY_SIZE (dda_lookups); i++)grub_sm712_write_dda_lookup (i, dda_lookups[i].compare, dda_lookups[i].dda, dda_lookups[i].vcentering); - +/* Undocumented */ grub_sm712_cr_write (0 ,0x9c );grub_sm712_cr_write (0 ,0x9d );
grub-core/video/video.c +4 -4
@@ -491,13 +491,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) current_mode); param++; - + *width =grub_strtoul (value,0 ,0 );if (grub_errno !=GRUB_ERR_NONE )return grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("invalid video mode specification `%s'" ), current_mode); - +/* Find height value. */ value = param; param =grub_strchr (param,'x' );
@@ -513,13 +513,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) {/* We have optional color depth value. */ param++; - + *height =grub_strtoul (value,0 ,0 );if (grub_errno !=GRUB_ERR_NONE )return grub_error (GRUB_ERR_BAD_ARGUMENT ,N_ ("invalid video mode specification `%s'" ), current_mode); - +/* Convert color depth value. */ value = param; *depth =grub_strtoul (value,0 ,0 );
Signature · 1 line
2.35.1
PATCH 20/21 util: Remove trailing whitespaces
In reply to Elyes Haouas--- util/getroot.c | 6 +-- util/glue-efi.c | 2 +- util/grub-fstest.c | 14 +++--- util/grub-gen-asciih.c | 4 +- util/grub-gen-widthspec.c | 6 +-- util/grub-install-common.c | 14 +++--- util/grub-install.c | 42 ++++++++-------- util/grub-menulst2cfg.c | 2 +- util/grub-mkfont.c | 28 +++++------ util/grub-mkimagexx.c | 8 ++-- util/grub-mklayout.c | 96 ++++++++++++++++++------------------- util/grub-mknetdir.c | 4 +- util/grub-mkpasswd-pbkdf2.c | 4 +- util/grub-mkrescue.c | 8 ++-- util/grub-mkstandalone.c | 4 +- util/grub-mount.c | 32 ++++++------- util/grub-probe.c | 4 +- util/grub-script-check.c | 2 +- util/grub-syslinux2cfg.c | 8 ++-- util/mkimage.c | 78 +++++++++++++++--------------- util/probe.c | 2 +- util/render-label.c | 4 +- util/setup.c | 12 ++--- 23 files changed, 192 insertions(+), 192 deletions(-)
util/getroot.c +3 -3
@@ -156,7 +156,7 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)if (stat (os_dev, &st) <0 ) { -const char *errstr =strerror (errno); +const char *errstr =strerror (errno);grub_error (GRUB_ERR_BAD_DEVICE ,N_ ("cannot stat `%s': %s" ), os_dev, errstr);grub_util_info (_ ("cannot stat `%s': %s" ), os_dev, errstr);
@@ -293,7 +293,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev) == 0); dri =make_device_name (drive); - +if (!disk && !rdisk)return dri;
@@ -451,7 +451,7 @@ int grub_util_biosdisk_is_present (const char *os_dev) {int ret = (find_system_device (os_dev) !=NULL ); -grub_util_info ((ret ?"%s is present" :"%s is not present" ), +grub_util_info ((ret ?"%s is present" :"%s is not present" ), os_dev);return ret; }
util/glue-efi.c +1 -1
@@ -92,7 +92,7 @@ write_fat (FILE *in32, FILE *in64, FILE *out, const char *out_filename,if (fwrite (buf,1 , size32, out) != size32) {if (out_filename) -grub_util_error ("cannot write to `%s': %s" , +grub_util_error ("cannot write to `%s': %s" , out_filename,strerror (errno));else grub_util_error ("cannot write to the stdout: %s" ,strerror (errno));
util/grub-fstest.c +7 -7
@@ -199,7 +199,7 @@ cp_hook (grub_off_t ofs, char *buf, int len, void *_ctx)static void cmd_cp (char *src,const char *dest) { -struct cp_hook_ctx ctx = +struct cp_hook_ctx ctx = { .dest = dest };
@@ -355,7 +355,7 @@ static int crc_hook (grub_off_t ofs, char *buf, int len, void *crc_ctx) { (void) ofs; - +GRUB_MD_CRC32 ->write (crc_ctx, buf, len);return 0 ; }
@@ -489,7 +489,7 @@ fstest (int n)grub_device_close (dev); } } - +for (i =0 ; i < num_disks; i++) {char *argv[2 ];
@@ -518,7 +518,7 @@ static struct argp_option options[] = { {N_("crc FILE"), 0, 0 , OPTION_DOC, N_("Get crc32 checksum of FILE."), 1}, {N_("blocklist FILE"), 0, 0, OPTION_DOC, N_("Display blocklist of FILE."), 1}, {N_("xnu_uuid DEVICE"), 0, 0, OPTION_DOC, N_("Compute XNU UUID of the device."), 1}, - + {"root", 'r', N_("DEVICE_NAME"), 0, N_("Set root device."), 2}, {"skip", 's', N_("NUM"), 0, N_("Skip N bytes from output file."), 2}, {"length", 'n', N_("NUM"), 0, N_("Handle N bytes in output file."), 2},
@@ -541,7 +541,7 @@ print_version (FILE *stream, struct argp_state *state) }void (*argp_program_version_hook) (FILE *,struct argp_state *) = print_version; -static error_t +static error_t argp_parser (int key,char *arg,struct argp_state *state) {const char *p;
@@ -555,7 +555,7 @@ argp_parser (int key, char *arg, struct argp_state *state)case 'K' :if (strcmp (arg,"prompt" ) ==0 ) { -char buf[1024 ]; +char buf[1024 ];grub_puts_ (N_ ("Enter ZFS password: " ));if (grub_password_get (buf,1023 )) {
@@ -728,7 +728,7 @@ argp_parser (int key, char *arg, struct argp_state *state)struct argp argp = { options, argp_parser,N_ ("IMAGE_PATH COMMANDS" ), -N_ ("Debug tool for filesystem driver." ), +N_ ("Debug tool for filesystem driver." ),NULL ,NULL ,NULL };
util/grub-gen-asciih.c +2 -2
@@ -29,10 +29,10 @@#include FT_SYNTHESIS_H #undef __FTERRORS_H__ -#define FT_ERROR_START_LIST const char *ft_errmsgs[] = { +#define FT_ERROR_START_LIST const char *ft_errmsgs[] = {#define FT_ERRORDEF (e, v, s) [e] = s,#define FT_ERROR_END_LIST }; -#include FT_ERRORS_H +#include FT_ERRORS_H #define GRUB_FONT_DEFAULT_SIZE 16
util/grub-gen-widthspec.c +3 -3
@@ -29,10 +29,10 @@#include FT_SYNTHESIS_H #undef __FTERRORS_H__ -#define FT_ERROR_START_LIST const char *ft_errmsgs[] = { +#define FT_ERROR_START_LIST const char *ft_errmsgs[] = {#define FT_ERRORDEF (e, v, s) [e] = s,#define FT_ERROR_END_LIST }; -#include FT_ERRORS_H +#include FT_ERRORS_H #define GRUB_FONT_DEFAULT_SIZE 16
@@ -119,7 +119,7 @@ main (int argc, char *argv[])fprintf (stderr,"grub-gen-widthspec: error: can't set %dx%d font size" , size, size);return 1 ; } - +for (char_code =FT_Get_First_Char (ft_face, &glyph_index); glyph_index; char_code =FT_Get_Next_Char (ft_face, char_code, &glyph_index))
util/grub-install-common.c +7 -7
@@ -59,7 +59,7 @@ grub_install_help_filter (int key, const char *text,return xasprintf (text,"unicode" );case GRUB_INSTALL_OPTIONS_DIRECTORY :case GRUB_INSTALL_OPTIONS_DIRECTORY2 : -return xasprintf (text,grub_util_get_pkglibdir ()); +return xasprintf (text,grub_util_get_pkglibdir ());case GRUB_INSTALL_OPTIONS_LOCALE_DIRECTORY :return xasprintf (text,grub_util_get_localedir ());case GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY :
@@ -80,7 +80,7 @@ grub_install_copy_file (const char *src,const char *dst, int is_needed) { - grub_util_fd_t in, out; + grub_util_fd_t in, out;ssize_t r;grub_util_info ("copying `%s' -> `%s'" , src, dst);
@@ -106,7 +106,7 @@ grub_install_copy_file (const char *src,if (!grub_install_copy_buffer) grub_install_copy_buffer =xmalloc (GRUB_INSTALL_COPY_BUFFER_SIZE ); - +while (1 ) { r =grub_util_fd_read (in, grub_install_copy_buffer,GRUB_INSTALL_COPY_BUFFER_SIZE );
@@ -599,7 +599,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, const char *mkimage_target, int note) {const struct grub_install_image_target_desc *tgt; -const char *const compnames[] = +const char *const compnames[] = { [GRUB_COMPRESSION_AUTO ] ="auto" , [GRUB_COMPRESSION_NONE ] ="none" ,
@@ -905,7 +905,7 @@ static struct [GRUB_INSTALL_PLATFORM_ARM_COREBOOT] = { "arm", "coreboot" }, [GRUB_INSTALL_PLATFORM_RISCV32_EFI] = { "riscv32", "efi" }, [GRUB_INSTALL_PLATFORM_RISCV64_EFI] = { "riscv64", "efi" }, - }; + };char *grub_install_get_platforms_string (void )
@@ -933,7 +933,7 @@ grub_install_get_platforms_string (void) } ptr[-2 ] =0 ;free (arr); - +return platforms_string; }
@@ -1104,7 +1104,7 @@ grub_install_get_target (const char *src) fn =grub_util_path_concat (2 , src,"modinfo.sh" ); f =grub_util_fd_open (fn,GRUB_UTIL_FD_O_RDONLY );if (!GRUB_UTIL_FD_IS_VALID (f)) -grub_util_error (_ ("%s doesn't exist. Please specify --target or --directory" ), +grub_util_error (_ ("%s doesn't exist. Please specify --target or --directory" ), fn); r =grub_util_fd_read (f, buf,sizeof (buf) -1 );if (r <0 )
util/grub-install.c +21 -21
117 lines not on this page · raw message
util/grub-menulst2cfg.c +1 -1
@@ -62,7 +62,7 @@ main (int argc, char **argv) { out =grub_util_fopen (argv[2 ],"w" );if (!out) - { + {if (in != stdin)fclose (in); fprintf (stderr, _("cannot open `%s': %s"),
util/grub-mkfont.c +14 -14
@@ -50,10 +50,10 @@#include FT_SYNTHESIS_H #undef __FTERRORS_H__ -#define FT_ERROR_START_LIST const char *ft_errmsgs[] = { +#define FT_ERROR_START_LIST const char *ft_errmsgs[] = {#define FT_ERRORDEF (e, v, s) [e] = s,#define FT_ERROR_END_LIST }; -#include FT_ERRORS_H +#include FT_ERRORS_H #ifndef GRUB_BUILD #include "progname.h"
@@ -312,7 +312,7 @@ add_char (struct grub_font_info *font_info, FT_Face face, char_code | GRUB_FONT_CODE_RIGHT_JOINED, nocut);break ; } - + }for (cur = subst_leftjoin; cur; cur = cur->next)
@@ -338,7 +338,7 @@ add_char (struct grub_font_info *font_info, FT_Face face, char_code | GRUB_FONT_CODE_LEFT_JOINED, nocut);break ; } - + }for (cur = subst_medijoin; cur; cur = cur->next)if (cur->from == glyph_idx)
@@ -365,7 +365,7 @@ add_char (struct grub_font_info *font_info, FT_Face face, | GRUB_FONT_CODE_RIGHT_JOINED, nocut);break ; } - + } }
@@ -440,7 +440,7 @@ struct gsub_coverage_ranges {grub_uint16_t type;grub_uint16_t count; -struct +struct {grub_uint16_t start;grub_uint16_t end;
@@ -501,20 +501,20 @@ process_cursive (struct gsub_feature *feature,if (lookup_index >=grub_be_to_cpu16 (lookups->count)) {/* TRANSLATORS: "lookup" is taken directly from font specifications -which are formulated as "Under condition X replace LOOKUP with +which are formulated as "Under condition X replace LOOKUP with SUBSTITUITION". "*/ printf (_ ("Out of range lookup: %d\n" ), lookup_index);continue ; } lookup = (struct gsub_lookup *) - ((grub_uint8_t *) lookups + ((grub_uint8_t *) lookups +grub_be_to_cpu16 (lookups->offsets[lookup_index]));if (grub_be_to_cpu16 (lookup->type) !=GSUB_SINGLE_SUBSTITUTION ) {printf (_ ("Unsupported substitution type: %d\n" ),grub_be_to_cpu16 (lookup->type));continue ; - } + }if (grub_be_to_cpu16 (lookup->flag) & ~GSUB_RTL_CHAR ) { grub_util_info ("unsupported substitution flag: 0x%x",
@@ -536,7 +536,7 @@ process_cursive (struct gsub_feature *feature,break ;case FEATURE_MEDI : target = &subst_medijoin; -break ; +break ; }for (k =0 ; k <grub_be_to_cpu16 (lookup->subtablecount); k++) {
@@ -602,7 +602,7 @@ add_font (struct grub_font_info *font_info, FT_Face face, int nocut) }if (gsub) { -struct gsub_features *features +struct gsub_features *features = (struct gsub_features *) (((grub_uint8_t *) gsub) +grub_be_to_cpu16 (gsub->features_off));struct gsub_lookup_list *lookups
@@ -941,10 +941,10 @@ static struct argp_option options[] = {This option is used to chose among them, the first face being '0'. Rarely used. */ N_("select face index"), 0}, - {"range" ,'r' ,N_ ("FROM-TO[,FROM-TO]" ),0 , + {"range" ,'r' ,N_ ("FROM-TO[,FROM-TO]" ),0 ,/* TRANSLATORS: It refers to the range of characters in font. */ N_("set font range"), 0}, - {"name", 'n', N_("NAME"), 0, + {"name", 'n', N_("NAME"), 0,/* TRANSLATORS: "family name" for font is just a generic name without suffix like "Bold". */ N_("set font family name"), 0},
@@ -1186,7 +1186,7 @@ main (int argc, char *argv[])grub_util_error ("%s" ,_ ("FT_Init_FreeType fails" )); { -size_t i; +size_t i;for (i =0 ; i < arguments.nfiles; i++) {FT_Face ft_face;
util/grub-mkimagexx.c +4 -4
@@ -284,7 +284,7 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc phdr->p_align =grub_host_to_target32 (layout->align > image_target->link_align ? layout->align : image_target->link_align);if (image_target->id ==IMAGE_LOONGSON_ELF ) - ehdr->e_flags =grub_host_to_target32 (0x1000 |EF_MIPS_NOREORDER + ehdr->e_flags =grub_host_to_target32 (0x1000 |EF_MIPS_NOREORDER |EF_MIPS_PIC |EF_MIPS_CPIC );else ehdr->e_flags =0 ;
@@ -457,7 +457,7 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_descif (note) {int note_size =sizeof (struct grub_ieee1275_note ); -struct grub_ieee1275_note *note_ptr = (struct grub_ieee1275_note *) +struct grub_ieee1275_note *note_ptr = (struct grub_ieee1275_note *) (elf_img + program_size + header_size);grub_util_info ("adding CHRP NOTE segment" );
@@ -2041,7 +2041,7 @@ SUFFIX (is_text_section) (Elf_Shdr *s, const struct grub_install_image_target_destatic int SUFFIX (is_data_section ) (Elf_Shdr *s,const struct grub_install_image_target_desc *image_target) { -if (!is_relocatable (image_target) +if (!is_relocatable (image_target) &&grub_target_to_host32 (s->sh_type) !=SHT_PROGBITS )return 0 ; return ((grub_target_to_host (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
@@ -2227,7 +2227,7 @@ SUFFIX (locate_sections) (Elf_Ehdr *e, const char *kernel_path, layout->bss_start = layout->kernel_size; layout->end = layout->kernel_size; - +/* .bss */ for (i = 0, s = smd->sections; i < smd->num_sections;
util/grub-mklayout.c +48 -48
126 lines not on this page · raw message
util/grub-mknetdir.c +2 -2
@@ -52,7 +52,7 @@ static struct argp_option options[] = { {0, 0, 0, 0, 0, 0} }; -static error_t +static error_t argp_parser (int key,char *arg,struct argp_state *state) {if (grub_install_parse (key, arg))
@@ -86,7 +86,7 @@ argp_parser (int key, char *arg, struct argp_state *state)struct argp argp = { options, argp_parser,NULL ,"\v" N_ ("Prepares GRUB network boot images at net_directory/subdir " -"assuming net_directory being TFTP root." ), +"assuming net_directory being TFTP root." ),NULL , grub_install_help_filter,NULL };
util/grub-mkpasswd-pbkdf2.c +2 -2
@@ -135,7 +135,7 @@ main (int argc, char *argv[]) buf =xmalloc (arguments.buflen); salt =xmalloc (arguments.saltlen); - +printf ("%s" ,_ ("Enter password: " ));if (!grub_password_get (pass1,GRUB_AUTH_MAX_PASSLEN )) {
@@ -189,7 +189,7 @@ main (int argc, char *argv[]) ptr = result;memcpy (ptr,"grub.pbkdf2.sha512." ,sizeof ("grub.pbkdf2.sha512." ) -1 ); ptr +=sizeof ("grub.pbkdf2.sha512." ) -1 ; - +grub_snprintf (ptr,sizeof ("XXXXXXXXXXXXXXXXXXX" ),"%d" , arguments.count); ptr +=strlen (ptr); *ptr++ ='.' ;
util/grub-mkrescue.c +4 -4
@@ -150,7 +150,7 @@ enum { SYS_AREA_ARCS } system_area =SYS_AREA_AUTO ; -static error_t +static error_t argp_parser (int key,char *arg,struct argp_state *state) {if (grub_install_parse (key, arg))
@@ -495,7 +495,7 @@ main (int argc, char *argv[])xorriso_push ("-as" );xorriso_push ("mkisofs" );xorriso_push ("-graft-points" ); - + iso9660_dir =grub_util_make_temporary_dir ();grub_util_info ("temporary iso9660 dir is `%s'" , iso9660_dir); boot_grub =grub_util_path_concat (3 , iso9660_dir,"boot" ,"grub" );
@@ -639,7 +639,7 @@ main (int argc, char *argv[]) strerror (errno));fclose (bi);fwrite (buf,1 ,512 , sa); - + grub_install_make_image_wrap_file (source_dirs[GRUB_INSTALL_PLATFORM_I386_PC], "/boot/grub", sa, sysarea_img, 0, load_cfg,
@@ -648,7 +648,7 @@ main (int argc, char *argv[])fflush (sa);grub_util_fd_sync (fileno (sa));fclose (sa); - +if (sz >32768 ) {grub_util_warn ("%s" ,_ ("Your xorriso doesn't support `--grub2-boot-info'. Your core image is too big. Boot as disk is disabled. Please use xorriso 1.2.9 or later." ));
util/grub-mkstandalone.c +2 -2
@@ -112,7 +112,7 @@ argp_parser (int key, char *arg, struct argp_state *state)struct argp argp = { options, argp_parser,N_ ("[OPTION] SOURCE..." ), - N_("Generate a standalone image (containing all modules) in the selected format")"\v"N_("Graft point syntax (E.g. /boot/grub/grub.cfg=./grub.cfg) is accepted"), + N_("Generate a standalone image (containing all modules) in the selected format")"\v"N_("Graft point syntax (E.g. /boot/grub/grub.cfg=./grub.cfg) is accepted"),NULL , help_filter,NULL };
@@ -273,7 +273,7 @@ add_tar_file (const char *from,compute_checksum (&hd);fwrite (&hd,1 ,sizeof (hd), memdisk); - +while (1 ) { r =grub_util_fd_read (in, grub_install_copy_buffer,GRUB_INSTALL_COPY_BUFFER_SIZE );
util/grub-mount.c +16 -16
@@ -151,7 +151,7 @@ fuse_getattr (const char *path, struct stat *st) {struct fuse_getattr_ctx ctx;char *pathname, *path2; - +if (path[0 ] =='/' && path[1 ] ==0 ) { st->st_dev =0 ;
@@ -170,7 +170,7 @@ fuse_getattr (const char *path, struct stat *st) ctx.file_exists =0 ; pathname =xstrdup (path); - +/* Remove trailing '/'. */ while (*pathname && pathname[grub_strlen (pathname) -1 ] =='/' ) pathname[grub_strlen (pathname) -1 ] =0 ;
@@ -231,7 +231,7 @@ fuse_getattr (const char *path, struct stat *st) }static int -fuse_opendir (const char *path,struct fuse_file_info *fi) +fuse_opendir (const char *path,struct fuse_file_info *fi) {return 0 ; }
@@ -240,7 +240,7 @@ fuse_opendir (const char *path, struct fuse_file_info *fi)static grub_file_t files[65536 ];static int first_fd =1 ; -static int +static int fuse_open (const char *path,struct fuse_file_info *fi __attribute__ ((unused))) {grub_file_t file;
@@ -252,9 +252,9 @@ fuse_open (const char *path, struct fuse_file_info *fi __attribute__ ((unused))) files[first_fd++] = file; grub_errno =GRUB_ERR_NONE ;return 0 ; -} +} -static int +static int fuse_read (const char *path,char *buf,size_t sz,off_t off,struct fuse_file_info *fi) {
@@ -265,7 +265,7 @@ fuse_read (const char *path, char *buf, size_t sz, off_t off,return -EINVAL ; file->offset = off; - + size =grub_file_read (file, buf, sz);if (size <0 )return translate_error ();
@@ -274,9 +274,9 @@ fuse_read (const char *path, char *buf, size_t sz, off_t off, grub_errno =GRUB_ERR_NONE ;return size; } -} +} -static int +static int fuse_release (const char *path,struct fuse_file_info *fi) {grub_file_close (files[fi->fh]);
@@ -334,7 +334,7 @@ fuse_readdir_call_fill (const char *filename,return 0 ; } -static int +static int fuse_readdir (const char *path,void *buf,fuse_fill_dir_t fill,off_t off,struct fuse_file_info *fi) {
@@ -346,7 +346,7 @@ fuse_readdir (const char *path, void *buf,char *pathname; pathname =xstrdup (path); - +/* Remove trailing '/'. */ while (pathname [0 ] && pathname[1 ] && pathname[grub_strlen (pathname) -1 ] =='/' )
@@ -448,7 +448,7 @@ fuse_init (void)return grub_errno; } -static struct argp_option options[] = { +static struct argp_option options[] = { {"root" ,'r' ,N_ ("DEVICE_NAME" ),0 ,N_ ("Set root device." ),2 }, {"debug" ,'d' ,N_ ("STRING" ),0 ,N_ ("Set debug environment variable." ),2 }, {"crypto" ,'C' ,NULL ,0 ,N_ ("Mount crypto devices." ),2 },
@@ -467,7 +467,7 @@ print_version (FILE *stream, struct argp_state *state) }void (*argp_program_version_hook) (FILE *,struct argp_state *) = print_version; -static error_t +static error_t argp_parser (int key,char *arg,struct argp_state *state) { switch (key)
@@ -479,7 +479,7 @@ argp_parser (int key, char *arg, struct argp_state *state)case 'K' :if (strcmp (arg,"prompt" ) ==0 ) { -char buf[1024 ]; +char buf[1024 ];grub_printf ("%s" ,_ ("Enter ZFS password: " ));if (grub_password_get (buf,1023 )) {
@@ -550,7 +550,7 @@ argp_parser (int key, char *arg, struct argp_state *state)struct argp argp = { options, argp_parser,N_ ("IMAGE1 [IMAGE2 ...] MOUNTPOINT" ), -N_ ("Debug tool for filesystem driver." ), +N_ ("Debug tool for filesystem driver." ),NULL ,NULL ,NULL };
@@ -570,7 +570,7 @@ main (int argc, char *argv[]) fuse_argc++;argp_parse (&argp, argc, argv,0 ,0 ,0 ); - +if (num_disks <2 )grub_util_error ("%s" ,_ ("need an image and mountpoint" )); fuse_args =xrealloc (fuse_args, (fuse_argc +2 ) *sizeof (fuse_args[0 ]));
util/grub-probe.c +2 -2
@@ -433,7 +433,7 @@ probe (const char *path, char **device_names, char delim) dev =grub_device_open (drives_names[0 ]);if (! dev)grub_util_error ("%s" , grub_errmsg); - + fs =grub_fs_probe (dev);if (! fs)grub_util_error ("%s" , grub_errmsg);
@@ -543,7 +543,7 @@ probe (const char *path, char **device_names, char delim)else printf ("\n" ); } - +else if ((print ==PRINT_COMPATIBILITY_HINT || print ==PRINT_BIOS_HINT || print ==PRINT_IEEE1275_HINT || print ==PRINT_BAREMETAL_HINT || print == PRINT_EFI_HINT || print == PRINT_ARC_HINT)
util/grub-script-check.c +1 -1
@@ -184,7 +184,7 @@ main (int argc, char *argv[]) { input =0 ;get_config_line (&input,0 , &ctx); -if (! input) +if (! input)break ; found_input =1 ;
util/grub-syslinux2cfg.c +4 -4
@@ -180,7 +180,7 @@ main (int argc, char *argv[]) {grub_util_error (_ ("cannot open `%s': %s" ), arguments.input,strerror (errno)); - } + } inpfull =xasprintf ("(host)/%s" , t);free (t);
@@ -190,7 +190,7 @@ main (int argc, char *argv[]) {grub_util_error (_ ("cannot open `%s': %s" ), arguments.root,strerror (errno)); - } + } rootfull =xasprintf ("(host)/%s" , t);free (t);
@@ -211,7 +211,7 @@ main (int argc, char *argv[]) {grub_util_error (_ ("cannot open `%s': %s" ), arguments.root,strerror (errno)); - } + } cwdfull =xasprintf ("(host)/%s" , t);free (t);
@@ -227,7 +227,7 @@ main (int argc, char *argv[])if (!f)grub_util_error (_ ("cannot open `%s': %s" ), arguments.output,strerror (errno)); -fwrite (res,1 ,strlen (res), f); +fwrite (res,1 ,strlen (res), f);fclose (f); }else
util/mkimage.c +39 -39
282 lines not on this page · raw message
util/probe.c +1 -1
@@ -169,4 +169,4 @@ grub_util_fprint_full_disk_name (FILE *f,else fprintf (f,"%s" , dname);free (dname); -} +}
util/render-label.c +2 -2
@@ -162,7 +162,7 @@ grub_util_render_label (const char *label_font, {grub_util_error (_ ("cannot open `%s': %s" ), label_font,strerror (errno)); - } + } fontfull =xasprintf ("(host)/%s" , t);free (t);
@@ -173,7 +173,7 @@ grub_util_render_label (const char *label_font, {grub_util_error (_ ("cannot open `%s': %s" ), label_font, grub_errmsg); - } + } width =grub_font_get_string_width (font, text) +10 ; height =grub_font_get_height (font);
util/setup.c +6 -6
@@ -350,7 +350,7 @@ SETUP (const char *dir, root = drive;continue ; } -grub_device_close (try_dev); +grub_device_close (try_dev);free (drive); }if (!root_dev)
@@ -379,7 +379,7 @@ SETUP (const char *dir, tmp_img =xmalloc (GRUB_DISK_SECTOR_SIZE );if (grub_disk_read (dest_dev->disk,0 ,0 ,GRUB_DISK_SECTOR_SIZE , tmp_img))grub_util_error ("%s" , grub_errmsg); - + boot_drive_check = (grub_uint8_t *) (boot_img +GRUB_BOOT_MACHINE_DRIVE_CHECK );/* Copy the possible DOS BPB. */
@@ -541,7 +541,7 @@ SETUP (const char *dir,N_ ("Your embedding area is unusually small. " "core.img won't fit in it.")); } - +if (err) {grub_util_warn ("%s" , grub_errmsg);
@@ -556,7 +556,7 @@ SETUP (const char *dir,while (bl.block->len) {grub_memset (bl.block,0 ,sizeof (*bl.block)); - + bl.block--;if ((char *) bl.block <= core_img)
@@ -617,7 +617,7 @@ SETUP (const char *dir, - sizeof (*bl.block));#if GRUB_SETUP_BIOS grub_size_t no_rs_length; - no_rs_length =grub_target_to_host16 + no_rs_length =grub_target_to_host16 (grub_get_unaligned16 (core_img +GRUB_DISK_SECTOR_SIZE +GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH ));
@@ -842,7 +842,7 @@ unable_to_embed: ptr += cur; len -= cur; bl.block--; - +if ((char *) bl.block <= core_img)grub_util_error ("%s" ,_ ("no terminator in the core image" )); }
Signature · 1 line
2.35.1
PATCH 21/21 include: Remove trailing whitespaces
In reply to Elyes Haouas--- include/grub/arc/arc.h | 4 ++-- include/grub/bitmap_scale.h | 2 +- include/grub/charset.h | 4 ++-- include/grub/crypto.h | 10 ++++---- include/grub/datetime.h | 4 ++-- include/grub/disk.h | 2 +- include/grub/diskfilter.h | 4 ++-- include/grub/dl.h | 2 +- include/grub/efi/api.h | 2 +- include/grub/efi/edid.h | 2 +- include/grub/efi/efi.h | 2 +- include/grub/gfxmenu_view.h | 4 ++-- include/grub/hfsplus.h | 2 +- include/grub/i386/bsd.h | 2 +- include/grub/i386/linux.h | 2 +- include/grub/i386/openbsd_bootarg.h | 2 +- include/grub/i386/pc/vbe.h | 14 ++++++------ include/grub/ieee1275/ieee1275.h | 2 +- include/grub/menu_viewer.h | 2 +- include/grub/mips/loongson/serial.h | 2 +- include/grub/mips/qemu_mips/serial.h | 2 +- include/grub/multiboot.h | 2 +- include/grub/multiboot2.h | 2 +- include/grub/net.h | 12 +++++----- include/grub/net/arp.h | 2 +- include/grub/net/ethernet.h | 6 ++--- include/grub/net/ip.h | 4 ++-- include/grub/net/udp.h | 2 +- include/grub/relocator.h | 2 +- include/grub/relocator_private.h | 14 ++++++------ include/grub/term.h | 10 ++++---- include/grub/unicode.h | 2 +- include/grub/usb.h | 4 ++-- include/grub/usbtrans.h | 2 +- include/grub/util/install.h | 6 ++--- include/grub/vgaregs.h | 4 ++-- include/grub/video.h | 4 ++-- include/multiboot2.h | 4 ++-- include/xen/arch-x86/xen-x86_32.h | 4 ++-- include/xen/arch-x86/xen-x86_64.h | 4 ++-- include/xen/arch-x86/xen.h | 6 ++--- include/xen/io/console.h | 4 ++-- include/xen/io/protocols.h | 2 +- include/xen/io/ring.h | 34 ++++++++++++++-------------- include/xen/xen-compat.h | 4 ++-- include/xen/xen.h | 22 +++++++++--------- 46 files changed, 117 insertions(+), 117 deletions(-)
include/grub/arc/arc.h +2 -2
@@ -184,7 +184,7 @@ struct grub_arc_firmware_vectorconst struct grub_arc_component * (*getpeer) (const struct grub_arc_component *comp);const struct grub_arc_component * (*getchild) (const struct grub_arc_component *comp);void *getparent; - +/* 0x30. */ void *getconfigurationdata;void *addchild;
@@ -227,7 +227,7 @@ struct grub_arc_firmware_vectorvoid *setfileinformation;void *flushallcaches;void *testunicodecharacter; - +/* 0x90. */ struct grub_arc_display_status * (*getdisplaystatus) (grub_arc_fileno_t fileno); };
include/grub/bitmap_scale.h +1 -1
@@ -65,7 +65,7 @@ grub_err_tEXPORT_FUNC (grub_video_bitmap_create_scaled) (struct grub_video_bitmap **dst,int dst_width,int dst_height,struct grub_video_bitmap *src, -enum +enum grub_video_bitmap_scale_method scale_method);
include/grub/charset.h +2 -2
@@ -49,7 +49,7 @@#define GRUB_UTF16_LOWER_SURROGATE (code) \ (0xDC00 | (((code) - GRUB_UCS2_LIMIT) & 0x3ff)) -/* Process one character from UTF8 sequence. +/* Process one character from UTF8 sequence. At beginning set *code = 0, *count = 0. Returns 0 on failure and 1 on success. *count holds the number of trailing bytes. */ static inline int
@@ -317,7 +317,7 @@ grub_encode_utf8_character (grub_uint8_t *dest, grub_uint8_t *destend, grub_uint32_t code);const grub_uint32_t * -grub_unicode_get_comb_start (const grub_uint32_t *str, +grub_unicode_get_comb_start (const grub_uint32_t *str,const grub_uint32_t *cur);#endif
include/grub/crypto.h +5 -5
@@ -28,7 +28,7 @@#include <grub/err.h> #include <grub/mm.h> -typedef enum +typedef enum { GPG_ERR_NO_ERROR, GPG_ERR_BAD_MPI,
@@ -72,7 +72,7 @@ typedef gpg_error_t gcry_error_t;typedef gpg_err_code_t gcry_err_code_t ;#define gcry_error_t gcry_err_code_t#if 0 -enum gcry_cipher_modes +enum gcry_cipher_modes {GCRY_CIPHER_MODE_NONE =0 ,/* Not yet specified. */ GCRY_CIPHER_MODE_ECB = 1, /* Electronic codebook. */
@@ -326,13 +326,13 @@ gcry_err_code_t grub_crypto_cbc_decrypt (grub_crypto_cipher_handle_t cipher, void *out, const void *in, grub_size_t size, void *iv); -void +void grub_cipher_register (gcry_cipher_spec_t *cipher);void grub_cipher_unregister (gcry_cipher_spec_t *cipher); -void +void grub_md_register (gcry_md_spec_t *digest); -void +void grub_md_unregister (gcry_md_spec_t *cipher);extern struct gcry_pk_spec *grub_crypto_pk_dsa;
include/grub/datetime.h +2 -2
@@ -58,11 +58,11 @@ grub_datetime2unixtime (const struct grub_datetime *datetime, grub_int64_t *nix)int y4, ay;const grub_uint16_t monthssum[12 ] = {0 , -31 , +31 ,31 +28 ,31 +28 +31 ,31 +28 +31 +30 , -31 +28 +31 +30 +31 , +31 +28 +31 +30 +31 ,31 +28 +31 +30 +31 +30 ,31 +28 +31 +30 +31 +30 +31 ,31 +28 +31 +30 +31 +30 +31 +31 ,
include/grub/disk.h +1 -1
@@ -60,7 +60,7 @@ struct grub_disk_memberlist;#endif typedef enum - { + { GRUB_DISK_PULL_NONE, GRUB_DISK_PULL_REMOVABLE, GRUB_DISK_PULL_RESCAN,
include/grub/diskfilter.h +2 -2
@@ -103,12 +103,12 @@ struct grub_diskfilter_lv {struct grub_diskfilter_segment {grub_uint64_t start_extent;grub_uint64_t extent_count; -enum +enum {GRUB_DISKFILTER_STRIPED =0 ,GRUB_DISKFILTER_MIRROR =1 ,GRUB_DISKFILTER_RAID4 =4 , -GRUB_DISKFILTER_RAID5 =5 , +GRUB_DISKFILTER_RAID5 =5 ,GRUB_DISKFILTER_RAID6 =6 ,GRUB_DISKFILTER_RAID10 =10 , } type;
include/grub/dl.h +1 -1
@@ -98,7 +98,7 @@ grub_mod_fini (void)#endif #else #ifdef __APPLE__ -#define GRUB_MOD_SECTION (x) _ ## x , _ ##x +#define GRUB_MOD_SECTION (x) _ ## x , _ ##x#else #define GRUB_MOD_SECTION (x) . ## x#endif
include/grub/efi/api.h +1 -1
@@ -426,7 +426,7 @@ struct grub_efi_sal_system_table_translation_register_descriptorstruct grub_efi_sal_system_table_purge_translation_coherence {grub_uint8_t type; -grub_uint8_t reserved[3 ]; +grub_uint8_t reserved[3 ];grub_uint32_t ndomains;grub_uint64_t coherence; };
include/grub/efi/edid.h +1 -1
@@ -43,7 +43,7 @@ struct grub_efi_edid_override { };typedef struct grub_efi_edid_override grub_efi_edid_override_t ; - +struct grub_efi_active_edid {
include/grub/efi/efi.h +1 -1
@@ -94,7 +94,7 @@ intEXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,const grub_efi_device_path_t *dp2); -extern void (*EXPORT_VAR (grub_efi_net_config )) (grub_efi_handle_t hnd, +extern void (*EXPORT_VAR (grub_efi_net_config )) (grub_efi_handle_t hnd,char **device,char **path);
include/grub/gfxmenu_view.h +2 -2
@@ -55,9 +55,9 @@ void grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view, const grub_video_rect_t *region); -void +void grub_gfxmenu_clear_timeout (void *data); -void +void grub_gfxmenu_print_timeout (int timeout,void *data);void grub_gfxmenu_set_chosen_entry (int entry,void *data);
include/grub/hfsplus.h +1 -1
@@ -250,7 +250,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,struct grub_hfsplus_key_internal *key, int (*compare_keys) (struct grub_hfsplus_key *keya,struct grub_hfsplus_key_internal *keyb), - struct grub_hfsplus_btnode **matchnode, + struct grub_hfsplus_btnode **matchnode, grub_off_t *keyoffset); grub_err_t grub_mac_bless_inode (grub_device_t dev, grub_uint32_t inode, int is_dir,
include/grub/i386/bsd.h +1 -1
@@ -97,7 +97,7 @@ grub_err_t grub_netbsd_load_elf_meta64 (struct grub_relocator *relocator,const char *filename, grub_addr_t *kern_end); -grub_err_t grub_bsd_add_meta (grub_uint32_t type, +grub_err_t grub_bsd_add_meta (grub_uint32_t type,const void *data,grub_uint32_t len); grub_err_t grub_freebsd_add_meta_module (const char *filename, const char *type, int argc, char **argv,
include/grub/i386/linux.h +1 -1
@@ -310,7 +310,7 @@ struct linux_kernel_paramsgrub_uint32_t bootsect_kludge;/* obsolete */ grub_uint16_t heap_end_ptr;/* Free memory after setup end */ grub_uint8_t ext_loader_ver;/* Extended loader version */ -grub_uint8_t ext_loader_type;/* Extended loader type */ +grub_uint8_t ext_loader_type;/* Extended loader type */ grub_uint32_t cmd_line_ptr;/* Points to the kernel command line */ grub_uint32_t initrd_addr_max;/* Maximum initrd address */ grub_uint32_t kernel_alignment;/* Alignment of the kernel */
include/grub/i386/openbsd_bootarg.h +1 -1
@@ -17,7 +17,7 @@*/ /* $OpenBSD: bootarg.h,v 1.11 2003/06/02 20:20:54 mickey Exp $ */ - +/* * Copyright (c) 1996-1999 Michael Shalayeff * All rights reserved.
include/grub/i386/pc/vbe.h +7 -7
@@ -188,14 +188,14 @@ struct grub_vbe_flat_panel_info/* Prototypes for helper functions. */ /* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *controller_info);/* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_mode_info (grub_uint32_t mode,struct grub_vbe_mode_info_block *mode_info);/* Call VESA BIOS 0x4f03 to return current VBE Mode, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_mode (grub_uint32_t *mode);/* Call VESA BIOS 0x4f05 to set memory window, return status. */ grub_vbe_status_t
@@ -205,13 +205,13 @@ grub_vbe_status_t grub_vbe_bios_get_memory_window (grub_uint32_t window, grub_uint32_t *position);/* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_set_scanline_length (grub_uint32_t length);/* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_scanline_length (grub_uint32_t *length);/* Call VESA BIOS 0x4f07 to get display start, return status. */ -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_display_start (grub_uint32_t *x,grub_uint32_t *y);
@@ -224,7 +224,7 @@ grub_err_t grub_vbe_probe (struct grub_vbe_info_block *info_block);grub_err_t grub_vbe_get_video_mode (grub_uint32_t *mode);grub_err_t grub_vbe_get_video_mode_info (grub_uint32_t mode,struct grub_vbe_mode_info_block *mode_info); -grub_vbe_status_t +grub_vbe_status_t grub_vbe_bios_get_pm_interface (grub_uint16_t *seg,grub_uint16_t *offset,grub_uint16_t *length);
include/grub/ieee1275/ieee1275.h +1 -1
@@ -111,7 +111,7 @@ enum grub_ieee1275_flag/* OLPC / XO firmware has the cursor ON/OFF routines. */ GRUB_IEEE1275_FLAG_HAS_CURSORONOFF, -/* Some PowerMacs claim to use 2 address cells but in fact use only 1. +/* Some PowerMacs claim to use 2 address cells but in fact use only 1. Other PowerMacs claim to use only 1 and really do so. Always assume 1 address cell is used on PowerMacs. */
include/grub/menu_viewer.h +1 -1
@@ -39,7 +39,7 @@ struct grub_menu_viewervoid grub_menu_register_viewer (struct grub_menu_viewer *viewer);grub_err_t -grub_menu_try_text (struct grub_term_output *term, +grub_menu_try_text (struct grub_term_output *term,int entry,grub_menu_t menu,int nested); extern grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
include/grub/mips/loongson/serial.h +1 -1
@@ -30,4 +30,4 @@#else #endif -#endif +#endif
include/grub/mips/qemu_mips/serial.h +1 -1
@@ -21,4 +21,4 @@#define GRUB_MACHINE_SERIAL_PORTS { 0xb40003f8 } -#endif +#endif
include/grub/multiboot.h +1 -1
@@ -74,7 +74,7 @@ grub_err_t grub_multiboot_set_video_mode (void);#endif #define GRUB_MULTIBOOT_CONSOLE_EGA_TEXT 1 -#define GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER 2 +#define GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER 2 grub_err_t grub_multiboot_set_console (int console_type, int accepted_consoles,
include/grub/multiboot2.h +1 -1
@@ -66,7 +66,7 @@ grub_err_t grub_multiboot2_set_video_mode (void);#endif #define GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT 1 -#define GRUB_MULTIBOOT2_CONSOLE_FRAMEBUFFER 2 +#define GRUB_MULTIBOOT2_CONSOLE_FRAMEBUFFER 2 grub_err_t grub_multiboot2_set_console (int console_type, int accepted_consoles,
include/grub/net.h +6 -6
@@ -35,12 +35,12 @@ enumGRUB_NET_OUR_IPV4_HEADER_SIZE =20 ,GRUB_NET_OUR_IPV6_HEADER_SIZE =40 ,GRUB_NET_OUR_MAX_IP_HEADER_SIZE =40 , -GRUB_NET_TCP_RESERVE_SIZE =GRUB_NET_TCP_HEADER_SIZE +GRUB_NET_TCP_RESERVE_SIZE =GRUB_NET_TCP_HEADER_SIZE +GRUB_NET_OUR_IPV4_HEADER_SIZE + GRUB_NET_MAX_LINK_HEADER_SIZE }; -typedef enum grub_link_level_protocol_id +typedef enum grub_link_level_protocol_id {GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET }grub_link_level_protocol_id_t ;
@@ -149,7 +149,7 @@ struct grub_net_cardstruct grub_net_network_level_interface ; -typedef enum grub_network_level_protocol_id +typedef enum grub_network_level_protocol_id { GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV, GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4,
@@ -182,11 +182,11 @@ typedef struct grub_net_network_level_netaddress {struct {grub_uint32_t base; -int masksize; +int masksize; } ipv4;struct {grub_uint64_t base[2 ]; -int masksize; +int masksize; } ipv6; }; } grub_net_network_level_netaddress_t;
@@ -252,7 +252,7 @@ typedef struct grub_net_app_protocol *grub_net_app_level_t;typedef struct grub_net_socket *grub_net_socket_t ; -struct grub_net_app_protocol +struct grub_net_app_protocol {struct grub_net_app_protocol *next;struct grub_net_app_protocol **prev;
include/grub/net/arp.h +1 -1
@@ -29,4 +29,4 @@ grub_err_t grub_net_arp_send_request (struct grub_net_network_level_interface *inf, const grub_net_network_level_address_t *proto_addr); -#endif +#endif
include/grub/net/ethernet.h +3 -3
@@ -29,13 +29,13 @@ typedef enumGRUB_NET_ETHERTYPE_IP6 =0x86DD , } grub_net_ethertype_t; -grub_err_t +grub_err_t send_ethernet_packet (struct grub_net_network_level_interface *inf,struct grub_net_buff *nb,grub_net_link_level_address_t target_addr,grub_net_ethertype_t ethertype); -grub_err_t +grub_err_t grub_net_recv_ethernet_packet (struct grub_net_buff *nb,struct grub_net_card *card); -#endif +#endif
include/grub/net/ip.h +2 -2
@@ -58,7 +58,7 @@ grub_net_send_ip_packet (struct grub_net_network_level_interface *inf,struct grub_net_buff *nb, grub_net_ip_protocol_t proto); -grub_err_t +grub_err_t grub_net_recv_icmp_packet (struct grub_net_buff *nb, struct grub_net_network_level_interface *inf, const grub_net_link_level_address_t *ll_src,
@@ -95,4 +95,4 @@ grub_net_icmp6_send_request (struct grub_net_network_level_interface *inf,grub_err_t grub_net_icmp6_send_router_solicit (struct grub_net_network_level_interface *inf); -#endif +#endif
include/grub/net/udp.h +1 -1
@@ -48,4 +48,4 @@ grub_net_send_udp_packet (const grub_net_udp_socket_t socket, struct grub_net_buff *nb); -#endif +#endif
include/grub/relocator.h +1 -1
@@ -41,7 +41,7 @@ grub_phys_addr_t get_physical_target_address (grub_relocator_chunk_t in); grub_err_t -grub_relocator_alloc_chunk_align (struct grub_relocator *rel, +grub_relocator_alloc_chunk_align (struct grub_relocator *rel, grub_relocator_chunk_t *out, grub_phys_addr_t min_addr, grub_phys_addr_t max_addr,
include/grub/relocator_private.h +7 -7
@@ -65,19 +65,19 @@ void grub_cpu_relocator_jumper (void *rels, grub_addr_t addr);struct grub_relocator_mmap_event {enum { -IN_REG_START =0 , -IN_REG_END =1 , -REG_BEG_START =2 , +IN_REG_START =0 , +IN_REG_END =1 , +REG_BEG_START =2 ,REG_BEG_END =REG_BEG_START |1 ,#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS -REG_FIRMWARE_START =4 , +REG_FIRMWARE_START =4 ,REG_FIRMWARE_END =REG_FIRMWARE_START |1 ,/* To track the regions already in heap. */ -FIRMWARE_BLOCK_START =6 , +FIRMWARE_BLOCK_START =6 ,FIRMWARE_BLOCK_END =FIRMWARE_BLOCK_START |1 ,#endif #if GRUB_RELOCATOR_HAVE_LEFTOVERS -REG_LEFTOVER_START =8 , +REG_LEFTOVER_START =8 ,REG_LEFTOVER_END =REG_LEFTOVER_START |1 ,#endif COLLISION_START =10 ,
@@ -99,7 +99,7 @@ struct grub_relocator_mmap_event }; }; -/* Return 0 on failure, 1 on success. The failure here +/* Return 0 on failure, 1 on success. The failure here can be very time-expensive, so please make sure fill events is accurate. */ #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS int grub_relocator_firmware_alloc_region (grub_phys_addr_t start,
include/grub/term.h +5 -5
@@ -366,8 +366,8 @@ grub_term_gotoxy (struct grub_term_output *term, struct grub_term_coordinate pos term->gotoxy (term, pos); } -static inline void -grub_term_setcolorstate (struct grub_term_output *term, +static inline void +grub_term_setcolorstate (struct grub_term_output *term,grub_term_color_state state) {if (term->setcolorstate)
@@ -378,20 +378,20 @@ static inline void grub_setcolorstate (grub_term_color_state state) {struct grub_term_output *term; - +FOR_ACTIVE_TERM_OUTPUTS (term)grub_term_setcolorstate (term, state); }/* Turn on/off the cursor. */ -static inline void +static inline void grub_term_setcursor (struct grub_term_output *term,int on) {if (term->setcursor) term->setcursor (term, on); } -static inline void +static inline void grub_term_cls (struct grub_term_output *term) {if (term->cls)
include/grub/unicode.h +1 -1
@@ -354,7 +354,7 @@ grub_uint32_t grub_unicode_shape_code (grub_uint32_t in, grub_uint8_t attr);const grub_uint32_t * -grub_unicode_get_comb_end (const grub_uint32_t *end, +grub_unicode_get_comb_end (const grub_uint32_t *end,const grub_uint32_t *cur);#endif
include/grub/usb.h +2 -2
@@ -134,7 +134,7 @@ struct grub_usb_controller_dev/* Value is calculated/estimated in driver - some TDs should be */ /* reserved for posible concurrent control or "interrupt" transfers */ grub_size_t max_bulk_tds; - +/* The next host controller. */ struct grub_usb_controller_dev *next; };
@@ -178,7 +178,7 @@ struct grub_usb_hub_port {grub_uint64_t soft_limit_time;grub_uint64_t hard_limit_time; -enum { +enum {PORT_STATE_NORMAL =0 ,PORT_STATE_WAITING_FOR_STABLE_POWER =1 ,PORT_STATE_FAILED_DEVICE =2 ,
include/grub/usbtrans.h +1 -1
@@ -63,7 +63,7 @@ struct grub_usb_transferstruct grub_usb_device *dev;struct grub_usb_transaction *transactions; - +int last_trans;/* Index of last processed transaction in OHCI/UHCI driver. */
include/grub/util/install.h +3 -3
@@ -236,11 +236,11 @@ void grub_install_sgi_setup (const char *install_device, const char *imgfile, const char *destname); -int +int grub_install_compress_gzip (const char *src,const char *dest); -int +int grub_install_compress_lzop (const char *src,const char *dest); -int +int grub_install_compress_xz (const char *src,const char *dest);void
include/grub/vgaregs.h +2 -2
@@ -50,8 +50,8 @@ enum {GRUB_VGA_CR_HTOTAL =0x00 ,GRUB_VGA_CR_HORIZ_END =0x01 , -GRUB_VGA_CR_HBLANK_START =0x02 , -GRUB_VGA_CR_HBLANK_END =0x03 , +GRUB_VGA_CR_HBLANK_START =0x02 , +GRUB_VGA_CR_HBLANK_END =0x03 ,GRUB_VGA_CR_HORIZ_SYNC_PULSE_START =0x04 ,GRUB_VGA_CR_HORIZ_SYNC_PULSE_END =0x05 , GRUB_VGA_CR_VERT_TOTAL = 0x06,
include/grub/video.h +2 -2
@@ -413,7 +413,7 @@ static inline void grub_video_register (grub_video_adapter_t adapter) {grub_video_adapter_t *p; -for (p = &grub_video_adapter_list; *p && (*p)->prio > adapter->prio; +for (p = &grub_video_adapter_list; *p && (*p)->prio > adapter->prio; p = &((*p)->next)); adapter->next = *p; *p = adapter;
@@ -497,7 +497,7 @@ grub_err_t EXPORT_FUNC (grub_video_unmap_color) (grub_video_color_t color, grub_uint8_t *blue, grub_uint8_t *alpha); -grub_err_t EXPORT_FUNC (grub_video_fill_rect ) (grub_video_color_t color, +grub_err_t EXPORT_FUNC (grub_video_fill_rect ) (grub_video_color_t color,int x,int y,unsigned int width,unsigned int height);
include/multiboot2.h +2 -2
@@ -244,7 +244,7 @@ struct multiboot_tag_mmapmultiboot_uint32_t size;multiboot_uint32_t entry_size;multiboot_uint32_t entry_version; -struct multiboot_mmap_entry entries[0 ]; +struct multiboot_mmap_entry entries[0 ]; };struct multiboot_vbe_info_block
@@ -388,7 +388,7 @@ struct multiboot_tag_efi_mmapmultiboot_uint32_t descr_size;multiboot_uint32_t descr_vers;multiboot_uint8_t efi_mmap[0 ]; -}; +};struct multiboot_tag_efi32_ih {
include/xen/arch-x86/xen-x86_32.h +2 -2
@@ -1,8 +1,8 @@/****************************************************************************** * xen-x86_32.h -* +* * Guest OS interface to x86 32-bit Xen. -* +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the
include/xen/arch-x86/xen-x86_64.h +2 -2
@@ -1,8 +1,8 @@/****************************************************************************** * xen-x86_64.h -* +* * Guest OS interface to x86 64-bit Xen. -* +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the
include/xen/arch-x86/xen.h +3 -3
@@ -1,8 +1,8 @@/****************************************************************************** * arch-x86/xen.h -* +* * Guest OS interface to x86 Xen. -* +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the
@@ -152,7 +152,7 @@ DEFINE_XEN_GUEST_HANDLE(trap_info_t);typedef uint64_t tsc_timestamp_t ;/* RDTSC timestamp */ /* -* The following is all CPU context. Note that the fpu_ctxt block is filled +* The following is all CPU context. Note that the fpu_ctxt block is filled * in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used. * * Also note that when calling DOMCTL_setvcpucontext and VCPU_initialise
include/xen/io/console.h +2 -2
@@ -1,8 +1,8 @@/****************************************************************************** * console.h -* +* * Console I/O interface for Xen guest OSes. -* +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the
include/xen/io/protocols.h +1 -1
@@ -1,6 +1,6 @@/****************************************************************************** * protocols.h -* +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the
include/xen/io/ring.h +17 -17
@@ -1,6 +1,6 @@/****************************************************************************** * ring.h -* +* * Shared producer-consumer ring macros. * * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -47,7 +47,7 @@ typedef unsigned int RING_IDX;/* * Calculate size of a shared ring, given the total available space for the * ring and indexes (_sz), and the name tag of the request/response structure. -* A ring contains as many entries as will fit, rounded down to the nearest +* A ring contains as many entries as will fit, rounded down to the nearest * power of two (so we can mask with (size-1) to loop around). */ #define __CONST_RING_SIZE (_s, _sz) \
@@ -61,7 +61,7 @@ typedef unsigned int RING_IDX;/* * Macros to make the correct C datatypes for a new kind of ring. -* +* * To make a new ring datatype, you need to have two message structures, * let's say request_t, and response_t already defined. *
@@ -71,7 +71,7 @@ typedef unsigned int RING_IDX;* * These expand out to give you a set of types, as you can see below. * The most important of these are: -* +* * mytag_sring_t - The shared ring. * mytag_front_ring_t - The 'front' half of the ring. * mytag_back_ring_t - The 'back' half of the ring.
@@ -139,15 +139,15 @@ typedef struct __name##_back_ring __name##_back_ring_t/* * Macros for manipulating rings. -* -* FRONT_RING_whatever works on the "front end" of a ring: here +* +* FRONT_RING_whatever works on the "front end" of a ring: here * requests are pushed on to the ring and responses taken off it. -* -* BACK_RING_whatever works on the "back end" of a ring: here +* +* BACK_RING_whatever works on the "back end" of a ring: here * requests are taken off the ring and responses put on. -* -* N.B. these macros do NO INTERLOCKS OR FLOW CONTROL. -* This is OK in 1-for-1 request-response situations where the +* +* N.B. these macros do NO INTERLOCKS OR FLOW CONTROL. +* This is OK in 1-for-1 request-response situations where the * requestor (front end) never has more than RING_SIZE()-1 * outstanding requests. */
@@ -235,26 +235,26 @@ typedef struct __name##_back_ring __name##_back_ring_t/* * Notification hold-off (req_event and rsp_event): -* +* * When queueing requests or responses on a shared ring, it may not always be * necessary to notify the remote end. For example, if requests are in flight * in a backend, the front may be able to queue further requests without * notifying the back (if the back checks for new requests when it queues * responses). -* +* * When enqueuing requests or responses: -* +* * Use RING_PUSH_{REQUESTS,RESPONSES}_AND_CHECK_NOTIFY(). The second argument * is a boolean return value. True indicates that the receiver requires an * asynchronous notification. -* +* * After dequeuing requests or responses (before sleeping the connection): -* +* * Use RING_FINAL_CHECK_FOR_REQUESTS() or RING_FINAL_CHECK_FOR_RESPONSES(). * The second argument is a boolean return value. True indicates that there * are pending messages on the ring (i.e., the connection should not be put * to sleep). -* +* * These macros will set the req_event/rsp_event field to trigger a * notification on the very next message that is enqueued. If you want to * create batches of work (i.e., only receive a notification after several
include/xen/xen-compat.h +2 -2
@@ -1,8 +1,8 @@/****************************************************************************** * xen-compat.h -* +* * Guest OS interface to Xen. Compatibility layer. -* +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the
include/xen/xen.h +11 -11
@@ -1,8 +1,8 @@/****************************************************************************** * xen.h -* +* * Guest OS interface to Xen. -* +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the
@@ -157,11 +157,11 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);#define __HYPERVISOR_dom0_op __HYPERVISOR_platform_op#endif -/* +/* * VIRTUAL INTERRUPTS -* +* * Virtual interrupts that a guest OS may receive from Xen. -* +* * In the side comments, 'V.' denotes a per-VCPU VIRQ while 'G.' denotes a * global VIRQ. The former can be bound once per VCPU and cannot be re-bound. * The latter can be allocated only once per guest: they must initially be
@@ -211,7 +211,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);* (x) encodes the PFD as follows: * x == 0 => PFD == DOMID_SELF * x != 0 => PFD == x - 1 -* +* * Sub-commands: ptr[1:0] specifies the appropriate MMU_* command. * ------------- * ptr[1:0] == MMU_NORMAL_PT_UPDATE:
@@ -257,13 +257,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);* To deallocate the pages, the operations are the reverse of the steps * mentioned above. The argument is MMUEXT_UNPIN_TABLE for all levels and the * pagetable MUST not be in use (meaning that the cr3 is not set to it). -* +* * ptr[1:0] == MMU_MACHPHYS_UPDATE: * Updates an entry in the machine->pseudo-physical mapping table. * ptr[:2] -- Machine address within the frame whose mapping to modify. * The frame must belong to the FD, if one is specified. * val -- Value to write into the mapping entry. -* +* * ptr[1:0] == MMU_PT_UPDATE_PRESERVE_AD: * As MMU_NORMAL_PT_UPDATE above, but A/D bits currently in the PTE are ORed * with those in @val.
@@ -655,7 +655,7 @@ typedef struct vcpu_time_info vcpu_time_info_t;struct vcpu_info {/* * 'evtchn_upcall_pending' is written non-zero by Xen to indicate -* a pending notification for a particular VCPU. It is then cleared +* a pending notification for a particular VCPU. It is then cleared * by the guest OS /before/ checking for pending work, thus avoiding * a set-and-check race. Note that the mask is only accessed by Xen * on the CPU that is currently hosting the VCPU. This means that the
@@ -718,7 +718,7 @@ struct shared_info {* 3. Virtual interrupts ('events'). A domain can bind an event-channel * port to a virtual interrupt source, such as the virtual-timer * device or the emergency console. -* +* * Event channels are addressed by a "port index". Each channel is * associated with two bits of information: * 1. PENDING -- notifies the domain that there is a pending notification
@@ -729,7 +729,7 @@ struct shared_info {* becomes pending while the channel is masked then the 'edge' is lost * (i.e., when the channel is unmasked, the guest must manually handle * pending notifications as no upcall will be scheduled by Xen). -* +* * To expedite scanning of pending notifications, any 0->1 pending * transition on an unmasked channel causes a corresponding bit in a * per-vcpu selector word to be set. Each bit in the selector covers a
Signature · 1 line
2.35.1
Quoted 1 line · Elyes Haouas
Signed-off-by Elyes Haouas <[email protected]>
For whole patch series Reviewed-by: Daniel Kiper <[email protected]>...
Thanks,
Daniel