logo

oasis

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

0004-All-Avoid-return-with-expression-in-void-function.patch (2425B)

    

  1. From b58ec7875cbc169eed7fea709c95769c0318c442 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sat, 7 Nov 2020 14:40:36 -0800
  4. Subject: [PATCH] All: Avoid return with expression in void function
  6. This is not permitted by ISO C (C99 6.8.6.4p1 [0]).
  8. [0] https://port70.net/~nsz/c/c99/n1256.html#6.8.6.4p1
  9. ---
  10.  src/core/input.c     | 2 +-
  11.  src/core/interface.c | 2 +-
  12.  src/gb/core.c        | 2 +-
  13.  src/gba/core.c       | 2 +-
  14.  4 files changed, 4 insertions(+), 4 deletions(-)
  16. diff --git a/src/core/input.c b/src/core/input.c
  17. index fab88a50e..da18e5c89 100644
  18. --- a/src/core/input.c
  19. +++ b/src/core/input.c
  20. @@ -615,7 +615,7 @@ void mInputSetPreferredDevice(struct Configuration* config, const char* platform
  21.  
  22.  	char deviceId[KEY_NAME_MAX];
  23.  	snprintf(deviceId, sizeof(deviceId), "device%i", playerId);
  24. -	return ConfigurationSetValue(config, sectionName, deviceId, deviceName);
  25. +	ConfigurationSetValue(config, sectionName, deviceId, deviceName);
  26.  }
  27.  
  28.  const char* mInputGetCustomValue(const struct Configuration* config, const char* platformName, uint32_t type, const char* key, const char* profile) {
  29. diff --git a/src/core/interface.c b/src/core/interface.c
  30. index e6288e274..b808e32ba 100644
  31. --- a/src/core/interface.c
  32. +++ b/src/core/interface.c
  33. @@ -15,7 +15,7 @@ static void _rtcGenericSample(struct mRTCSource* source) {
  34.  	switch (rtc->override) {
  35.  	default:
  36.  		if (rtc->custom->sample) {
  37. -			return rtc->custom->sample(rtc->custom);
  38. +			rtc->custom->sample(rtc->custom);
  39.  		}
  40.  		break;
  41.  	case RTC_NO_OVERRIDE:
  42. diff --git a/src/gb/core.c b/src/gb/core.c
  43. index 9f67fd19d..5bceb1fae 100644
  44. --- a/src/gb/core.c
  45. +++ b/src/gb/core.c
  46. @@ -400,7 +400,7 @@ static void _GBCoreUnloadROM(struct mCore* core) {
  47.  		mCheatDeviceDestroy(gbcore->cheatDevice);
  48.  		gbcore->cheatDevice = NULL;
  49.  	}
  50. -	return GBUnloadROM(core->board);
  51. +	GBUnloadROM(core->board);
  52.  }
  53.  
  54.  static void _GBCoreChecksum(const struct mCore* core, void* data, enum mCoreChecksumType type) {
  55. diff --git a/src/gba/core.c b/src/gba/core.c
  56. index 901d25111..9444c8a5b 100644
  57. --- a/src/gba/core.c
  58. +++ b/src/gba/core.c
  59. @@ -506,7 +506,7 @@ static void _GBACoreUnloadROM(struct mCore* core) {
  60.  		mCheatDeviceDestroy(gbacore->cheatDevice);
  61.  		gbacore->cheatDevice = NULL;
  62.  	}
  63. -	return GBAUnloadROM(core->board);
  64. +	GBAUnloadROM(core->board);
  65.  }
  66.  
  67.  static void _GBACoreChecksum(const struct mCore* core, void* data, enum mCoreChecksumType type) {
  68. -- 
  69. 2.29.2