diff --git a/.gitmodules b/.gitmodules index ba7644981207..ad6a405e9729 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "lib/mlib"] path = lib/mlib - url = https://github.com/P-p-H-d/mlib.git + url = https://github.com/flipperdevices/mlib.git [submodule "lib/STM32CubeWB"] path = lib/STM32CubeWB url = https://github.com/Flipper-Zero/STM32CubeWB.git diff --git a/applications/main/subghz/subghz_cli.c b/applications/main/subghz/subghz_cli.c index d921979f0d2e..56072cba9995 100644 --- a/applications/main/subghz/subghz_cli.c +++ b/applications/main/subghz/subghz_cli.c @@ -604,15 +604,15 @@ static void subghz_cli_command_chat(Cli* cli, string_t args) { //delete 1 char UTF const char* str = string_get_cstr(input); size_t size = 0; - m_str1ng_utf8_state_e s = M_STRING_UTF8_STARTING; + m_str1ng_utf8_state_e s = M_STR1NG_UTF8_STARTING; string_unicode_t u = 0; string_reset(sysmsg); while(*str) { m_str1ng_utf8_decode(*str, &s, &u); - if((s == M_STRING_UTF8_ERROR) || s == M_STRING_UTF8_STARTING) { + if((s == M_STR1NG_UTF8_ERROR) || s == M_STR1NG_UTF8_STARTING) { string_push_u(sysmsg, u); if(++size >= len - 1) break; - s = M_STRING_UTF8_STARTING; + s = M_STR1NG_UTF8_STARTING; } str++; } diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv index c18780acbe57..fafc20e1ace9 100644 --- a/firmware/targets/f7/api_symbols.csv +++ b/firmware/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,1.12,, +Version,+,2.0,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli_vcp.h,, @@ -439,12 +439,12 @@ Function,-,arc4random,__uint32_t, Function,-,arc4random_buf,void,"void*, size_t" Function,-,arc4random_uniform,__uint32_t,__uint32_t Function,+,args_char_to_hex,_Bool,"char, char, uint8_t*" -Function,+,args_get_first_word_length,size_t,string_t -Function,+,args_length,size_t,string_t -Function,+,args_read_hex_bytes,_Bool,"string_t, uint8_t*, size_t" -Function,+,args_read_int_and_trim,_Bool,"string_t, int*" -Function,+,args_read_probably_quoted_string_and_trim,_Bool,"string_t, string_t" -Function,+,args_read_string_and_trim,_Bool,"string_t, string_t" +Function,+,args_get_first_word_length,size_t,m_string_t +Function,+,args_length,size_t,m_string_t +Function,+,args_read_hex_bytes,_Bool,"m_string_t, uint8_t*, size_t" +Function,+,args_read_int_and_trim,_Bool,"m_string_t, int*" +Function,+,args_read_probably_quoted_string_and_trim,_Bool,"m_string_t, m_string_t" +Function,+,args_read_string_and_trim,_Bool,"m_string_t, m_string_t" Function,-,asin,double,double Function,-,asinf,float,float Function,-,asinh,double,double @@ -641,7 +641,7 @@ Function,+,dialog_ex_set_result_callback,void,"DialogEx*, DialogExResultCallback Function,+,dialog_ex_set_right_button_text,void,"DialogEx*, const char*" Function,+,dialog_ex_set_text,void,"DialogEx*, const char*, uint8_t, uint8_t, Align, Align" Function,+,dialog_file_browser_set_basic_options,void,"DialogsFileBrowserOptions*, const char*, const Icon*" -Function,+,dialog_file_browser_show,_Bool,"DialogsApp*, string_ptr, string_ptr, const DialogsFileBrowserOptions*" +Function,+,dialog_file_browser_show,_Bool,"DialogsApp*, m_string_ptr, m_string_ptr, const DialogsFileBrowserOptions*" Function,+,dialog_message_alloc,DialogMessage*, Function,+,dialog_message_free,void,DialogMessage* Function,+,dialog_message_set_buttons,void,"DialogMessage*, const char*, const char*, const char*" @@ -664,7 +664,7 @@ Function,+,dir_walk_close,void,DirWalk* Function,+,dir_walk_free,void,DirWalk* Function,+,dir_walk_get_error,FS_Error,DirWalk* Function,+,dir_walk_open,_Bool,"DirWalk*, const char*" -Function,+,dir_walk_read,DirWalkResult,"DirWalk*, string_t, FileInfo*" +Function,+,dir_walk_read,DirWalkResult,"DirWalk*, m_string_t, FileInfo*" Function,+,dir_walk_set_filter_cb,void,"DirWalk*, DirWalkFilterCb, void*" Function,+,dir_walk_set_recursive,void,"DirWalk*, _Bool" Function,-,div,div_t,"int, int" @@ -697,7 +697,7 @@ Function,+,elements_scrollbar,void,"Canvas*, uint16_t, uint16_t" Function,+,elements_scrollbar_pos,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint16_t, uint16_t" Function,+,elements_slightly_rounded_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" Function,+,elements_slightly_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" -Function,+,elements_string_fit_width,void,"Canvas*, string_t, uint8_t" +Function,+,elements_string_fit_width,void,"Canvas*, m_string_t, uint8_t" Function,+,elements_text_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, Align, Align, const char*, _Bool" Function,+,empty_screen_alloc,EmptyScreen*, Function,+,empty_screen_free,void,EmptyScreen* @@ -745,22 +745,22 @@ Function,-,fgetc_unlocked,int,FILE* Function,-,fgetpos,int,"FILE*, fpos_t*" Function,-,fgets,char*,"char*, int, FILE*" Function,-,fgets_unlocked,char*,"char*, int, FILE*" -Function,+,file_browser_alloc,FileBrowser*,string_ptr +Function,+,file_browser_alloc,FileBrowser*,m_string_ptr Function,+,file_browser_configure,void,"FileBrowser*, const char*, _Bool, const Icon*, _Bool" Function,+,file_browser_free,void,FileBrowser* Function,+,file_browser_get_view,View*,FileBrowser* Function,+,file_browser_set_callback,void,"FileBrowser*, FileBrowserCallback, void*" Function,+,file_browser_set_item_callback,void,"FileBrowser*, FileBrowserLoadItemCallback, void*" -Function,+,file_browser_start,void,"FileBrowser*, string_t" +Function,+,file_browser_start,void,"FileBrowser*, m_string_t" Function,+,file_browser_stop,void,FileBrowser* -Function,+,file_browser_worker_alloc,BrowserWorker*,"string_t, const char*, _Bool" -Function,+,file_browser_worker_folder_enter,void,"BrowserWorker*, string_t, int32_t" +Function,+,file_browser_worker_alloc,BrowserWorker*,"m_string_t, const char*, _Bool" +Function,+,file_browser_worker_folder_enter,void,"BrowserWorker*, m_string_t, int32_t" Function,+,file_browser_worker_folder_exit,void,BrowserWorker* Function,+,file_browser_worker_folder_refresh,void,"BrowserWorker*, int32_t" Function,+,file_browser_worker_free,void,BrowserWorker* Function,+,file_browser_worker_load,void,"BrowserWorker*, uint32_t, uint32_t" Function,+,file_browser_worker_set_callback_context,void,"BrowserWorker*, void*" -Function,+,file_browser_worker_set_config,void,"BrowserWorker*, string_t, const char*, _Bool" +Function,+,file_browser_worker_set_config,void,"BrowserWorker*, m_string_t, const char*, _Bool" Function,+,file_browser_worker_set_folder_callback,void,"BrowserWorker*, BrowserWorkerFolderOpenCallback" Function,+,file_browser_worker_set_item_callback,void,"BrowserWorker*, BrowserWorkerListItemCallback" Function,+,file_browser_worker_set_list_callback,void,"BrowserWorker*, BrowserWorkerListLoadCallback" @@ -805,17 +805,17 @@ Function,+,flipper_format_insert_or_update_bool,_Bool,"FlipperFormat*, const cha Function,+,flipper_format_insert_or_update_float,_Bool,"FlipperFormat*, const char*, const float*, const uint16_t" Function,+,flipper_format_insert_or_update_hex,_Bool,"FlipperFormat*, const char*, const uint8_t*, const uint16_t" Function,+,flipper_format_insert_or_update_int32,_Bool,"FlipperFormat*, const char*, const int32_t*, const uint16_t" -Function,+,flipper_format_insert_or_update_string,_Bool,"FlipperFormat*, const char*, string_t" +Function,+,flipper_format_insert_or_update_string,_Bool,"FlipperFormat*, const char*, m_string_t" Function,+,flipper_format_insert_or_update_string_cstr,_Bool,"FlipperFormat*, const char*, const char*" Function,+,flipper_format_insert_or_update_uint32,_Bool,"FlipperFormat*, const char*, const uint32_t*, const uint16_t" Function,+,flipper_format_key_exist,_Bool,"FlipperFormat*, const char*" Function,+,flipper_format_read_bool,_Bool,"FlipperFormat*, const char*, _Bool*, const uint16_t" Function,+,flipper_format_read_float,_Bool,"FlipperFormat*, const char*, float*, const uint16_t" -Function,+,flipper_format_read_header,_Bool,"FlipperFormat*, string_t, uint32_t*" +Function,+,flipper_format_read_header,_Bool,"FlipperFormat*, m_string_t, uint32_t*" Function,+,flipper_format_read_hex,_Bool,"FlipperFormat*, const char*, uint8_t*, const uint16_t" Function,+,flipper_format_read_hex_uint64,_Bool,"FlipperFormat*, const char*, uint64_t*, const uint16_t" Function,+,flipper_format_read_int32,_Bool,"FlipperFormat*, const char*, int32_t*, const uint16_t" -Function,+,flipper_format_read_string,_Bool,"FlipperFormat*, const char*, string_t" +Function,+,flipper_format_read_string,_Bool,"FlipperFormat*, const char*, m_string_t" Function,+,flipper_format_read_uint32,_Bool,"FlipperFormat*, const char*, uint32_t*, const uint16_t" Function,+,flipper_format_rewind,_Bool,FlipperFormat* Function,+,flipper_format_seek_to_end,_Bool,FlipperFormat* @@ -825,19 +825,19 @@ Function,+,flipper_format_update_bool,_Bool,"FlipperFormat*, const char*, const Function,+,flipper_format_update_float,_Bool,"FlipperFormat*, const char*, const float*, const uint16_t" Function,+,flipper_format_update_hex,_Bool,"FlipperFormat*, const char*, const uint8_t*, const uint16_t" Function,+,flipper_format_update_int32,_Bool,"FlipperFormat*, const char*, const int32_t*, const uint16_t" -Function,+,flipper_format_update_string,_Bool,"FlipperFormat*, const char*, string_t" +Function,+,flipper_format_update_string,_Bool,"FlipperFormat*, const char*, m_string_t" Function,+,flipper_format_update_string_cstr,_Bool,"FlipperFormat*, const char*, const char*" Function,+,flipper_format_update_uint32,_Bool,"FlipperFormat*, const char*, const uint32_t*, const uint16_t" Function,+,flipper_format_write_bool,_Bool,"FlipperFormat*, const char*, const _Bool*, const uint16_t" -Function,+,flipper_format_write_comment,_Bool,"FlipperFormat*, string_t" +Function,+,flipper_format_write_comment,_Bool,"FlipperFormat*, m_string_t" Function,+,flipper_format_write_comment_cstr,_Bool,"FlipperFormat*, const char*" Function,+,flipper_format_write_float,_Bool,"FlipperFormat*, const char*, const float*, const uint16_t" -Function,+,flipper_format_write_header,_Bool,"FlipperFormat*, string_t, const uint32_t" +Function,+,flipper_format_write_header,_Bool,"FlipperFormat*, m_string_t, const uint32_t" Function,+,flipper_format_write_header_cstr,_Bool,"FlipperFormat*, const char*, const uint32_t" Function,+,flipper_format_write_hex,_Bool,"FlipperFormat*, const char*, const uint8_t*, const uint16_t" Function,+,flipper_format_write_hex_uint64,_Bool,"FlipperFormat*, const char*, const uint64_t*, const uint16_t" Function,+,flipper_format_write_int32,_Bool,"FlipperFormat*, const char*, const int32_t*, const uint16_t" -Function,+,flipper_format_write_string,_Bool,"FlipperFormat*, const char*, string_t" +Function,+,flipper_format_write_string,_Bool,"FlipperFormat*, const char*, m_string_t" Function,+,flipper_format_write_string_cstr,_Bool,"FlipperFormat*, const char*, const char*" Function,+,flipper_format_write_uint32,_Bool,"FlipperFormat*, const char*, const uint32_t*, const uint16_t" Function,-,flockfile,void,FILE* @@ -898,7 +898,7 @@ Function,+,furi_event_flag_wait,uint32_t,"FuriEventFlag*, uint32_t, uint32_t, ui Function,+,furi_get_tick,uint32_t, Function,+,furi_hal_bt_change_app,_Bool,"FuriHalBtProfile, GapEventCallback, void*" Function,+,furi_hal_bt_clear_white_list,_Bool, -Function,+,furi_hal_bt_dump_state,void,string_t +Function,+,furi_hal_bt_dump_state,void,m_string_t Function,+,furi_hal_bt_ensure_c2_mode,_Bool,BleGlueC2Mode Function,+,furi_hal_bt_get_key_storage_buff,void,"uint8_t**, uint16_t*" Function,+,furi_hal_bt_get_radio_stack,FuriHalBtStack, @@ -1576,6 +1576,101 @@ Function,-,lrintl,long int,long double Function,-,lround,long int,double Function,-,lroundf,long int,float Function,-,lroundl,long,long double +Function,-,m_str1ng_fit2size,char*,"m_string_t, size_t" +Function,-,m_str1ng_get_cstr,char*,m_string_t +Function,-,m_str1ng_replace_all_cstr_1ge2,void,"m_string_t, const char[], size_t, const char[], size_t" +Function,-,m_str1ng_replace_all_cstr_1lo2,void,"m_string_t, const char[], size_t, const char[], size_t" +Function,-,m_str1ng_set_size,void,"m_string_t, size_t" +Function,-,m_str1ng_stack_p,_Bool,const m_string_t +Function,-,m_str1ng_strim_char,_Bool,"char, const char[]" +Function,-,m_str1ng_strstr_r,char*,"char[], char[], const char[], size_t" +Function,-,m_str1ng_utf8_decode,void,"char, m_str1ng_utf8_state_e*, m_string_unicode_t*" +Function,-,m_str1ng_utf8_encode,int,"char[5], m_string_unicode_t" +Function,-,m_str1ng_utf8_length,size_t,const char[] +Function,-,m_str1ng_utf8_start_p,_Bool,unsigned char +Function,-,m_str1ng_utf8_valid_str_p,_Bool,const char[] +Function,+,m_string_capacity,size_t,const m_string_t +Function,+,m_string_cat,void,"m_string_t, const m_string_t" +Function,+,m_string_cat_cstr,void,"m_string_t, const char[]" +Function,+,m_string_cat_printf,int,"m_string_t, const char[], ..." +Function,+,m_string_clear,void,m_string_t +Function,+,m_string_clear_get_cstr,char*,m_string_t +Function,+,m_string_cmp,int,"const m_string_t, const m_string_t" +Function,+,m_string_cmp_cstr,int,"const m_string_t, const char[]" +Function,+,m_string_cmpi,int,"const m_string_t, const m_string_t" +Function,+,m_string_cmpi_cstr,int,"const m_string_t, const char[]" +Function,+,m_string_cref,const m_string_unicode_t*,m_string_it_t +Function,+,m_string_cspn,size_t,"const m_string_t, const char[]" +Function,+,m_string_empty_p,_Bool,const m_string_t +Function,+,m_string_end_p,_Bool,m_string_it_t +Function,+,m_string_end_with_str_p,_Bool,"const m_string_t, const char[]" +Function,+,m_string_end_with_string_p,_Bool,"const m_string_t, const m_string_t" +Function,+,m_string_equal_cstr_p,_Bool,"const m_string_t, const char[]" +Function,+,m_string_equal_p,_Bool,"const m_string_t, const m_string_t" +Function,-,m_string_fget_word,_Bool,"m_string_t, const char[], FILE*" +Function,-,m_string_fgets,_Bool,"m_string_t, FILE*, m_string_fgets_t" +Function,-,m_string_fputs,_Bool,"FILE*, const m_string_t" +Function,+,m_string_get_char,char,"const m_string_t, size_t" +Function,+,m_string_get_cref,m_string_unicode_t,const m_string_it_t +Function,+,m_string_get_cstr,const char*,const m_string_t +Function,+,m_string_get_str,void,"m_string_t, const m_string_t, _Bool" +Function,+,m_string_hash,size_t,const m_string_t +Function,-,m_string_in_serial,m_serial_return_code_t,"m_string_t, m_serial_read_t" +Function,-,m_string_in_str,_Bool,"m_string_t, FILE*" +Function,+,m_string_init,void,m_string_t +Function,+,m_string_init_move,void,"m_string_t, m_string_t" +Function,+,m_string_init_set,void,"m_string_t, const m_string_t" +Function,+,m_string_init_set_cstr,void,"m_string_t, const char[]" +Function,+,m_string_it,void,"m_string_it_t, const m_string_t" +Function,+,m_string_it_end,void,"m_string_it_t, const m_string_t" +Function,+,m_string_it_equal_p,_Bool,"const m_string_it_t, const m_string_it_t" +Function,+,m_string_it_get_pos,size_t,m_string_it_t +Function,+,m_string_it_pos,void,"m_string_it_t, const m_string_t, const size_t" +Function,+,m_string_it_set,void,"m_string_it_t, const m_string_it_t" +Function,+,m_string_left,void,"m_string_t, size_t" +Function,+,m_string_length_u,size_t,m_string_t +Function,+,m_string_mid,void,"m_string_t, size_t, size_t" +Function,+,m_string_move,void,"m_string_t, m_string_t" +Function,+,m_string_next,void,m_string_it_t +Function,+,m_string_oor_equal_p,_Bool,"const m_string_t, unsigned char" +Function,+,m_string_oor_set,void,"m_string_t, unsigned char" +Function,-,m_string_out_serial,m_serial_return_code_t,"m_serial_write_t, const m_string_t" +Function,-,m_string_out_str,void,"FILE*, const m_string_t" +Function,-,m_string_parse_str,_Bool,"m_string_t, const char[], const char**" +Function,+,m_string_previous,void,m_string_it_t +Function,+,m_string_printf,int,"m_string_t, const char[], ..." +Function,+,m_string_push_back,void,"m_string_t, char" +Function,+,m_string_push_u,void,"m_string_t, m_string_unicode_t" +Function,+,m_string_replace,size_t,"m_string_t, const m_string_t, const m_string_t, size_t" +Function,+,m_string_replace_all,void,"m_string_t, const m_string_t, const m_string_t" +Function,+,m_string_replace_all_cstr,void,"m_string_t, const char[], const char[]" +Function,+,m_string_replace_at,void,"m_string_t, size_t, size_t, const char[]" +Function,+,m_string_replace_cstr,size_t,"m_string_t, const char[], const char[], size_t" +Function,+,m_string_reserve,void,"m_string_t, size_t" +Function,+,m_string_reset,void,m_string_t +Function,+,m_string_right,void,"m_string_t, size_t" +Function,+,m_string_search,size_t,"const m_string_t, const m_string_t, size_t" +Function,+,m_string_search_char,size_t,"const m_string_t, char, size_t" +Function,+,m_string_search_cstr,size_t,"const m_string_t, const char[], size_t" +Function,+,m_string_search_pbrk,size_t,"const m_string_t, const char[], size_t" +Function,+,m_string_search_rchar,size_t,"const m_string_t, char, size_t" +Function,+,m_string_set,void,"m_string_t, const m_string_t" +Function,+,m_string_set_char,void,"m_string_t, size_t, const char" +Function,+,m_string_set_cstr,void,"m_string_t, const char[]" +Function,+,m_string_set_cstrn,void,"m_string_t, const char[], size_t" +Function,+,m_string_set_n,void,"m_string_t, const m_string_t, size_t, size_t" +Function,+,m_string_set_si,void,"m_string_t, int" +Function,+,m_string_set_ui,void,"m_string_t, unsigned int" +Function,+,m_string_size,size_t,const m_string_t +Function,+,m_string_spn,size_t,"const m_string_t, const char[]" +Function,+,m_string_start_with_str_p,_Bool,"const m_string_t, const char[]" +Function,+,m_string_start_with_string_p,_Bool,"const m_string_t, const m_string_t" +Function,+,m_string_strcoll,int,"const m_string_t, const m_string_t" +Function,+,m_string_strcoll_cstr,int,"const m_string_t, const char[]" +Function,+,m_string_strim,void,"m_string_t, const char[]" +Function,+,m_string_swap,void,"m_string_t, m_string_t" +Function,+,m_string_utf8_p,_Bool,m_string_t +Function,+,m_string_vprintf,int,"m_string_t, const char[], va_list" Function,+,malloc,void*,size_t Function,+,manchester_advance,_Bool,"ManchesterState, ManchesterEvent, ManchesterState*, _Bool*" Function,+,manchester_encoder_advance,_Bool,"ManchesterEncoderState*, const _Bool, ManchesterEncoderResult*" @@ -1678,14 +1773,14 @@ Function,+,onewire_slave_set_result_callback,void,"OneWireSlave*, OneWireSlaveRe Function,+,onewire_slave_start,void,OneWireSlave* Function,+,onewire_slave_stop,void,OneWireSlave* Function,-,open_memstream,FILE*,"char**, size_t*" -Function,+,path_append,void,"string_t, const char*" -Function,+,path_concat,void,"const char*, const char*, string_t" +Function,+,path_append,void,"m_string_t, const char*" +Function,+,path_concat,void,"const char*, const char*, m_string_t" Function,+,path_contains_only_ascii,_Bool,const char* -Function,+,path_extract_basename,void,"const char*, string_t" -Function,+,path_extract_dirname,void,"const char*, string_t" -Function,+,path_extract_extension,void,"string_t, char*, size_t" -Function,+,path_extract_filename,void,"string_t, string_t, _Bool" -Function,+,path_extract_filename_no_ext,void,"const char*, string_t" +Function,+,path_extract_basename,void,"const char*, m_string_t" +Function,+,path_extract_dirname,void,"const char*, m_string_t" +Function,+,path_extract_extension,void,"m_string_t, char*, size_t" +Function,+,path_extract_filename,void,"m_string_t, m_string_t, _Bool" +Function,+,path_extract_filename_no_ext,void,"const char*, m_string_t" Function,-,pcTaskGetName,char*,TaskHandle_t Function,-,pcTimerGetName,const char*,TimerHandle_t Function,-,pclose,int,FILE* @@ -1739,8 +1834,8 @@ Function,+,protocol_dict_get_name,const char*,"ProtocolDict*, size_t" Function,+,protocol_dict_get_protocol_by_name,ProtocolId,"ProtocolDict*, const char*" Function,+,protocol_dict_get_validate_count,uint32_t,"ProtocolDict*, size_t" Function,+,protocol_dict_get_write_data,_Bool,"ProtocolDict*, size_t, void*" -Function,+,protocol_dict_render_brief_data,void,"ProtocolDict*, string_t, size_t" -Function,+,protocol_dict_render_data,void,"ProtocolDict*, string_t, size_t" +Function,+,protocol_dict_render_brief_data,void,"ProtocolDict*, m_string_t, size_t" +Function,+,protocol_dict_render_data,void,"ProtocolDict*, m_string_t, size_t" Function,+,protocol_dict_set_data,void,"ProtocolDict*, size_t, const uint8_t*, size_t" Function,-,pselect,int,"int, fd_set*, fd_set*, fd_set*, const timespec*, const sigset_t*" Function,-,putc,int,"int, FILE*" @@ -2067,7 +2162,7 @@ Function,-,storage_file_sync,_Bool,File* Function,+,storage_file_tell,uint64_t,File* Function,+,storage_file_truncate,_Bool,File* Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t" -Function,+,storage_get_next_filename,void,"Storage*, const char*, const char*, const char*, string_t, uint8_t" +Function,+,storage_get_next_filename,void,"Storage*, const char*, const char*, const char*, m_string_t, uint8_t" Function,+,storage_get_pubsub,FuriPubSub*,Storage* Function,+,storage_int_backup,FS_Error,"Storage*, const char*" Function,+,storage_int_restore,FS_Error,"Storage*, const char*, Storage_name_converter" @@ -2100,7 +2195,7 @@ Function,+,stream_delete_and_insert,_Bool,"Stream*, size_t, StreamWriteCB, const Function,+,stream_delete_and_insert_char,_Bool,"Stream*, size_t, char" Function,+,stream_delete_and_insert_cstring,_Bool,"Stream*, size_t, const char*" Function,+,stream_delete_and_insert_format,_Bool,"Stream*, size_t, const char*, ..." -Function,+,stream_delete_and_insert_string,_Bool,"Stream*, size_t, string_t" +Function,+,stream_delete_and_insert_string,_Bool,"Stream*, size_t, m_string_t" Function,+,stream_delete_and_insert_vaformat,_Bool,"Stream*, size_t, const char*, va_list" Function,+,stream_dump_data,void,Stream* Function,+,stream_eof,_Bool,Stream* @@ -2109,11 +2204,11 @@ Function,+,stream_insert,_Bool,"Stream*, const uint8_t*, size_t" Function,+,stream_insert_char,_Bool,"Stream*, char" Function,+,stream_insert_cstring,_Bool,"Stream*, const char*" Function,+,stream_insert_format,_Bool,"Stream*, const char*, ..." -Function,+,stream_insert_string,_Bool,"Stream*, string_t" +Function,+,stream_insert_string,_Bool,"Stream*, m_string_t" Function,+,stream_insert_vaformat,_Bool,"Stream*, const char*, va_list" Function,+,stream_load_from_file,size_t,"Stream*, Storage*, const char*" Function,+,stream_read,size_t,"Stream*, uint8_t*, size_t" -Function,+,stream_read_line,_Bool,"Stream*, string_t" +Function,+,stream_read_line,_Bool,"Stream*, m_string_t" Function,+,stream_rewind,_Bool,Stream* Function,+,stream_save_to_file,size_t,"Stream*, Storage*, const char*, FS_OpenMode" Function,+,stream_seek,_Bool,"Stream*, int32_t, StreamOffset" @@ -2124,7 +2219,7 @@ Function,+,stream_write,size_t,"Stream*, const uint8_t*, size_t" Function,+,stream_write_char,size_t,"Stream*, char" Function,+,stream_write_cstring,size_t,"Stream*, const char*" Function,+,stream_write_format,size_t,"Stream*, const char*, ..." -Function,+,stream_write_string,size_t,"Stream*, string_t" +Function,+,stream_write_string,size_t,"Stream*, m_string_t" Function,+,stream_write_vaformat,size_t,"Stream*, const char*, va_list" Function,-,strerror,char*,int Function,-,strerror_l,char*,"int, locale_t" @@ -2185,14 +2280,14 @@ Function,-,subghz_keystore_raw_get_data,_Bool,"const char*, size_t, uint8_t*, si Function,-,subghz_keystore_save,_Bool,"SubGhzKeystore*, const char*, uint8_t*" Function,-,subghz_protocol_decoder_base_deserialize,_Bool,"SubGhzProtocolDecoderBase*, FlipperFormat*" Function,-,subghz_protocol_decoder_base_get_hash_data,uint8_t,SubGhzProtocolDecoderBase* -Function,-,subghz_protocol_decoder_base_get_string,_Bool,"SubGhzProtocolDecoderBase*, string_t" +Function,-,subghz_protocol_decoder_base_get_string,_Bool,"SubGhzProtocolDecoderBase*, m_string_t" Function,+,subghz_protocol_decoder_base_serialize,_Bool,"SubGhzProtocolDecoderBase*, FlipperFormat*, SubGhzPresetDefinition*" Function,-,subghz_protocol_decoder_base_set_decoder_callback,void,"SubGhzProtocolDecoderBase*, SubGhzProtocolDecoderBaseRxCallback, void*" Function,+,subghz_protocol_decoder_raw_alloc,void*,SubGhzEnvironment* Function,+,subghz_protocol_decoder_raw_deserialize,_Bool,"void*, FlipperFormat*" Function,+,subghz_protocol_decoder_raw_feed,void,"void*, _Bool, uint32_t" Function,+,subghz_protocol_decoder_raw_free,void,void* -Function,+,subghz_protocol_decoder_raw_get_string,void,"void*, string_t" +Function,+,subghz_protocol_decoder_raw_get_string,void,"void*, m_string_t" Function,+,subghz_protocol_decoder_raw_reset,void,void* Function,+,subghz_protocol_encoder_raw_alloc,void*,SubGhzEnvironment* Function,+,subghz_protocol_encoder_raw_deserialize,_Bool,"void*, FlipperFormat*" @@ -2382,7 +2477,7 @@ Function,-,vTimerSetReloadMode,void,"TimerHandle_t, const UBaseType_t" Function,-,vTimerSetTimerID,void,"TimerHandle_t, void*" Function,-,vTimerSetTimerNumber,void,"TimerHandle_t, UBaseType_t" Function,+,validator_is_file_alloc_init,ValidatorIsFile*,"const char*, const char*, const char*" -Function,+,validator_is_file_callback,_Bool,"const char*, string_t, void*" +Function,+,validator_is_file_callback,_Bool,"const char*, m_string_t, void*" Function,+,validator_is_file_free,void,ValidatorIsFile* Function,+,variable_item_get_context,void*,VariableItem* Function,+,variable_item_get_current_value_index,uint8_t,VariableItem* diff --git a/lib/misc.scons b/lib/misc.scons index b7d8554b5903..1cca15c95fce 100644 --- a/lib/misc.scons +++ b/lib/misc.scons @@ -37,6 +37,7 @@ for lib in libs_recurse: libs_plain = [ "heatshrink", "nanopb", + "mlib", ] for lib in libs_plain: diff --git a/lib/mlib b/lib/mlib index 62c8ac3e5d4a..a70a25e84850 160000 --- a/lib/mlib +++ b/lib/mlib @@ -1 +1 @@ -Subproject commit 62c8ac3e5d4a7a4f8757328e7a80286fde2686b6 +Subproject commit a70a25e84850984d5a6aaae5423d66b919113b20 diff --git a/lib/toolbox/m_cstr_dup.h b/lib/toolbox/m_cstr_dup.h index 2bc35c877746..692d32357bfa 100644 --- a/lib/toolbox/m_cstr_dup.h +++ b/lib/toolbox/m_cstr_dup.h @@ -2,7 +2,7 @@ #include #define M_INIT_DUP(a) ((a) = strdup("")) -#define M_SET_DUP(a, b) (M_CHECK_DEFAULT_TYPE(a), free((void*)a), (a) = strdup(b)) +#define M_SET_DUP(a, b) (free((void*)a), (a) = strdup(b)) #define M_CLEAR_DUP(a) (free((void*)a)) #define M_CSTR_DUP_OPLIST \