Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Synchronet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
139
Issues
139
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main
Synchronet
Compare Revisions
5f3417639f3659450169888e9cbaddf9d027c386...48a6feb2f2bfb0a3ab20f36c2d103c1f6f4b4455
Source
48a6feb2f2bfb0a3ab20f36c2d103c1f6f4b4455
Select Git revision
...
Target
5f3417639f3659450169888e9cbaddf9d027c386
Select Git revision
Compare
Commits (1)
Resolve new MSVC warnings introduced in previous commit.
· 48a6feb2
Rob Swindell
authored
Dec 04, 2020
48a6feb2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
src/sbbs3/sexyz.c
src/sbbs3/sexyz.c
+1
-1
src/sbbs3/zmodem.c
src/sbbs3/zmodem.c
+5
-5
No files found.
src/sbbs3/sexyz.c
View file @
48a6feb2
...
...
@@ -1603,7 +1603,7 @@ int main(int argc, char **argv)
zm
.
escape_8th_bit
=
iniGetBool
(
ini
,
section
,
"Escape8thBit"
,
FALSE
);
zm
.
escape_ctrl_chars
=
iniGetBool
(
ini
,
section
,
"EscapeCtrlChars"
,
FALSE
);
zm
.
max_window_size
=
(
uint32_t
)
iniGetBytes
(
ini
,
section
,
"MaxWindowSize"
,
1
,
0
);
zm
.
target_window_size
=
iniGetDuration
(
ini
,
section
,
"TargetWindowSize"
,
0
);
zm
.
target_window_size
=
(
unsigned
)
iniGetDuration
(
ini
,
section
,
"TargetWindowSize"
,
0
);
section
=
"DSZLOG"
;
dszlog_path
=
iniGetBool
(
ini
,
section
,
"Path"
,
TRUE
);
...
...
src/sbbs3/zmodem.c
View file @
48a6feb2
...
...
@@ -1505,7 +1505,7 @@ BOOL zmodem_handle_zrpos(zmodem_t* zm, uint64_t* pos)
if
(
zm
->
rxd_header_pos
<
zm
->
current_file_size
)
{
if
(
*
pos
!=
zm
->
rxd_header_pos
)
{
*
pos
=
zm
->
rxd_header_pos
;
zm
->
ack_file_pos
=
*
pos
;
zm
->
ack_file_pos
=
(
int32_t
)
*
pos
;
lprintf
(
zm
,
LOG_INFO
,
"%lu Resuming transfer from offset: %"
PRIu64
,(
ulong
)
zm
->
current_file_pos
,
*
pos
);
}
...
...
@@ -1534,7 +1534,7 @@ static unsigned new_window_size(zmodem_t* zm, time_t start, unsigned pos)
time_t
elapsed
=
time
(
NULL
)
-
start
;
if
(
elapsed
<
1
)
elapsed
=
1
;
unsigned
cps
=
pos
/
elapsed
;
unsigned
cps
=
(
unsigned
)(
pos
/
elapsed
)
;
if
(
cps
<
1
)
cps
=
1
;
return
cps
*
zm
->
target_window_size
;
...
...
@@ -1591,7 +1591,7 @@ int zmodem_send_from(zmodem_t* zm, FILE* fp, uint64_t pos, uint64_t* sent)
if
(
c
==
ZPAD
)
{
rx_type
=
zmodem_recv_header
(
zm
);
lprintf
(
zm
,
LOG_DEBUG
,
"Received back-channel data: %s"
,
chr
(
rx_type
));
if
(
rx_type
==
ZACK
&&
zmodem_handle_zack
(
zm
,
zm
->
ack_file_pos
,
zm
->
current_file_pos
))
{
if
(
rx_type
==
ZACK
&&
zmodem_handle_zack
(
zm
,
zm
->
ack_file_pos
,
(
uint32_t
)
zm
->
current_file_pos
))
{
zm
->
current_window_size
=
zm
->
current_file_pos
-
zm
->
ack_file_pos
;
lprintf
(
zm
,
LOG_DEBUG
,
"%lu Asynchronous acknowledgment (ZACK) of %lu bytes, new window: %lu"
,(
ulong
)
zm
->
current_file_pos
,
(
ulong
)
zm
->
ack_file_pos
,
(
ulong
)
zm
->
current_window_size
);
...
...
@@ -1683,7 +1683,7 @@ int zmodem_send_from(zmodem_t* zm, FILE* fp, uint64_t pos, uint64_t* sent)
if
(
is_cancelled
(
zm
))
return
(
ZCAN
);
if
(
zmodem_handle_zack
(
zm
,
zm
->
current_file_pos
,
zm
->
current_file_pos
))
{
if
(
zmodem_handle_zack
(
zm
,
(
uint32_t
)
zm
->
current_file_pos
,
(
uint32_t
)
zm
->
current_file_pos
))
{
zm
->
current_window_size
=
0
;
break
;
}
...
...
@@ -1951,7 +1951,7 @@ BOOL zmodem_send_file(zmodem_t* zm, char* fname, FILE* fp, BOOL request_init, ti
pos
=
zm
->
ack_file_pos
;
if
(
type
==
ZACK
&&
zmodem_handle_zack
(
zm
,
pos
,
zm
->
current_file_pos
))
{
if
(
type
==
ZACK
&&
zmodem_handle_zack
(
zm
,
(
uint32_t
)
pos
,
(
uint32_t
)
zm
->
current_file_pos
))
{
continue
;
}
...
...