COM-30 COM-24: Missing renames for consistency...
authorMarkus Schaber <markus@pep-security.net>
Fri, 07 Oct 2016 22:06:03 +0200
changeset 1824928f5d650f5
parent 181 db9b0b914e77
child 183 2e8f481ec4f4
COM-30 COM-24: Missing renames for consistency...
pEpCOMServerAdapter.idl
pEp_utility.cpp
     1.1 --- a/pEpCOMServerAdapter.idl	Thu Oct 06 00:13:20 2016 +0200
     1.2 +++ b/pEpCOMServerAdapter.idl	Fri Oct 07 22:06:03 2016 +0200
     1.3 @@ -198,9 +198,9 @@
     1.4      [uuid(B6F40887-E761-4A47-B204-A0193EE0284D)] struct TextMessage {
     1.5          pEpMsgDirection Dir;
     1.6          BSTR Id;
     1.7 -        BSTR Shortmsg;
     1.8 -        BSTR Longmsg;
     1.9 -        BSTR LongmsgFormatted;
    1.10 +        BSTR ShortMsg;
    1.11 +        BSTR LongMsg;
    1.12 +        BSTR LongMsgFormatted;
    1.13          SAFEARRAY(struct Blob) Attachments;
    1.14          hyper Sent; // Timestamp: 64 Bit time_t from mktime(), seconds since January 1, 1970, 0:00 UTC.
    1.15          hyper Recv; // Timestamp: 64 Bit time_t from mktime(), seconds since January 1, 1970, 0:00 UTC.
     2.1 --- a/pEp_utility.cpp	Thu Oct 06 00:13:20 2016 +0200
     2.2 +++ b/pEp_utility.cpp	Fri Oct 07 22:06:03 2016 +0200
     2.3 @@ -268,9 +268,9 @@
     2.4          void clear_text_message(TextMessage *msg)
     2.5          {
     2.6              SysFreeString(msg->Id);
     2.7 -            SysFreeString(msg->Shortmsg);
     2.8 -            SysFreeString(msg->Longmsg);
     2.9 -            SysFreeString(msg->LongmsgFormatted);
    2.10 +            SysFreeString(msg->ShortMsg);
    2.11 +            SysFreeString(msg->LongMsg);
    2.12 +            SysFreeString(msg->LongMsgFormatted);
    2.13              SafeArrayDestroy(msg->Attachments);
    2.14              clear_identity_s(msg->From);
    2.15              SafeArrayDestroy(msg->To);
    2.16 @@ -295,9 +295,9 @@
    2.17  
    2.18              msg2->Dir = (pEpMsgDirection) msg->dir;
    2.19              msg2->Id = bstr(msg->id);
    2.20 -            msg2->Shortmsg = bstr(msg->shortmsg);
    2.21 -            msg2->Longmsg = bstr(msg->longmsg);
    2.22 -            msg2->LongmsgFormatted = bstr(msg->longmsg_formatted);
    2.23 +            msg2->ShortMsg = bstr(msg->shortmsg);
    2.24 +            msg2->LongMsg = bstr(msg->longmsg);
    2.25 +            msg2->LongMsgFormatted = bstr(msg->longmsg_formatted);
    2.26              msg2->Attachments = array_from_C<Blob, bloblist_t>(msg->attachments);
    2.27              if (msg->sent)
    2.28                  msg2->Sent = mktime(msg->sent);
    2.29 @@ -502,9 +502,9 @@
    2.30                  throw bad_alloc();
    2.31  
    2.32              msg2->id = str(msg->Id);
    2.33 -            msg2->shortmsg = str(msg->Shortmsg);
    2.34 -            msg2->longmsg = str(msg->Longmsg);
    2.35 -            msg2->longmsg_formatted = str(msg->LongmsgFormatted);
    2.36 +            msg2->shortmsg = str(msg->ShortMsg);
    2.37 +            msg2->longmsg = str(msg->LongMsg);
    2.38 +            msg2->longmsg_formatted = str(msg->LongMsgFormatted);
    2.39              msg2->attachments = bloblist(msg->Attachments);
    2.40              msg2->sent = new_timestamp(msg->Sent);
    2.41              msg2->recv = new_timestamp(msg->Recv);