Fix cbuf::read and cbuf::peak return types

igrr · igrr · commit 260aee75f7ae · 2015-03-29T18:21:32.000+03:00
Fixes esp8266#12
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/cbuf.h b/hardware/esp8266com/esp8266/cores/esp8266/cbuf.h
@@ -60,23 +60,23 @@ class cbuf
         return _begin == _end;
     }
     
-    char peek()
+    int peek()
     {
         if (_end == _begin)
             return -1;
         
-        return *_begin;
+        return static_cast<int>(*_begin);
     }
     
-    char read()
+    int read()
     {
         if (getSize() == 0)
             return -1;
         
         char result = *_begin;
         if (++_begin == _bufend)
             _begin = _buf;
-        return result;
+        return static_cast<int>(result);
     }
     
     size_t read(char* dst, size_t size)

Original file line number	Diff line number	Diff line change
`@@ -60,23 +60,23 @@ class cbuf`
`60`	`60`	`return _begin == _end;`
`61`	`61`	`}`
`62`	`62`
`63`		`- char peek()`
	`63`	`+ int peek()`
`64`	`64`	`{`
`65`	`65`	`if (_end == _begin)`
`66`	`66`	`return -1;`
`67`	`67`
`68`		`- return *_begin;`
	`68`	`+ return static_cast<int>(*_begin);`
`69`	`69`	`}`
`70`	`70`
`71`		`- char read()`
	`71`	`+ int read()`
`72`	`72`	`{`
`73`	`73`	`if (getSize() == 0)`
`74`	`74`	`return -1;`
`75`	`75`
`76`	`76`	`char result = *_begin;`
`77`	`77`	`if (++_begin == _bufend)`
`78`	`78`	`_begin = _buf;`
`79`		`- return result;`
	`79`	`+ return static_cast<int>(result);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`size_t read(char* dst, size_t size)`