From ac6f4ef90c2991b562fea758d14ed152932afe94 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Thu, 2 Feb 2023 01:50:49 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9IPC=E8=AF=BBfd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hui1975 Change-Id: I544d504fb69591cb1b192dc380ac40fbd9d7e283 --- utils/src/sensor_basic_data_channel.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/utils/src/sensor_basic_data_channel.cpp b/utils/src/sensor_basic_data_channel.cpp index 308ad148..049975ad 100755 --- a/utils/src/sensor_basic_data_channel.cpp +++ b/utils/src/sensor_basic_data_channel.cpp @@ -98,15 +98,9 @@ int32_t SensorBasicDataChannel::CreateSensorBasicChannel(MessageParcel &data) SEN_HILOGD("already create socketpair"); return ERR_OK; } - int32_t tmpFd = data.ReadFileDescriptor(); - if (tmpFd < 0) { - SEN_HILOGE("ReadFileDescriptor is failed"); - sendFd_ = -1; - return SENSOR_CHANNEL_DUP_ERR; - } - sendFd_ = dup(tmpFd); + sendFd_ = data.ReadFileDescriptor(); if (sendFd_ < 0) { - SEN_HILOGE("dup FileDescriptor is failed"); + SEN_HILOGE("ReadFileDescriptor is failed"); sendFd_ = -1; return SENSOR_CHANNEL_DUP_ERR; } -- Gitee From edb49807a91f115bc429ff4bbabc78473c352602 Mon Sep 17 00:00:00 2001 From: hui1975 Date: Thu, 2 Feb 2023 10:07:34 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hui1975 Change-Id: I2b4348f101234431baa2bb8f69c09dbeddcf4027 --- utils/include/sensors_errors.h | 4 ++-- utils/src/sensor_basic_data_channel.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/include/sensors_errors.h b/utils/include/sensors_errors.h index 7279ab75..55e11c3c 100644 --- a/utils/include/sensors_errors.h +++ b/utils/include/sensors_errors.h @@ -99,8 +99,8 @@ enum { SENSOR_CHANNEL_SOCKET_CREATE_ERR = SENSOR_UTILS_ERR_OFFSET, SENSOR_CHANNEL_SENDFD_ERR = SENSOR_CHANNEL_SOCKET_CREATE_ERR + 1, SENSOR_CHANNEL_WRITE_DESCRIPTOR_ERR = SENSOR_CHANNEL_SENDFD_ERR + 1, - SENSOR_CHANNEL_DUP_ERR = SENSOR_CHANNEL_WRITE_DESCRIPTOR_ERR + 1, - SENSOR_CHANNEL_BASIC_CHANNEL_NOT_INIT = SENSOR_CHANNEL_DUP_ERR + 1, + SENSOR_CHANNEL_READ_DESCRIPTOR_ERR = SENSOR_CHANNEL_WRITE_DESCRIPTOR_ERR + 1, + SENSOR_CHANNEL_BASIC_CHANNEL_NOT_INIT = SENSOR_CHANNEL_READ_DESCRIPTOR_ERR + 1, SENSOR_CHANNEL_SEND_ADDR_ERR = SENSOR_CHANNEL_BASIC_CHANNEL_NOT_INIT + 1, SENSOR_CHANNEL_SEND_DATA_ERR = SENSOR_CHANNEL_SEND_ADDR_ERR + 1, SENSOR_CHANNEL_RECEIVE_DATA_ERR = SENSOR_CHANNEL_SEND_DATA_ERR + 1, diff --git a/utils/src/sensor_basic_data_channel.cpp b/utils/src/sensor_basic_data_channel.cpp index 049975ad..132b0258 100755 --- a/utils/src/sensor_basic_data_channel.cpp +++ b/utils/src/sensor_basic_data_channel.cpp @@ -102,7 +102,7 @@ int32_t SensorBasicDataChannel::CreateSensorBasicChannel(MessageParcel &data) if (sendFd_ < 0) { SEN_HILOGE("ReadFileDescriptor is failed"); sendFd_ = -1; - return SENSOR_CHANNEL_DUP_ERR; + return SENSOR_CHANNEL_READ_DESCRIPTOR_ERR; } return ERR_OK; } -- Gitee