Fix stream read line (#1054)
* stream: fix stream_read_line return * nfc: fix keys load Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
parent
1fdc5f2950
commit
2ba3a9f09a
@ -32,7 +32,7 @@ bool nfc_mf_classic_dict_get_next_key(Stream* stream, uint64_t* key) {
|
||||
|
||||
bool next_key_read = false;
|
||||
while(!next_key_read) {
|
||||
if(stream_read_line(stream, next_line)) break;
|
||||
if(!stream_read_line(stream, next_line)) break;
|
||||
if(string_get_char(next_line, 0) == '#') continue;
|
||||
if(string_size(next_line) != NFC_MF_CLASSIC_KEY_LEN) continue;
|
||||
for(uint8_t i = 0; i < 12; i += 2) {
|
||||
|
@ -99,7 +99,7 @@ bool stream_read_line(Stream* stream, string_t str_result) {
|
||||
}
|
||||
} while(true);
|
||||
|
||||
return stream_eof(stream);
|
||||
return string_size(str_result) != 0;
|
||||
}
|
||||
|
||||
bool stream_rewind(Stream* stream) {
|
||||
|
@ -102,8 +102,8 @@ bool stream_delete_and_insert(
|
||||
* Read line from a stream (supports LF and CRLF line endings)
|
||||
* @param stream
|
||||
* @param str_result
|
||||
* @return true if line was read
|
||||
* @return false if EOF
|
||||
* @return true if line lenght is not zero
|
||||
* @return false otherwise
|
||||
*/
|
||||
bool stream_read_line(Stream* stream, string_t str_result);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user