Merge pull request #618 from bxparks/saferingbuffer

facchinm · web-flow · commit cfa28993b659 · 2021-04-06T23:27:02.000+02:00
SafeRingBuffer.h: Prevent compiler warning about reaching end of non-void function (see #580)
diff --git a/cores/arduino/SafeRingBuffer.h b/cores/arduino/SafeRingBuffer.h
@@ -41,6 +41,12 @@ int SafeRingBufferN<N>::read_char() {
   synchronized {
     return RingBufferN<N>::read_char();
   }
+
+  // We should never reached this line because the synchronized {} block gets
+  // executed at least once. However the compiler gets confused and prints a
+  // warning about control reaching the end of a non-void function. This
+  // silences that warning.
+  return -1;
 }
 
 template <int N>
@@ -53,4 +59,4 @@ void SafeRingBufferN<N>::store_char(uint8_t c) {
 }
 
 #endif /* _SAFE_RING_BUFFER_ */
-#endif /* __cplusplus */
+#endif /* __cplusplus */

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,12 @@ int SafeRingBufferN<N>::read_char() {`
`41`	`41`	`synchronized {`
`42`	`42`	`return RingBufferN<N>::read_char();`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ // We should never reached this line because the synchronized {} block gets`
	`46`	`+ // executed at least once. However the compiler gets confused and prints a`
	`47`	`+ // warning about control reaching the end of a non-void function. This`
	`48`	`+ // silences that warning.`
	`49`	`+ return -1;`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`template <int N>`
`@@ -53,4 +59,4 @@ void SafeRingBufferN<N>::store_char(uint8_t c) {`
`53`	`59`	`}`
`54`	`60`
`55`	`61`	`#endif /* _SAFE_RING_BUFFER_ */`
`56`		`-#endif /* __cplusplus */`
	`62`	`+#endif /* __cplusplus */`