Skip to content

modify return value #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jishengruofou wants to merge 4 commits into
base: master
Choose a base branch
from
Open

modify return value #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a47fe69
modify return value
jishengruofou Jan 7, 2026
b35b6f6
消除因为返回类型不匹配导致的告警；修正内存申请失败情况下对内存的操作
jishengruofou Jan 7, 2026
125f48d
消除因为类型不匹配引起的告警
jishengruofou Jan 7, 2026
9836841
同步修改声明中的返回值类型
jishengruofou Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sample/cmux_sample_gsm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ int cmux_sample(void)
}
LOG_I("cmux object channel (%s) attach successful.", CMUX_PPP_NAME);
end:
return RT_EOK;
return result;
}
#ifdef CMUX_ATUO_INITIZATION
INIT_APP_EXPORT(cmux_sample);
Expand Down
13 changes: 7 additions & 6 deletions src/cmux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
#endif
#include <rtdbg.h>

static rt_size_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length);
static rt_ssize_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length);
static rt_slist_t cmux_list = RT_SLIST_OBJECT_INIT(cmux_list);
/* only one cmux object can be created */
static struct cmux *_g_cmux = RT_NULL;
Expand Down Expand Up @@ -527,7 +527,7 @@ static void cmux_recv_processdata(struct cmux *cmux, rt_uint8_t *buf, rt_size_t
*
* @return length
*/
static rt_size_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length)
static rt_ssize_t cmux_send_data(struct rt_device *dev, int port, rt_uint8_t type, const char *data, int length)
{
/* flag, EA=1 C port, frame type, data_length 1-2 */
rt_uint8_t prefix[5] = {CMUX_HEAD_FLAG, CMUX_ADDRESS_EA | CMUX_ADDRESS_CR, 0, 0, 0};
Expand Down Expand Up @@ -649,12 +649,13 @@ rt_err_t cmux_init(struct cmux *object, const char *name, rt_uint8_t vcom_num, v

object->vcom_num = vcom_num;
object->vcoms = rt_malloc(vcom_num * sizeof(struct cmux_vcoms));
rt_memset(object->vcoms, 0, vcom_num * sizeof(struct cmux_vcoms));

if (object->vcoms == RT_NULL)
{
LOG_E("cmux vcoms malloc failed.");
return -RT_ENOMEM;
}
rt_memset(object->vcoms, 0, vcom_num * sizeof(struct cmux_vcoms));

object->buffer = cmux_buffer_init();
if (object->buffer == RT_NULL)
Expand Down Expand Up @@ -830,14 +831,14 @@ static rt_err_t cmux_vcom_close(rt_device_t dev)
*
* @return the result
*/
static rt_size_t cmux_vcom_write(struct rt_device *dev,
static rt_ssize_t cmux_vcom_write(struct rt_device *dev,
rt_off_t pos,
const void *buffer,
rt_size_t size)
{
struct cmux *cmux = RT_NULL;
struct cmux_vcoms *vcom = (struct cmux_vcoms *)dev;
rt_size_t len;
rt_ssize_t len;
cmux = _g_cmux;

/* use virtual serial, we can write data into actual serial directly. */
Expand All @@ -855,7 +856,7 @@ static rt_size_t cmux_vcom_write(struct rt_device *dev,
*
* @return the result
*/
static rt_size_t cmux_vcom_read(struct rt_device *dev,
static rt_ssize_t cmux_vcom_read(struct rt_device *dev,
rt_off_t pos,
void *buffer,
rt_size_t size)
Expand Down