Modify the ipc internal source issue

Signed-off-by: zhou-liting125 <zhouliting5@huawei.com>

interfaces/innerkits/ipc_core/include/iremote_broker.h

@@ -39,7 +39,7 @@ public:
 class IRemoteBroker : public virtual RefBase {
 public:
     IRemoteBroker() = default;
-    virtual ~IRemoteBroker() override = default;
+    ~IRemoteBroker() override = default;
     virtual sptr<IRemoteObject> AsObject() = 0;
     static inline sptr<IRemoteBroker> AsImplement(const sptr<IRemoteObject> &object)
     {

interfaces/innerkits/ipc_core/include/iremote_object.h

@@ -65,7 +65,7 @@ public:
 
     virtual bool RemoveDeathRecipient(const sptr<DeathRecipient> &recipient) = 0;
 
-    virtual bool Marshalling(Parcel &parcel) const override;
+    bool Marshalling(Parcel &parcel) const override;
 
     static IRemoteObject *Unmarshalling(Parcel &parcel);
 

ipc/native/src/core/include/ipc_debug.h

@@ -56,7 +56,7 @@ public:
     IPCError() = default;
     ~IPCError() = default;
     static const std::string &ToString(int value);
-    virtual ErrorMap &GetErrorMap() override;
+    ErrorMap &GetErrorMap() override;
 };
 } // namespace OHOS
 #endif // OHOS_IPC_IPC_DEBUG_H

ipc/native/src/mock/include/binder_debug.h

@@ -24,7 +24,7 @@ public:
     BinderDebug() = default;
     ~BinderDebug() = default;
     static const std::string &ToString(int value);
-    virtual ErrorMap &GetErrorMap() override;
+    ErrorMap &GetErrorMap() override;
 };
 } // namespace OHOS
 #endif // OHOS_IPC_BINDER_DEBUG_H

ipc/native/src/mock/include/dbinder_base_invoker.h

@@ -64,17 +64,17 @@ public:
     virtual std::shared_ptr<T> QueryServerSessionObject(uint32_t handle) = 0;
     virtual bool UpdateClientSession(uint32_t handle, std::shared_ptr<T> sessionObject) = 0;
 
