Fixed white-space issues again which got clobbered in merge, same as rev. 7c07e68b6f56 (and more). Release_2.1.0-RC29 Release_2.1.2
authorJorg Knobloch
Thu, 08 Oct 2020 21:51:56 +0200
changeset 372b3f970326ad8
parent 371 b40abfb0f933
child 373 b29d83f93b42
Fixed white-space issues again which got clobbered in merge, same as rev. 7c07e68b6f56 (and more).
message_cache.cc
     1.1 --- a/message_cache.cc	Thu Oct 08 16:36:38 2020 +0200
     1.2 +++ b/message_cache.cc	Thu Oct 08 21:51:56 2020 +0200
     1.3 @@ -247,13 +247,13 @@
     1.4          dst->_sender_fpr = dup(src->_sender_fpr);
     1.5  
     1.6          if (_id == "") {
     1.7 -            dst->opt_fields  = dup(src->opt_fields);
     1.8 +            dst->opt_fields = dup(src->opt_fields);
     1.9          }
    1.10          else {
    1.11              dst->opt_fields = ::new_stringpair_list(::new_stringpair("X-pEp-Adapter-Cache-ID", _id.c_str()));
    1.12              if (!dst->opt_fields)
    1.13                  throw std::bad_alloc();
    1.14 -            dst->opt_fields->next  = dup(src->opt_fields);
    1.15 +            dst->opt_fields->next = dup(src->opt_fields);
    1.16          }
    1.17  
    1.18          return dst;
    1.19 @@ -483,12 +483,14 @@
    1.20          ::message *_msg;
    1.21          std::string _id = cacheID(src);
    1.22          {
    1.23 -            std::lock_guard<std::mutex> l(_mtx); _msg =
    1.24 -                message_cache._cache.at(_id).src; swapContent(src, _msg);
    1.25 +            std::lock_guard<std::mutex> l(_mtx);
    1.26 +            _msg = message_cache._cache.at(_id).src;
    1.27 +            swapContent(src, _msg);
    1.28          }
    1.29  
    1.30 -        ::message *_dst = nullptr; PEP_STATUS status =
    1.31 -            ::encrypt_message(session, src, extra, &_dst, enc_format, flags);
    1.32 +        ::message *_dst = nullptr;
    1.33 +        PEP_STATUS status = ::encrypt_message(session, src, extra, &_dst,
    1.34 +                enc_format, flags);
    1.35          *dst = empty_message_copy(_dst, _id);
    1.36  
    1.37          {
    1.38 @@ -514,14 +516,15 @@
    1.39          ::message *_msg;
    1.40          std::string _id = cacheID(src);
    1.41          {
    1.42 -            std::lock_guard<std::mutex> l(_mtx); _msg =
    1.43 -                message_cache._cache.at(_id).src; swapContent(src,
    1.44 -                        _msg);
    1.45 +            std::lock_guard<std::mutex> l(_mtx);
    1.46 +            _msg = message_cache._cache.at(_id).src;
    1.47 +            swapContent(src, _msg);
    1.48          }
    1.49  
    1.50 -        ::message *_dst = nullptr; PEP_STATUS status =
    1.51 -            ::encrypt_message_for_self(session, target_id, src, extra, &_dst,
    1.52 -                    enc_format, flags); *dst = empty_message_copy(_dst, _id);
    1.53 +        ::message *_dst = nullptr;
    1.54 +        PEP_STATUS status = ::encrypt_message_for_self(session, target_id, src,
    1.55 +                extra, &_dst, enc_format, flags);
    1.56 +        *dst = empty_message_copy(_dst, _id);
    1.57  
    1.58          {
    1.59              std::lock_guard<std::mutex> l(_mtx);