Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-07 22:58:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix M*LIB usage:

Browse Source 
* Fix oplist definition of SubGhzFrequencyAnalyzerLogItem

* Fix oplist definition of M_CSTR_DUP_OPLIST

* Remove dependency of furi_string_utf8_decode
to the internal definition of string_unicode_t

* Replace obsolete macro M_IF_DEFAULT1 to M_DEFAULT_ARGS
This commit is contained in:
Patrick Pelissier
2023-06-06 22:34:06 +02:00
parent 4900e8b7a2
commit f466409985
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/subghz/helpers/subghz_frequency_analyzer_log_item_array.h
+1 -1
View File
@@ -27,7 +27,7 @@ TUPLE_DEF2(
(rssi_max, uint8_t))
/* Register globally the oplist */
#define M_OPL_SubGhzFrequencyAnalyzerLogItem_t() \
TUPLE_OPLIST(SubGhzFrequencyAnalyzerLogItem, M_POD_OPLIST, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
TUPLE_OPLIST(SubGhzFrequencyAnalyzerLogItem, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
/* Define the array, register the oplist and define further algorithms on it */
ARRAY_DEF(SubGhzFrequencyAnalyzerLogItemArray, SubGhzFrequencyAnalyzerLogItem_t)
furi/core/string.c
+3 -1
View File
@@ -296,7 +296,9 @@ static FuriStringUTF8State state_to_furi_state(m_str1ng_utf8_state_e state) {
}
void furi_string_utf8_decode(char c, FuriStringUTF8State* state, FuriStringUnicodeValue* unicode) {
string_unicode_t m_u = *unicode;
m_str1ng_utf8_state_e m_state = furi_state_to_state(*state);
m_str1ng_utf8_decode(c, &m_state, unicode);
m_str1ng_utf8_decode(c, &m_state, &m_u);
*state = state_to_furi_state(m_state);
*unicode = m_u;
}
furi/core/string.h
+15 -18
View File
@@ -633,20 +633,18 @@ void furi_string_utf8_decode(char c, FuriStringUTF8State* state, FuriStringUnico
* @brief Search for a string (or C string) in a string
* (string, [c]string[, start=0])
*/
#define furi_string_search(v, ...) \
#define furi_string_search(...) \
M_APPLY( \
FURI_STRING_SELECT3, \
furi_string_search, \
furi_string_search_str, \
v, \
M_IF_DEFAULT1(0, __VA_ARGS__))
M_DEFAULT_ARGS(3, (0), __VA_ARGS__))
/**
* @brief Search for a C string in a string
* (string, cstring[, start=0])
*/
#define furi_string_search_str(v, ...) \
M_APPLY(furi_string_search_str, v, M_IF_DEFAULT1(0, __VA_ARGS__))
#define furi_string_search_str( ...) \
furi_string_search_str( M_DEFAULT_ARGS(3, (0), __VA_ARGS__) )
/**
* @brief Test if the string starts with the given string (or C string).
@@ -672,41 +670,40 @@ void furi_string_utf8_decode(char c, FuriStringUTF8State* state, FuriStringUnico
* @brief Trim a string from the given set of characters (default is " \n\r\t").
* (string[, set=" \n\r\t"])
*/
#define furi_string_trim(...) M_APPLY(furi_string_trim, M_IF_DEFAULT1(" \n\r\t", __VA_ARGS__))
#define furi_string_trim(...) \
furi_string_trim( M_DEFAULT_ARGS(2, (" \n\r\t"), __VA_ARGS__) )
/**
* @brief Search for a character in a string.
* (string, character[, start=0])
*/
#define furi_string_search_char(v, ...) \
M_APPLY(furi_string_search_char, v, M_IF_DEFAULT1(0, __VA_ARGS__))
#define furi_string_search_char(...) \
furi_string_search_char( M_DEFAULT_ARGS(3, (0), __VA_ARGS__) )
/**
* @brief Reverse Search for a character in a string.
* (string, character[, start=0])
*/
#define furi_string_search_rchar(v, ...) \
M_APPLY(furi_string_search_rchar, v, M_IF_DEFAULT1(0, __VA_ARGS__))
#define furi_string_search_rchar( ...) \
furi_string_search_rchar( M_DEFAULT_ARGS(3, (0), __VA_ARGS__) )
/**
* @brief Replace a string to another string (or C string to another C string) in a string.
* (string, [c]string, [c]string[, start=0])
*/
#define furi_string_replace(a, b, ...) \
#define furi_string_replace(...) \
M_APPLY( \
FURI_STRING_SELECT4, \
furi_string_replace, \
furi_string_replace_str, \
a, \
b, \
M_IF_DEFAULT1(0, __VA_ARGS__))
M_DEFAULT_ARGS(4, (0), __VA_ARGS__))
/**
* @brief Replace a C string to another C string in a string.
* (string, cstring, cstring[, start=0])
*/
#define furi_string_replace_str(a, b, ...) \
M_APPLY(furi_string_replace_str, a, b, M_IF_DEFAULT1(0, __VA_ARGS__))
#define furi_string_replace_str(...) \
furi_string_replace_str( M_DEFAULT_ARGS(4, (0), __VA_ARGS__) )
/**
* @brief INIT OPLIST for FuriString.
@@ -743,4 +740,4 @@ void furi_string_utf8_decode(char c, FuriStringUTF8State* state, FuriStringUnico
#ifdef __cplusplus
}
#endif
#endif
lib/toolbox/m_cstr_dup.h
+3 -2
View File
@@ -2,12 +2,13 @@
#include <m-core.h>
#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_INIT_SET_DUP(a, b) ( (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 \
(INIT(M_INIT_DUP), \
INIT_SET(M_SET_DUP), \
INIT_SET(M_INIT_SET_DUP), \
SET(M_SET_DUP), \
CLEAR(M_CLEAR_DUP), \
HASH(m_core_cstr_hash), \