-    virtual int SendRequest(int32_t handle, uint32_t code, MessageParcel &data, MessageParcel &reply,
+    int SendRequest(int32_t handle, uint32_t code, MessageParcel &data, MessageParcel &reply,
         MessageOption &option) override;
-    virtual bool AddDeathRecipient(int32_t handle, void *cookie) override;
-    virtual bool RemoveDeathRecipient(int32_t handle, void *cookie) override;
-    virtual int GetObjectRefCount(const IRemoteObject *object) override;
-    virtual bool SetMaxWorkThread(int maxThreadNum) override;
-    virtual int SendReply(MessageParcel &reply, uint32_t flags, int32_t result) override;
-    virtual bool PingService(int32_t handle) override;
-    virtual sptr<IRemoteObject> GetSAMgrObject() override;
-    virtual bool SetRegistryObject(sptr<IRemoteObject> &object) override;
-    virtual void FreeBuffer(void *data) override;
+    bool AddDeathRecipient(int32_t handle, void *cookie) override;
+    bool RemoveDeathRecipient(int32_t handle, void *cookie) override;
+    int GetObjectRefCount(const IRemoteObject *object) override;
+    bool SetMaxWorkThread(int maxThreadNum) override;
+    int SendReply(MessageParcel &reply, uint32_t flags, int32_t result) override;
+    bool PingService(int32_t handle) override;
+    sptr<IRemoteObject> GetSAMgrObject() override;
+    bool SetRegistryObject(sptr<IRemoteObject> &object) override;
+    void FreeBuffer(void *data) override;
     virtual std::shared_ptr<T> WriteTransaction(int cmd, uint32_t flags, int32_t handle, int32_t socketId,
         uint32_t code, MessageParcel &data, uint64_t &seqNumber, int status);
     virtual int SendOrWaitForCompletion(int userWaitTime, uint64_t seqNumber, std::shared_ptr<T> sessionOfPeer,

ipc/native/src/mock/include/dbinder_databus_invoker.h

@@ -80,15 +80,15 @@ private:
         uint64_t stubIndex) override;
     std::shared_ptr<DBinderSessionObject> UnFlattenSession(char *sessionOffset, uint64_t &stubIndex) override;
     uint32_t QueryHandleBySession(std::shared_ptr<DBinderSessionObject> session, uint64_t stubIndex) override;
-    virtual uint64_t GetSeqNum() const override;
-    virtual void SetSeqNum(uint64_t seq) override;
-    virtual uint32_t GetClientFd() const override;
-    virtual void SetClientFd(uint32_t fd) override;
-    virtual void SetCallerPid(pid_t pid) override;
-    virtual void SetCallerUid(pid_t uid) override;
-    virtual void SetStatus(uint32_t status) override;
-    virtual void SetCallerDeviceID(const std::string &deviceId) override;
-    virtual int CheckAndSetCallerInfo(uint32_t listenFd, uint64_t stubIndex) override;
+    uint64_t GetSeqNum() const override;
+    void SetSeqNum(uint64_t seq) override;
+    uint32_t GetClientFd() const override;
+    void SetClientFd(uint32_t fd) override;
+    void SetCallerPid(pid_t pid) override;
+    void SetCallerUid(pid_t uid) override;
+    void SetStatus(uint32_t status) override;
+    void SetCallerDeviceID(const std::string &deviceId) override;
+    int CheckAndSetCallerInfo(uint32_t listenFd, uint64_t stubIndex) override;
     uint32_t HasRawDataPackage(const char *data, ssize_t len);
     uint32_t HasCompletePackage(const char *data, uint32_t readCursor, ssize_t len);
     void OnRawDataAvailable(std::shared_ptr<Session> session, const char *data, uint32_t dataSize);

ipc/native/src/napi/src/napi_remote_object.cpp

@@ -1112,7 +1112,7 @@ napi_value NAPI_IPCSkeleton_setCallingIdentity(napi_env env, napi_callback_info
             return result;
         }
 
-        int64_t token = std::atoll(identity.c_str());
+        int64_t token = std::stoll(identity.c_str());
         int callerUid = static_cast<int>((static_cast<uint64_t>(token)) >> PID_LEN);
         int callerPid = static_cast<int>(token);
         napi_value napiCallingPid;
@@ -1130,7 +1130,7 @@ napi_value NAPI_IPCSkeleton_setCallingIdentity(napi_env env, napi_callback_info
         }
 
         std::string deviceId = identity.substr(0, DEVICEID_LENGTH);
-        int64_t token = std::atoll(identity.substr(DEVICEID_LENGTH, identity.length() - DEVICEID_LENGTH).c_str());
+        int64_t token = std::stoll(identity.substr(DEVICEID_LENGTH, identity.length() - DEVICEID_LENGTH).c_str());
         int callerUid = static_cast<int>((static_cast<uint64_t>(token)) >> PID_LEN);
         int callerPid = static_cast<int>(token);
         napi_value napiCallingPid;

ipc/test/auxiliary/native/include/foo_service.h

@@ -43,7 +43,7 @@ public:
 class FooStub : public IRemoteStub<IFoo> {
 public:
     virtual ~FooStub();
-    virtual int OnRemoteRequest(uint32_t code,
+    int OnRemoteRequest(uint32_t code,
         MessageParcel &data, MessageParcel &reply, MessageOption &option) override;
     std::string GetFooName() override;
     void SendAsyncReply(int &reply) override;

ipc/test/auxiliary/native/include/test_service_skeleton.h

@@ -73,7 +73,7 @@ public:
 
 class TestServiceStub : public IRemoteStub<ITestService> {
 public:
-    virtual int OnRemoteRequest(uint32_t code,
+    int OnRemoteRequest(uint32_t code,
         MessageParcel &data, MessageParcel &reply, MessageOption &option) override;
 private:
     static constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_ID_IPC, "TestServiceStub" };

ipc/test/auxiliary/native/src/main_client.cpp

@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     int result = 0;
     TestCommand commandId = TestCommand::TEST_CMD_SYNC_TRANS;
     if (argc > 1) {
-        commandId = TestCommand(atoi(argv[1]));
+        commandId = TestCommand(std::stoi(argv[1]));
     } else {
         ZLOGE(LABEL, "unknown command");
     }