arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Redoing peek() implementation (SD file class).

Browse Source 
Now simply seeking backwards by a character in peek() rather than trying to keep track of the extra character read.
This commit is contained in:
David A. Mellis
2010-12-22 16:47:50 -06:00
parent a7a8f3fa10
commit 575bb1dafb
4 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/SD/File.cpp
View File

@ -15,39 +15,29 @@
#include <SD.h>
void File::write(uint8_t val) {
SD.c = -1;
SD.file.write(val);
}
void File::write(const char *str) {
SD.c = -1;
SD.file.write(str);
}
void File::write(const uint8_t *buf, size_t size) {
SD.c = -1;
SD.file.write(buf, size);
}
int File::peek() {
if (SD.c != -1) return SD.c;
SD.c = SD.file.read();
return SD.c;
char c = SD.file.read();
if (c != -1) SD.file.seekCur(-1);
return c;
}
int File::read() {
if (SD.c != -1) {
int tmp = SD.c;
SD.c = -1;
return tmp;
}
return SD.file.read();
}
int File::available() {
if (SD.c != -1) return 1;
SD.c = SD.file.read();
return SD.c != -1;
return size() - position();
}
void File::flush() {
@ -55,12 +45,10 @@ void File::flush() {
}
boolean File::seek(uint32_t pos) {
SD.c = -1;
return SD.file.seekSet(pos);
}
uint32_t File::position() {
if (SD.c != -1) return SD.file.curPosition() - 1;
return SD.file.curPosition();
}