Просмотр исходного кода

fix: 修正ymodem的几个编译错误

Wendal Chen 4 лет назад
Родитель
Сommit
8da512d587
2 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      components/ymodem/luat_lib_ymodem.c
  2. 3 3
      components/ymodem/luat_ymodem.c

+ 1 - 1
components/ymodem/luat_lib_ymodem.c

@@ -83,7 +83,7 @@ static int l_ymodem_receive(lua_State *L){
 			data = NULL;
 			len = 0;
 		}
-		result = luat_ymodem_receive(handler->ctrl, data, len, &ack, &flag, &file_ok, &all_done);
+		result = luat_ymodem_receive(handler->ctrl, (uint8_t*)data, len, &ack, &flag, &file_ok, &all_done);
 		lua_pushboolean(L, !result);
 		lua_pushinteger(L, ack);
 		lua_pushinteger(L, flag);

+ 3 - 3
components/ymodem/luat_ymodem.c

@@ -137,7 +137,7 @@ int luat_ymodem_receive(void *handler, uint8_t *data, uint32_t len, uint8_t *ack
 						return 0;
 					}
 					NameEnd = NULL;
-					for(i = XMODEM_DATA_POS; i++; i < (XMODEM_SOH_DATA_LEN + 5))
+					for(i = XMODEM_DATA_POS; i < (XMODEM_SOH_DATA_LEN + 5); i++)
 					{
 						if (!ctrl->packet_data[i])
 						{
@@ -151,7 +151,7 @@ int luat_ymodem_receive(void *handler, uint8_t *data, uint32_t len, uint8_t *ack
 						goto DATA_RECIEVE_ERROR;
 					}
 					LenEnd = NULL;
-					for(i = (NameEnd + 1); i++; i < (XMODEM_SOH_DATA_LEN + 5))
+					for(i = (NameEnd + 1); i < (XMODEM_SOH_DATA_LEN + 5); i++)
 					{
 						if (!ctrl->packet_data[i])
 						{
@@ -165,7 +165,7 @@ int luat_ymodem_receive(void *handler, uint8_t *data, uint32_t len, uint8_t *ack
 						goto DATA_RECIEVE_ERROR;
 					}
 
-					ctrl->file_size = strtol(&ctrl->packet_data[NameEnd + 1], NULL, 10);
+					ctrl->file_size = strtol((const char*)&ctrl->packet_data[NameEnd + 1], NULL, 10);
 					ctrl->write_size = 0;
 					if (ctrl->force_save_path)
 					{