diff --git a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c index 0854257e3..843c4e3ef 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c @@ -977,7 +977,7 @@ SINT32 sf_pic_send_ftp(void) timeoutCnt++; } printf("%s:%d err ftpFileName:%s filePath:%s picSendFailCount:%d sendThumbnailFailCount:%d\n", __FUNCTION__, __LINE__, ftpFileName[pic], filePath[pic],pSifarPara->picSendFailCount, pSifarPara->sendThumbnailFailCount); - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); } else { @@ -1101,7 +1101,7 @@ SINT32 sf_video_send_ftp(void) if(SF_SUCCESS != ret) { printf("%s:%d err ret: [0x%08X] ftpFileName:%s filePath:%s\n", __FUNCTION__, __LINE__, ret, ftpFileName, filePath); - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); } } @@ -1190,7 +1190,7 @@ SINT32 sf_ftp_dailyreport_send(void) if(SF_SUCCESS != ret) { printf("%s:%d err ret: [0x%08X] filePath:%s\n", __FUNCTION__, __LINE__, ret, filePath); - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); }else { DailyReportFtpSendSucess = 1; @@ -1621,7 +1621,7 @@ SINT32 sf_camera_ota_ftp(void) } else { - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); } } @@ -1756,7 +1756,7 @@ SINT32 sf_concentrated_ftp_send(void) goto SF_CONCENTRATED_MODULE_REBOOT; } timeoutCnt++; - SF_SPRINTF(logStr, "%x,", ret1); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret1)); sf_log_error_code(logStr); goto SF_CONCENTRATED_END; } @@ -1959,7 +1959,7 @@ SINT32 sf_hd_ftp_send(void) goto SF_HD_MODULE_REBOOT; } timeoutCnt++; - SF_SPRINTF(logStr, "%x,", ret1); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret1)); sf_log_error_code(logStr); goto SF_HD_END; } @@ -2208,7 +2208,7 @@ SINT32 sf_video_ftp_send(void) goto SF_VIDEO_MODULE_REBOOT; } timeoutCnt++; - SF_SPRINTF(logStr, "%x,", ret1); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret1)); sf_log_error_code(logStr); goto SF_VIDEO_END; } @@ -2339,7 +2339,7 @@ SINT32 sf_log_send_ftp(void) if(SF_SUCCESS != ret) { printf("%s:%d err ret: [0x%08X] filePath:%s\n", __FUNCTION__, __LINE__, ret, filePath); - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); } } @@ -2401,7 +2401,7 @@ SINT32 sf_low_power_warn_send_ftp(void) if(SF_SUCCESS != ret) { printf("%s:%d err ret: [0x%08X] filePath:%s\n", __FUNCTION__, __LINE__, ret, filePath); - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); }else { pSifarPara->SendlowPowerWarnCnt++; @@ -2458,7 +2458,7 @@ SINT32 sf_gps_send_ftp(void) if(SF_SUCCESS != ret) { printf("%s:%d err ret: [0x%08X] filePath:%s\n", __FUNCTION__, __LINE__, ret, filePath); - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); } else { @@ -3259,7 +3259,7 @@ SINT32 sf_card_log_send_ftp(void) if(SF_SUCCESS != ret) { printf("%s:%d err ret: [0x%08X] filePath:%s\n", __FUNCTION__, __LINE__, ret, filePath); - SF_SPRINTF(logStr, "%x,", ret); + SF_SPRINTF(logStr, "%x,", SF_ERR_ID(SF_MOD_FTP, ret)); sf_log_error_code(logStr); } else {