Code cleanup

src/nas/ies/UplinkDataStatus.cpp

@@ -56,7 +56,7 @@ uint16_t UplinkDataStatus::GetValue() const {
 }
 
 //------------------------------------------------------------------------------
-int UplinkDataStatus::encode2Buffer(uint8_t* buf, int len) {
+int UplinkDataStatus::Encode(uint8_t* buf, int len) {
   Logger::nas_mm().debug("Encoding %s", GetIeName().c_str());
 
   int encoded_size = 0;
@@ -74,7 +74,7 @@ int UplinkDataStatus::encode2Buffer(uint8_t* buf, int len) {
 }
 
 //------------------------------------------------------------------------------
-int UplinkDataStatus::decodeFromBuffer(uint8_t* buf, int len, bool is_iei) {
+int UplinkDataStatus::Decode(uint8_t* buf, int len, bool is_iei) {
   Logger::nas_mm().debug("Decoding %s", GetIeName().c_str());
 
   int decoded_size = 0;

src/nas/ies/UplinkDataStatus.hpp

@@ -41,8 +41,8 @@ class UplinkDataStatus : public Type4NasIe {
   void SetValue(uint16_t value);
   uint16_t GetValue() const;
 
-  int encode2Buffer(uint8_t* buf, int len);
-  int decodeFromBuffer(uint8_t* buf, int len, bool is_iei);
+  int Encode(uint8_t* buf, int len);
+  int Decode(uint8_t* buf, int len, bool is_iei);
 
  private:
   uint16_t _value;

src/nas/msgs/RegistrationRequest.cpp

@@ -649,7 +649,7 @@ int RegistrationRequest::encode2Buffer(uint8_t* buf, int len) {
   if (!ie_uplink_data_status.has_value()) {
     Logger::nas_mm().warn("IE ie_uplink_data_status is not available");
   } else {
-    if (int size = ie_uplink_data_status.value().encode2Buffer(
+    if (int size = ie_uplink_data_status.value().Encode(
             buf + encoded_size, len - encoded_size)) {
       encoded_size += size;
     } else {
@@ -957,7 +957,7 @@ int RegistrationRequest::decodeFromBuffer(uint8_t* buf, int len) {
       case kIeiUplinkDataStatus: {
         Logger::nas_mm().debug("Decoding IEI(0x40)");
         UplinkDataStatus ie_uplink_data_status_tmp = {};
-        decoded_size += ie_uplink_data_status_tmp.decodeFromBuffer(
+        decoded_size += ie_uplink_data_status_tmp.Decode(
             buf + decoded_size, len - decoded_size, true);
         ie_uplink_data_status =
             std::optional<UplinkDataStatus>(ie_uplink_data_status_tmp);

src/nas/msgs/ServiceRequest.cpp

@@ -138,8 +138,8 @@ int ServiceRequest::encode2Buffer(uint8_t* buf, int len) {
   if (!ie_uplink_data_status) {
     Logger::nas_mm().warn("IE ie_uplink_data_status is not available");
   } else {
-    size = ie_uplink_data_status->encode2Buffer(
-        buf + encoded_size, len - encoded_size);
+    size =
+        ie_uplink_data_status->Encode(buf + encoded_size, len - encoded_size);
     if (size != 0) {
       encoded_size += size;
     } else {
@@ -210,7 +210,7 @@ int ServiceRequest::decodeFromBuffer(
       case kIeiUplinkDataStatus: {
         Logger::nas_mm().debug("Decoding ie_uplink_data_status (IEI: 0x40)");
         ie_uplink_data_status = new UplinkDataStatus();
-        decoded_size += ie_uplink_data_status->decodeFromBuffer(
+        decoded_size += ie_uplink_data_status->Decode(
             buf + decoded_size, len - decoded_size, true);
         octet = *(buf + decoded_size);
         Logger::nas_mm().debug("Next IEI (0x%x)", octet);