arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

add more NULL prt checks in strtok_r

Browse Source 
Conflicts:
	libraries/SD/src/SD.cpp
	libraries/SD/src/SD.h
This commit is contained in:
Markus Sattler
2015-05-12 17:10:19 +02:00
parent d050ced4df 5c3508fe30
commit 9e76276fb2
7 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/SD/src/SD.cpp
View File

@ -326,7 +326,13 @@ boolean callback_rmdir(SdFile& parentDir, char *filePathComponent,
return true;
}
boolean SDClass::begin(uint8_t csPin, uint32_t sckRateID) {
/* Implementation of class used to create `SDCard` object. */
boolean SDClass::begin(uint8_t csPin, uint32_t speed) {
/*
Performs the initialisation required by the sdfatlib library.
@ -334,7 +340,7 @@ boolean SDClass::begin(uint8_t csPin, uint32_t sckRateID) {
Return true if initialization succeeds, false otherwise.
*/
return card.init(sckRateID, csPin) &&
return card.init(speed, csPin) &&
volume.init(card) &&
root.openRoot(volume);
}