* Fixing compiler warnings with -Wextra * More warnings suppression, WIP * Even more warning fixes * Added new lines at end of text files. * Padding fix * Additional fixes to warnings on different build configurations; added -Wextra to default build pipeline * Fixes for Secplus v1 * -additional warnings * +-Wredundant-decls fixes * FuriHal: print stack overflow task name in console * FuriHal: add missing include Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
		
			
				
	
	
		
			337 lines
		
	
	
		
			9.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			337 lines
		
	
	
		
			9.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "stream.h"
 | 
						|
#include "stream_i.h"
 | 
						|
#include "file_stream.h"
 | 
						|
#include <furi/check.h>
 | 
						|
#include <furi/common_defines.h>
 | 
						|
 | 
						|
void stream_free(Stream* stream) {
 | 
						|
    furi_assert(stream);
 | 
						|
    stream->vtable->free(stream);
 | 
						|
}
 | 
						|
 | 
						|
void stream_clean(Stream* stream) {
 | 
						|
    furi_assert(stream);
 | 
						|
    stream->vtable->clean(stream);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_eof(Stream* stream) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream->vtable->eof(stream);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_seek(Stream* stream, int32_t offset, StreamOffset offset_type) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream->vtable->seek(stream, offset, offset_type);
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_tell(Stream* stream) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream->vtable->tell(stream);
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_size(Stream* stream) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream->vtable->size(stream);
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_write(Stream* stream, const uint8_t* data, size_t size) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream->vtable->write(stream, data, size);
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_read(Stream* stream, uint8_t* data, size_t size) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream->vtable->read(stream, data, size);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_delete_and_insert(
 | 
						|
    Stream* stream,
 | 
						|
    size_t delete_size,
 | 
						|
    StreamWriteCB write_callback,
 | 
						|
    const void* ctx) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream->vtable->delete_and_insert(stream, delete_size, write_callback, ctx);
 | 
						|
}
 | 
						|
 | 
						|
/********************************** Some random helpers starts here **********************************/
 | 
						|
 | 
						|
typedef struct {
 | 
						|
    const uint8_t* data;
 | 
						|
    size_t size;
 | 
						|
} StreamWriteData;
 | 
						|
 | 
						|
