logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Don-t-return-expression-in-function-returning-void.patch (1558B)


  1. From 7bcefc4f212311a59a83d78d2f9aae6ce11b1538 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Tue, 2 Jul 2019 17:51:44 -0700
  4. Subject: [PATCH] Don't return expression in function returning void
  5. ---
  6. iomem.c | 2 +-
  7. temu.c | 2 +-
  8. vga.c | 2 +-
  9. 3 files changed, 3 insertions(+), 3 deletions(-)
  10. diff --git a/iomem.c b/iomem.c
  11. index c63ada0..8a90bb6 100644
  12. --- a/iomem.c
  13. +++ b/iomem.c
  14. @@ -237,7 +237,7 @@ void phys_mem_set_addr(PhysMemoryRange *pr, uint64_t addr, BOOL enabled)
  15. if (!pr->is_ram) {
  16. default_set_addr(map, pr, addr, enabled);
  17. } else {
  18. - return map->set_ram_addr(map, pr, addr, enabled);
  19. + map->set_ram_addr(map, pr, addr, enabled);
  20. }
  21. }
  22. diff --git a/temu.c b/temu.c
  23. index 7c07f3b..02696a8 100644
  24. --- a/temu.c
  25. +++ b/temu.c
  26. @@ -475,7 +475,7 @@ int slirp_can_output(void *opaque)
  27. void slirp_output(void *opaque, const uint8_t *pkt, int pkt_len)
  28. {
  29. EthernetDevice *net = opaque;
  30. - return net->device_write_packet(net, pkt, pkt_len);
  31. + net->device_write_packet(net, pkt, pkt_len);
  32. }
  33. static void slirp_select_fill1(EthernetDevice *net, int *pfd_max,
  34. diff --git a/vga.c b/vga.c
  35. index 908a320..948d590 100644
  36. --- a/vga.c
  37. +++ b/vga.c
  38. @@ -613,7 +613,7 @@ static uint32_t vga_read_ ## base(void *opaque, uint32_t addr, int size_log2)\
  39. }\
  40. static void vga_write_ ## base(void *opaque, uint32_t addr, uint32_t val, int size_log2)\
  41. {\
  42. - return vga_ioport_write(opaque, base + addr, val);\
  43. + vga_ioport_write(opaque, base + addr, val);\
  44. }
  45. VGA_IO(0x3c0)
  46. --
  47. 2.32.0