From 8f9292d483fcf3a10d9284512359c4562f5311eb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Apr 2023 17:07:04 +0300 Subject: DB::FILE_BLOB - file events' access unification --- src/core/stdmsg/src/msglog.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index c20b597beb..290c8ad77e 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -304,18 +304,16 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat) case EVENTTYPE_FILE: { - char *filename = (char*)dbei.pBlob + sizeof(uint32_t); - char *descr = filename + mir_strlen(filename) + 1; + DB::FILE_BLOB blob(dbei); SetToStyle(MSGFONTID_NOTICE, buf); AppendToBufferWithRTF(buf, (dbei.flags & DBEF_SENT) ? TranslateT("File sent") : TranslateT("File received")); buf.Append(": "); - AppendToBufferWithRTF(buf, ptrW(DbEvent_GetString(&dbei, filename))); + AppendToBufferWithRTF(buf, blob.getName()); - if (*descr != 0) { - ptrW ptszDescr(DbEvent_GetString(&dbei, descr)); + if (*blob.getDescr() != 0) { buf.Append(" ("); - AppendToBufferWithRTF(buf, ptszDescr); + AppendToBufferWithRTF(buf, blob.getDescr()); buf.Append(")"); } } -- cgit v1.2.3