static bool stream_write_struct(Stream* stream, const void* context) {
 | 
						|
    furi_assert(stream);
 | 
						|
    furi_assert(context);
 | 
						|
    const StreamWriteData* write_data = context;
 | 
						|
    return (stream_write(stream, write_data->data, write_data->size) == write_data->size);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_read_line(Stream* stream, string_t str_result) {
 | 
						|
    string_reset(str_result);
 | 
						|
    const uint8_t buffer_size = 32;
 | 
						|
    uint8_t buffer[buffer_size];
 | 
						|
 | 
						|
    do {
 | 
						|
        uint16_t bytes_were_read = stream_read(stream, buffer, buffer_size);
 | 
						|
        if(bytes_were_read == 0) break;
 | 
						|
 | 
						|
        bool result = false;
 | 
						|
        bool error = false;
 | 
						|
        for(uint16_t i = 0; i < bytes_were_read; i++) {
 | 
						|
            if(buffer[i] == '\n') {
 | 
						|
                if(!stream_seek(stream, i - bytes_were_read + 1, StreamOffsetFromCurrent)) {
 | 
						|
                    error = true;
 | 
						|
                    break;
 | 
						|
                }
 | 
						|
                string_push_back(str_result, buffer[i]);
 | 
						|
                result = true;
 | 
						|
                break;
 | 
						|
            } else if(buffer[i] == '\r') {
 | 
						|
                // Ignore
 | 
						|
            } else {
 | 
						|
                string_push_back(str_result, buffer[i]);
 | 
						|
            }
 | 
						|
        }
 | 
						|
 | 
						|
        if(result || error) {
 | 
						|
            break;
 | 
						|
        }
 | 
						|
    } while(true);
 | 
						|
 | 
						|
    return string_size(str_result) != 0;
 | 
						|
}
 | 
						|
 | 
						|
bool stream_rewind(Stream* stream) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_seek(stream, 0, StreamOffsetFromStart);
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_write_char(Stream* stream, char c) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_write(stream, (const uint8_t*)&c, 1);
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_write_string(Stream* stream, string_t string) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_write(stream, (const uint8_t*)string_get_cstr(string), string_size(string));
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_write_cstring(Stream* stream, const char* string) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_write(stream, (const uint8_t*)string, strlen(string));
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_write_format(Stream* stream, const char* format, ...) {
 | 
						|
    furi_assert(stream);
 | 
						|
    size_t size;
 | 
						|
    va_list args;
 | 
						|
    va_start(args, format);
 | 
						|
    size = stream_write_vaformat(stream, format, args);
 | 
						|
    va_end(args);
 | 
						|
    return size;
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_write_vaformat(Stream* stream, const char* format, va_list args) {
 | 
						|
    furi_assert(stream);
 | 
						|
    string_t data;
 | 
						|
    string_init_vprintf(data, format, args);
 | 
						|
    size_t size = stream_write_string(stream, data);
 | 
						|
    string_clear(data);
 | 
						|
 | 
						|
    return size;
 | 
						|
}
 | 
						|
 | 
						|
bool stream_insert(Stream* stream, const uint8_t* data, size_t size) {
 | 
						|
    furi_assert(stream);
 | 
						|
    StreamWriteData write_data = {.data = data, .size = size};
 | 
						|
    return stream_delete_and_insert(stream, 0, stream_write_struct, &write_data);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_insert_char(Stream* stream, char c) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_delete_and_insert_char(stream, 0, c);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_insert_string(Stream* stream, string_t string) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_delete_and_insert_string(stream, 0, string);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_insert_cstring(Stream* stream, const char* string) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_delete_and_insert_cstring(stream, 0, string);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_insert_format(Stream* stream, const char* format, ...) {
 | 
						|
    furi_assert(stream);
 | 
						|
    va_list args;
 | 
						|
    va_start(args, format);
 | 
						|
    bool result = stream_insert_vaformat(stream, format, args);
 | 
						|
    va_end(args);
 | 
						|
 | 
						|
    return result;
 | 
						|
}
 | 
						|
 | 
						|
bool stream_insert_vaformat(Stream* stream, const char* format, va_list args) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_delete_and_insert_vaformat(stream, 0, format, args);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_delete_and_insert_char(Stream* stream, size_t delete_size, char c) {
 | 
						|
    furi_assert(stream);
 | 
						|
    StreamWriteData write_data = {.data = (uint8_t*)&c, .size = 1};
 | 
						|
    return stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_delete_and_insert_string(Stream* stream, size_t delete_size, string_t string) {
 | 
						|
    furi_assert(stream);
 | 
						|
    StreamWriteData write_data = {
 | 
						|
        .data = (uint8_t*)string_get_cstr(string), .size = string_size(string)};
 | 
						|
    return stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_delete_and_insert_cstring(Stream* stream, size_t delete_size, const char* string) {
 | 
						|
    furi_assert(stream);
 | 
						|
    StreamWriteData write_data = {.data = (uint8_t*)string, .size = strlen(string)};
 | 
						|
    return stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
 | 
						|
}
 | 
						|
 | 
						|
bool stream_delete_and_insert_format(Stream* stream, size_t delete_size, const char* format, ...) {
 | 
						|
    furi_assert(stream);
 | 
						|
    va_list args;
 | 
						|
    va_start(args, format);
 | 
						|
    bool result = stream_delete_and_insert_vaformat(stream, delete_size, format, args);
 | 
						|
    va_end(args);
 | 
						|
 | 
						|
    return result;
 | 
						|
}
 | 
						|
 | 
						|
bool stream_delete_and_insert_vaformat(
 | 
						|
    Stream* stream,
 | 
						|
    size_t delete_size,
 | 
						|
    const char* format,
 | 
						|
    va_list args) {
 | 
						|
    furi_assert(stream);
 | 
						|
    string_t data;
 | 
						|
    string_init_vprintf(data, format, args);
 | 
						|
    StreamWriteData write_data = {
 | 
						|
        .data = (uint8_t*)string_get_cstr(data), .size = string_size(data)};
 | 
						|
    bool result = stream_delete_and_insert(stream, delete_size, stream_write_struct, &write_data);
 | 
						|
    string_clear(data);
 | 
						|
 | 
						|
    return result;
 | 
						|
}
 | 
						|
 | 
						|
bool stream_delete(Stream* stream, size_t size) {
 | 
						|
    furi_assert(stream);
 | 
						|
    return stream_delete_and_insert(stream, size, NULL, NULL);
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_copy(Stream* stream_from, Stream* stream_to, size_t size) {
 | 
						|
    uint8_t* buffer = malloc(STREAM_CACHE_SIZE);
 | 
						|
    size_t copied = 0;
 | 
						|
 | 
						|
    do {
 | 
						|
        size_t bytes_count = MIN(STREAM_CACHE_SIZE, size - copied);
 | 
						|
        if(bytes_count <= 0) {
 | 
						|
            break;
 | 
						|
        }
 | 
						|
 | 
						|
        uint16_t bytes_were_read = stream_read(stream_from, buffer, bytes_count);
 | 
						|
        if(bytes_were_read != bytes_count) break;
 | 
						|
 | 
						|
        uint16_t bytes_were_written = stream_write(stream_to, buffer, bytes_count);
 | 
						|
        if(bytes_were_written != bytes_count) break;
 | 
						|
 | 
						|
        copied += bytes_count;
 | 
						|
    } while(true);
 | 
						|
 | 
						|
    free(buffer);
 | 
						|
    return copied;
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_copy_full(Stream* stream_from, Stream* stream_to) {
 | 
						|
    size_t was_written = 0;
 | 
						|
 | 
						|
    do {
 | 
						|
        if(!stream_seek(stream_from, 0, StreamOffsetFromStart)) break;
 | 
						|
        if(!stream_seek(stream_to, 0, StreamOffsetFromStart)) break;
 | 
						|
        was_written = stream_copy(stream_from, stream_to, stream_size(stream_from));
 | 
						|
    } while(false);
 | 
						|
 | 
						|
    return was_written;
 | 
						|
}
 | 
						|
 | 
						|
bool stream_split(Stream* stream, Stream* stream_left, Stream* stream_right) {
 | 
						|
    bool result = false;
 | 
						|
    size_t size = stream_size(stream);
 | 
						|
    size_t tell = stream_tell(stream);
 | 
						|
 | 
						|
    do {
 | 
						|
        // copy right
 | 
						|
        if(stream_copy(stream, stream_right, size - tell) != (size - tell)) break;
 | 
						|
 | 
						|
        // copy left
 | 
						|
        if(!stream_rewind(stream)) break;
 | 
						|
        if(stream_copy(stream, stream_left, tell) != tell) break;
 | 
						|
 | 
						|
        // restore RW pointer
 | 
						|
        if(!stream_seek(stream, tell, StreamOffsetFromStart)) break;
 | 
						|
        result = true;
 | 
						|
    } while(false);
 | 
						|
 | 
						|
    return result;
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_load_from_file(Stream* stream, Storage* storage, const char* path) {
 | 
						|
    size_t was_written = 0;
 | 
						|
    Stream* file = file_stream_alloc(storage);
 | 
						|
 | 
						|
    do {
 | 
						|
        if(!file_stream_open(file, path, FSAM_READ, FSOM_OPEN_EXISTING)) break;
 | 
						|
        was_written = stream_copy(file, stream, stream_size(file));
 | 
						|
    } while(false);
 | 
						|
 | 
						|
    stream_free(file);
 | 
						|
    return was_written;
 | 
						|
}
 | 
						|
 | 
						|
size_t stream_save_to_file(Stream* stream, Storage* storage, const char* path, FS_OpenMode mode) {
 | 
						|
    size_t was_written = 0;
 | 
						|
    Stream* file = file_stream_alloc(storage);
 | 
						|
 | 
						|
    do {
 | 
						|
        if(!file_stream_open(file, path, FSAM_WRITE, mode)) break;
 | 
						|
        was_written = stream_copy(stream, file, stream_size(stream));
 | 
						|
    } while(false);
 | 
						|
 | 
						|
    stream_free(file);
 | 
						|
    return was_written;
 | 
						|
}
 | 
						|
 | 
						|
void stream_dump_data(Stream* stream) {
 | 
						|
    size_t size = stream_size(stream);
 | 
						|
    size_t tell = stream_tell(stream);
 | 
						|
    printf("stream %p\r\n", stream);
 | 
						|
    printf("size = %u\r\n", size);
 | 
						|
    printf("tell = %u\r\n", tell);
 | 
						|
    printf("DATA START\r\n");
 | 
						|
    uint8_t* data = malloc(STREAM_CACHE_SIZE);
 | 
						|
    stream_rewind(stream);
 | 
						|
 | 
						|
    while(true) {
 | 
						|
        size_t was_read = stream_read(stream, data, STREAM_CACHE_SIZE);
 | 
						|
        if(was_read == 0) break;
 | 
						|
 | 
						|
        for(size_t i = 0; i < was_read; i++) {
 | 
						|
            printf("%c", data[i]);
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    free(data);
 | 
						|
    printf("\r\n");
 | 
						|
    printf("DATA END\r\n");
 | 
						|
    stream_seek(stream, tell, StreamOffsetFromStart);
 | 
						|
}
 |