diff options
| author | George Hazan <ghazan@miranda.im> | 2017-01-17 17:19:19 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-01-17 17:19:19 +0300 |
| commit | b327ed7872ca83c3a4249039ba1a3d8dd3ece630 (patch) | |
| tree | 5a4ae83dafab23f7832186b5dd0736611998f43c /plugins/ImportTXT | |
| parent | fd7566b5de6b59bb18ff380cb1fa3f3f1089b70b (diff) | |
useless field DBEVENTINFO::cbSize removed
Diffstat (limited to 'plugins/ImportTXT')
| -rw-r--r-- | plugins/ImportTXT/BICQ5IP.inc | 1 | ||||
| -rw-r--r-- | plugins/ImportTXT/BRMSIP.inc | 1 | ||||
| -rw-r--r-- | plugins/ImportTXT/BbayanIP.inc | 1 | ||||
| -rw-r--r-- | plugins/ImportTXT/BmContactIP.inc | 6 | ||||
| -rw-r--r-- | plugins/ImportTXT/BqhfIP.inc | 1 | ||||
| -rw-r--r-- | plugins/ImportTXT/ImportThrd.pas | 5 |
6 files changed, 4 insertions, 11 deletions
diff --git a/plugins/ImportTXT/BICQ5IP.inc b/plugins/ImportTXT/BICQ5IP.inc index 1df28964b0..46ee251e59 100644 --- a/plugins/ImportTXT/BICQ5IP.inc +++ b/plugins/ImportTXT/BICQ5IP.inc @@ -39,7 +39,6 @@ begin while (curxml <> 0) do
begin
fillchar(dbei, SizeOf(dbei), 0);
- dbei.cbSize := SizeOf(dbei);
dbei.szModule := PAnsiChar(proto);
if TryStrToInt(xmlgetText(xmlgetChildByPath(curxml, 'time', false)), tm)
then
diff --git a/plugins/ImportTXT/BRMSIP.inc b/plugins/ImportTXT/BRMSIP.inc index 9576c2c83c..a270102f8d 100644 --- a/plugins/ImportTXT/BRMSIP.inc +++ b/plugins/ImportTXT/BRMSIP.inc @@ -34,7 +34,6 @@ begin while Cardinal(i) < fsz do
begin
fillchar(dbei, sizeof(dbei), 0);
- dbei.cbSize := sizeof(dbei);
dbei.szModule := PAnsiChar(proto);
rsz := RLInteger(pt + i + $08);
if PByte(pt + i + $10)^ = $00 then
diff --git a/plugins/ImportTXT/BbayanIP.inc b/plugins/ImportTXT/BbayanIP.inc index 1e301f8654..d0f1d5ab7b 100644 --- a/plugins/ImportTXT/BbayanIP.inc +++ b/plugins/ImportTXT/BbayanIP.inc @@ -27,7 +27,6 @@ begin with dbei do
begin
fillchar(dbei, sizeof(dbei), 0);
- dbei.cbSize := sizeof(dbei);
dbei.szModule := PAnsiChar(proto);
dbei.timestamp := ImportTU.timestamp(
RLWORD(pt + i + 5),
diff --git a/plugins/ImportTXT/BmContactIP.inc b/plugins/ImportTXT/BmContactIP.inc index 55476792bd..cc81555d56 100644 --- a/plugins/ImportTXT/BmContactIP.inc +++ b/plugins/ImportTXT/BmContactIP.inc @@ -21,13 +21,13 @@ begin i := 0;
while cardinal(i) < fsz do
begin
- dbei.cbSize := PInteger(pt + i)^;
+ evSize := PInteger(pt + i)^;
dbei.szModule := PAnsiChar(proto);
dbei.timestamp := PDWORD(pt + i + $08)^;
dbei.flags := PDWORD(pt + i + $0C)^;
dbei.eventtype := PDWORD(pt + i + $10)^;
dbei.cbBlob := PDWORD(pt + i + $14)^;
- dbei.pBlob := PBYTE(pt + i + dbei.cbSize);
+ dbei.pBlob := PBYTE(pt + i + evSize);
if not IsDuplicateEvent(DContact.hContact, dbei) then
if db_event_add(DContact.hContact, @dbei) <> 0 then
@@ -40,7 +40,7 @@ begin end
else
inc(Duplicates);
- inc(i, dbei.cbSize + integer(dbei.cbBlob));
+ inc(i, evSize + integer(dbei.cbBlob));
DoMessage(ITXT_THREAD_PROGRESS, i, 0);
end;
end
diff --git a/plugins/ImportTXT/BqhfIP.inc b/plugins/ImportTXT/BqhfIP.inc index aa7a9a8758..cd99bbfaa3 100644 --- a/plugins/ImportTXT/BqhfIP.inc +++ b/plugins/ImportTXT/BqhfIP.inc @@ -92,7 +92,6 @@ begin while Cardinal(i) < fsz do
begin
fillchar(dbei, sizeof(dbei), 0);
- dbei.cbSize := sizeof(dbei);
dbei.szModule := PAnsiChar(proto);
dbei.timestamp := RLInteger(pt + i + $12);
dbei.timestamp := dbei.timestamp -
diff --git a/plugins/ImportTXT/ImportThrd.pas b/plugins/ImportTXT/ImportThrd.pas index 4c4468d5e7..4315977a0a 100644 --- a/plugins/ImportTXT/ImportThrd.pas +++ b/plugins/ImportTXT/ImportThrd.pas @@ -95,7 +95,6 @@ begin end;
FillChar(dbeiExisting, SizeOf(dbeiExisting), Byte(0));
- dbeiExisting.cbSize := SizeOf(dbeiExisting);
dbeiExisting.cbBlob := 0;
db_event_get(hExistingDbEvent, @dbeiExisting);
dwFirstEventTimeStamp := dbeiExisting.timestamp;
@@ -108,7 +107,6 @@ begin end;
FillChar(dbeiExisting, SizeOf(dbeiExisting), Byte(0));
- dbeiExisting.cbSize := SizeOf(dbeiExisting);
dbeiExisting.cbBlob := 0;
db_event_get(hExistingDbEvent, @dbeiExisting);
dwLastEventTimeStamp := dbeiExisting.timestamp;
@@ -134,7 +132,6 @@ begin while (hExistingDbEvent <> 0) do
begin
FillChar(dbeiExisting, SizeOf(dbeiExisting), Byte(0));
- dbeiExisting.cbSize := SizeOf(dbeiExisting);
dbeiExisting.cbBlob := 0;
db_event_get(hExistingDbEvent, @dbeiExisting);
// compare event
@@ -208,7 +205,6 @@ var s: WideString;
begin
FillChar(dbei, SizeOf(dbei), Byte(0));
- dbei.cbSize := SizeOf(dbei);
dbei.eventType := EVENTTYPE_MESSAGE;
dbei.flags := Direction;
proto := GetContactProto(hContact);
@@ -533,6 +529,7 @@ var tempstr: PAnsiChar;
var
dbei: TDBEVENTINFO;
+ evSize: integer;
proto: AnsiString;
pt: int_ptr;
fsz: cardinal;
|