SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

macros rename

Browse Source
This commit is contained in:
Пелипенко Иван
2022-05-11 16:49:33 +03:00
parent fa19ad1093
commit 0897a8369f
20 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/main/io_utils/pibasetransfer.h
View File

@@ -144,14 +144,14 @@ private:
PIString pm_string;
};
BINARY_STREAM_STORE (PIBaseTransfer::PacketHeader) {s << v.sig << v.type << v.session_id << v.id << v.crc; return s;}
BINARY_STREAM_RESTORE(PIBaseTransfer::PacketHeader) {s >> v.sig >> v.type >> v.session_id >> v.id >> v.crc; return s;}
BINARY_STREAM_WRITE(PIBaseTransfer::PacketHeader) {s << v.sig << v.type << v.session_id << v.id << v.crc; return s;}
BINARY_STREAM_READ (PIBaseTransfer::PacketHeader) {s >> v.sig >> v.type >> v.session_id >> v.id >> v.crc; return s;}
BINARY_STREAM_STORE (PIBaseTransfer::Part) {s << v.id << v.size << v.start; return s;}
BINARY_STREAM_RESTORE(PIBaseTransfer::Part) {s >> v.id >> v.size >> v.start; return s;}
BINARY_STREAM_WRITE(PIBaseTransfer::Part) {s << v.id << v.size << v.start; return s;}
BINARY_STREAM_READ (PIBaseTransfer::Part) {s >> v.id >> v.size >> v.start; return s;}
BINARY_STREAM_STORE (PIBaseTransfer::StartRequest) {s << v.packets << v.size; return s;}
BINARY_STREAM_RESTORE(PIBaseTransfer::StartRequest) {s >> v.packets >> v.size; return s;}
BINARY_STREAM_WRITE(PIBaseTransfer::StartRequest) {s << v.packets << v.size; return s;}
BINARY_STREAM_READ (PIBaseTransfer::StartRequest) {s >> v.packets >> v.size; return s;}
inline PICout operator <<(PICout s, const PIBaseTransfer::Part & v) {s.setControl(0, true); s << "Part(\"" << v.id << "\", " << PIString::readableSize(v.start) << " b | " << PIString::readableSize(v.size) << " b)"; s.restoreControl(); return s;}

8
libs/main/io_utils/pifiletransfer.h
View File

@@ -111,15 +111,15 @@ private:
EVENT_HANDLER1(void, receive_finished, bool, ok);
};
BINARY_STREAM_STORE (PIFileTransfer::PFTHeader) {s << v.raw_sig << v.step << v.session_id; return s;}
BINARY_STREAM_RESTORE(PIFileTransfer::PFTHeader) {s >> v.raw_sig >> v.step >> v.session_id; return s;}
BINARY_STREAM_WRITE(PIFileTransfer::PFTHeader) {s << v.raw_sig << v.step << v.session_id; return s;}
BINARY_STREAM_READ (PIFileTransfer::PFTHeader) {s >> v.raw_sig >> v.step >> v.session_id; return s;}
BINARY_STREAM_STORE (PIFileTransfer::PFTFileInfo) {
BINARY_STREAM_WRITE(PIFileTransfer::PFTFileInfo) {
s << v.dest_path << v.size << v.time_access << v.time_modification <<
v.flags << v.id_user << v.id_group << v.perm_user.raw << v.perm_group.raw << v.perm_other.raw;
return s;
}
BINARY_STREAM_RESTORE(PIFileTransfer::PFTFileInfo) {
BINARY_STREAM_READ (PIFileTransfer::PFTFileInfo) {
s >> v.dest_path >> v.size >> v.time_access >> v.time_modification >>
v.flags >> v.id_user >> v.id_group >> v.perm_user.raw >> v.perm_group.raw >> v.perm_other.raw;
return s;