Fixup clang-format in pdcp before PR.

lib/include/srslte/upper/pdcp_entity_base.h

@@ -119,7 +119,6 @@ protected:
   bool integrity_verify(uint8_t* msg, uint32_t msg_len, uint32_t count, uint8_t* mac);
   void cipher_encrypt(uint8_t* msg, uint32_t msg_len, uint32_t count, uint8_t* ct);
   void cipher_decrypt(uint8_t* ct, uint32_t ct_len, uint32_t count, uint8_t* msg);
-
 };
 
 inline uint32_t pdcp_entity_base::HFN(uint32_t count)

lib/include/srslte/upper/pdcp_entity_nr.h

@@ -46,8 +46,7 @@ public:
                  srslte::timer_handler*     timers_,
                  srslte::log*               log_);
   ~pdcp_entity_nr();
-  void init(            uint32_t                   lcid_,
+  void init(uint32_t lcid_, pdcp_config_t cfg_);
-            pdcp_config_t              cfg_);
   void reset();
   void reestablish();
 

lib/src/upper/pdcp.cc

@@ -53,11 +53,10 @@ void pdcp::init(srsue::rlc_interface_pdcp* rlc_, srsue::rrc_interface_pdcp* rrc_
   gw  = gw_;
 }
 
-void pdcp::stop()
+void pdcp::stop() {}
-{
-}
 
-void pdcp::reestablish() {
+void pdcp::reestablish()
+{
   pthread_rwlock_rdlock(&rwlock);
   for (pdcp_map_t::iterator it = pdcp_array.begin(); it != pdcp_array.end(); ++it) {
     it->second->reestablish();
@@ -217,8 +216,11 @@ void pdcp::config_security(uint32_t lcid,
   pthread_rwlock_unlock(&rwlock);
 }
 
-void pdcp::config_security_all(uint8_t* k_rrc_enc, uint8_t* k_rrc_int, uint8_t* k_up_enc,
+void pdcp::config_security_all(uint8_t*                    k_rrc_enc,
-                               CIPHERING_ALGORITHM_ID_ENUM cipher_algo, INTEGRITY_ALGORITHM_ID_ENUM integ_algo)
+                               uint8_t*                    k_rrc_int,
+                               uint8_t*                    k_up_enc,
+                               CIPHERING_ALGORITHM_ID_ENUM cipher_algo,
+                               INTEGRITY_ALGORITHM_ID_ENUM integ_algo)
 {
   pthread_rwlock_rdlock(&rwlock);
   for (pdcp_map_t::iterator it = pdcp_array.begin(); it != pdcp_array.end(); ++it) {

srsenb/src/stack/upper/pdcp.cc

@@ -109,7 +109,11 @@ void pdcp::reset(uint16_t rnti)
   pthread_rwlock_unlock(&rwlock);
 }
 
-void pdcp::config_security(uint16_t rnti, uint32_t lcid, uint8_t* k_rrc_enc_, uint8_t* k_rrc_int_, uint8_t* k_up_enc_,
+void pdcp::config_security(uint16_t                            rnti,
+                           uint32_t                            lcid,
+                           uint8_t*                            k_rrc_enc_,
+                           uint8_t*                            k_rrc_int_,
+                           uint8_t*                            k_up_enc_,
                            srslte::CIPHERING_ALGORITHM_ID_ENUM cipher_algo_,
                            srslte::INTEGRITY_ALGORITHM_ID_ENUM integ_algo_)
 {
@@ -166,7 +170,8 @@ void pdcp::user_interface_rlc::write_sdu(uint32_t lcid, srslte::unique_byte_buff
   rlc->write_sdu(rnti, lcid, std::move(sdu));
 }
 
-bool pdcp::user_interface_rlc::rb_is_um(uint32_t lcid) {
+bool pdcp::user_interface_rlc::rb_is_um(uint32_t lcid)
+{
   return rlc->rb_is_um(rnti, lcid);
 }
 
@@ -195,4 +200,4 @@ std::string pdcp::user_interface_rrc::get_rb_name(uint32_t lcid)
   return std::string(rb_id_text[lcid]);
 }
 
-}
+} // namespace srsenb