Skip to content

Commit 81708fa

Browse files
[pre-commit.ci lite] apply automatic fixes
1 parent e5cebf7 commit 81708fa

File tree

1 file changed

+118
-139
lines changed

1 file changed

+118
-139
lines changed

cores/esp32/dummy2.cpp

Lines changed: 118 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -20,177 +20,156 @@
2020

2121
#include "cbuf.h"
2222

23-
cbuf::cbuf(size_t size) :
24-
next(NULL), _size(size+1), _buf(new char[size+1]), _bufend(_buf + size + 1), _begin(_buf), _end(_begin)
25-
{
26-
}
23+
cbuf::cbuf(size_t size)
24+
: next(NULL), _size(size + 1), _buf(new char[size + 1]),
25+
_bufend(_buf + size + 1), _begin(_buf), _end(_begin) {}
2726

28-
cbuf::~cbuf()
29-
{
30-
delete[] _buf;
31-
}
27+
cbuf::~cbuf() { delete[] _buf; }
3228

33-
size_t cbuf::resizeAdd(size_t addSize)
34-
{
35-
return resize(_size + addSize);
36-
}
29+
size_t cbuf::resizeAdd(size_t addSize) { return resize(_size + addSize); }
3730

38-
size_t cbuf::resize(size_t newSize)
39-
{
31+
size_t cbuf::resize(size_t newSize) {
4032

41-
size_t bytes_available = available();
42-
newSize += 1;
43-
// not lose any data
44-
// if data can be lost use remove or flush before resize
45-
if((newSize < bytes_available) || (newSize == _size)) {
46-
return _size;
47-
}
33+
size_t bytes_available = available();
34+
newSize += 1;
35+
// not lose any data
36+
// if data can be lost use remove or flush before resize
37+
if ((newSize < bytes_available) || (newSize == _size)) {
38+
return _size;
39+
}
4840

49-
char *newbuf = new char[newSize];
50-
char *oldbuf = _buf;
41+
char *newbuf = new char[newSize];
42+
char *oldbuf = _buf;
5143

52-
if(!newbuf) {
53-
return _size;
54-
}
44+
if (!newbuf) {
45+
return _size;
46+
}
5547

56-
if(_buf) {
57-
read(newbuf, bytes_available);
58-
memset((newbuf + bytes_available), 0x00, (newSize - bytes_available));
59-
}
48+
if (_buf) {
49+
read(newbuf, bytes_available);
50+
memset((newbuf + bytes_available), 0x00, (newSize - bytes_available));
51+
}
6052

61-
_begin = newbuf;
62-
_end = newbuf + bytes_available;
63-
_bufend = newbuf + newSize;
64-
_size = newSize;
53+
_begin = newbuf;
54+
_end = newbuf + bytes_available;
55+
_bufend = newbuf + newSize;
56+
_size = newSize;
6557

66-
_buf = newbuf;
67-
delete[] oldbuf;
58+
_buf = newbuf;
59+
delete[] oldbuf;
6860

69-
return _size;
61+
return _size;
7062
}
7163

72-
size_t cbuf::available() const
73-
{
74-
if(_end >= _begin) {
75-
return _end - _begin;
76-
}
77-
return _size - (_begin - _end);
64+
size_t cbuf::available() const {
65+
if (_end >= _begin) {
66+
return _end - _begin;
67+
}
68+
return _size - (_begin - _end);
7869
}
7970

80-
size_t cbuf::size()
81-
{
82-
return _size;
83-
}
71+
size_t cbuf::size() { return _size; }
8472

85-
size_t cbuf::room() const
86-
{
87-
if(_end >= _begin) {
88-
return _size - (_end - _begin) - 1;
89-
}
90-
return _begin - _end - 1;
73+
size_t cbuf::room() const {
74+
if (_end >= _begin) {
75+
return _size - (_end - _begin) - 1;
76+
}
77+
return _begin - _end - 1;
9178
}
9279

93-
int cbuf::peek()
94-
{
95-
if(empty()) {
96-
return -1;
97-
}
80+
int cbuf::peek() {
81+
if (empty()) {
82+
return -1;
83+
}
9884

99-
return static_cast<int>(*_begin);
85+
return static_cast<int>(*_begin);
10086
}
10187

102-
size_t cbuf::peek(char *dst, size_t size)
103-
{
104-
size_t bytes_available = available();
105-
size_t size_to_read = (size < bytes_available) ? size : bytes_available;
106-
size_t size_read = size_to_read;
107-
char * begin = _begin;
108-
if(_end < _begin && size_to_read > (size_t) (_bufend - _begin)) {
109-
size_t top_size = _bufend - _begin;
110-
memcpy(dst, _begin, top_size);
111-
begin = _buf;
112-
size_to_read -= top_size;
113-
dst += top_size;
114-
}
115-
memcpy(dst, begin, size_to_read);
116-
return size_read;
88+
size_t cbuf::peek(char *dst, size_t size) {
89+
size_t bytes_available = available();
90+
size_t size_to_read = (size < bytes_available) ? size : bytes_available;
91+
size_t size_read = size_to_read;
92+
char *begin = _begin;
93+
if (_end < _begin && size_to_read > (size_t)(_bufend - _begin)) {
94+
size_t top_size = _bufend - _begin;
95+
memcpy(dst, _begin, top_size);
96+
begin = _buf;
97+
size_to_read -= top_size;
98+
dst += top_size;
99+
}
100+
memcpy(dst, begin, size_to_read);
101+
return size_read;
117102
}
118103

119-
int cbuf::read()
120-
{
121-
if(empty()) {
122-
return -1;
123-
}
104+
int cbuf::read() {
105+
if (empty()) {
106+
return -1;
107+
}
124108

125-
char result = *_begin;
126-
_begin = wrap_if_bufend(_begin + 1);
127-
return static_cast<int>(result);
109+
char result = *_begin;
110+
_begin = wrap_if_bufend(_begin + 1);
111+
return static_cast<int>(result);
128112
}
129113

130-
size_t cbuf::read(char* dst, size_t size)
131-
{
132-
size_t bytes_available = available();
133-
size_t size_to_read = (size < bytes_available) ? size : bytes_available;
134-
size_t size_read = size_to_read;
135-
if(_end < _begin && size_to_read > (size_t) (_bufend - _begin)) {
136-
size_t top_size = _bufend - _begin;
137-
memcpy(dst, _begin, top_size);
138-
_begin = _buf;
139-
size_to_read -= top_size;
140-
dst += top_size;
141-
}
142-
memcpy(dst, _begin, size_to_read);
143-
_begin = wrap_if_bufend(_begin + size_to_read);
144-
return size_read;
114+
size_t cbuf::read(char *dst, size_t size) {
115+
size_t bytes_available = available();
116+
size_t size_to_read = (size < bytes_available) ? size : bytes_available;
117+
size_t size_read = size_to_read;
118+
if (_end < _begin && size_to_read > (size_t)(_bufend - _begin)) {
119+
size_t top_size = _bufend - _begin;
120+
memcpy(dst, _begin, top_size);
121+
_begin = _buf;
122+
size_to_read -= top_size;
123+
dst += top_size;
124+
}
125+
memcpy(dst, _begin, size_to_read);
126+
_begin = wrap_if_bufend(_begin + size_to_read);
127+
return size_read;
145128
}
146129

147-
size_t cbuf::write(char c)
148-
{
149-
if(full()) {
150-
return 0;
151-
}
130+
size_t cbuf::write(char c) {
131+
if (full()) {
132+
return 0;
133+
}
152134

153-
*_end = c;
154-
_end = wrap_if_bufend(_end + 1);
155-
return 1;
135+
*_end = c;
136+
_end = wrap_if_bufend(_end + 1);
137+
return 1;
156138
}
157139

158-
size_t cbuf::write(const char* src, size_t size)
159-
{
160-
size_t bytes_available = room();
161-
size_t size_to_write = (size < bytes_available) ? size : bytes_available;
162-
size_t size_written = size_to_write;
163-
if(_end >= _begin && size_to_write > (size_t) (_bufend - _end)) {
164-
size_t top_size = _bufend - _end;
165-
memcpy(_end, src, top_size);
166-
_end = _buf;
167-
size_to_write -= top_size;
168-
src += top_size;
169-
}
170-
memcpy(_end, src, size_to_write);
171-
_end = wrap_if_bufend(_end + size_to_write);
172-
return size_written;
140+
size_t cbuf::write(const char *src, size_t size) {
141+
size_t bytes_available = room();
142+
size_t size_to_write = (size < bytes_available) ? size : bytes_available;
143+
size_t size_written = size_to_write;
144+
if (_end >= _begin && size_to_write > (size_t)(_bufend - _end)) {
145+
size_t top_size = _bufend - _end;
146+
memcpy(_end, src, top_size);
147+
_end = _buf;
148+
size_to_write -= top_size;
149+
src += top_size;
150+
}
151+
memcpy(_end, src, size_to_write);
152+
_end = wrap_if_bufend(_end + size_to_write);
153+
return size_written;
173154
}
174155

175-
void cbuf::flush()
176-
{
177-
_begin = _buf;
178-
_end = _buf;
156+
void cbuf::flush() {
157+
_begin = _buf;
158+
_end = _buf;
179159
}
180160

181-
size_t cbuf::remove(size_t size)
182-
{
183-
size_t bytes_available = available();
184-
if(size >= bytes_available) {
185-
flush();
186-
return 0;
187-
}
188-
size_t size_to_remove = (size < bytes_available) ? size : bytes_available;
189-
if(_end < _begin && size_to_remove > (size_t) (_bufend - _begin)) {
190-
size_t top_size = _bufend - _begin;
191-
_begin = _buf;
192-
size_to_remove -= top_size;
193-
}
194-
_begin = wrap_if_bufend(_begin + size_to_remove);
195-
return available();
161+
size_t cbuf::remove(size_t size) {
162+
size_t bytes_available = available();
163+
if (size >= bytes_available) {
164+
flush();
165+
return 0;
166+
}
167+
size_t size_to_remove = (size < bytes_available) ? size : bytes_available;
168+
if (_end < _begin && size_to_remove > (size_t)(_bufend - _begin)) {
169+
size_t top_size = _bufend - _begin;
170+
_begin = _buf;
171+
size_to_remove -= top_size;
172+
}
173+
_begin = wrap_if_bufend(_begin + size_to_remove);
174+
return available();
196175
}

0 commit comments

Comments
 (0)