bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a few minor coding issues

Browse source
This commit is contained in:
Gerhard Rieger 2021-10-31 10:25:33 +01:00
parent ff51262e78
commit 072377c68c
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,4 +1,7 @@
 
Corrections:
Fixed a few minor coding issues
Testing: Testing:
Prevent the TIMESTAMP tests from sporadically failing due do seconds Prevent the TIMESTAMP tests from sporadically failing due do seconds
overflow overflow

12
sycls.c
View file

@ -357,8 +357,8 @@ int Gettimeofday(struct timeval *tv, struct timezone *tz) {
} }
#endif /* WITH_MSGLEVEL <= E_DEBUG */ #endif /* WITH_MSGLEVEL <= E_DEBUG */
result = gettimeofday(tv, tz); result = gettimeofday(tv, tz);
_errno = errno;
#if WITH_MSGLEVEL <= E_DEBUG #if WITH_MSGLEVEL <= E_DEBUG
_errno = errno;
if (tz) { if (tz) {
Debug5("gettimeofday({%ld,%ld}, {%d,%d}) -> %d", Debug5("gettimeofday({%ld,%ld}, {%d,%d}) -> %d",
tv->tv_sec, tv->tv_usec, tz->tz_minuteswest, tz->tz_dsttime, tv->tv_sec, tv->tv_usec, tz->tz_minuteswest, tz->tz_dsttime,
@ -367,8 +367,8 @@ int Gettimeofday(struct timeval *tv, struct timezone *tz) {
Debug3("gettimeofday({%ld,%ld},) -> %d", Debug3("gettimeofday({%ld,%ld},) -> %d",
tv->tv_sec, tv->tv_usec, result); tv->tv_sec, tv->tv_usec, result);
} }
#endif /* WITH_MSGLEVEL <= E_DEBUG */
errno = _errno; errno = _errno;
#endif /* WITH_MSGLEVEL <= E_DEBUG */
return result; return result;
} }
@ -578,11 +578,11 @@ int Fcntl(int fd, int cmd) {
#endif /* WITH_SYCLS */ #endif /* WITH_SYCLS */
result = fcntl(fd, cmd); result = fcntl(fd, cmd);
if (!diag_in_handler) diag_flush(); if (!diag_in_handler) diag_flush();
_errno = errno;
#if WITH_SYCLS #if WITH_SYCLS
_errno = errno;
Debug1("fcntl() -> %d", result); Debug1("fcntl() -> %d", result);
#endif /* WITH_SYCLS */
errno = _errno; errno = _errno;
#endif /* WITH_SYCLS */
return result; return result;
} }
@ -1032,11 +1032,11 @@ int System(const char *string) {
diag_immediate_exit = 1; diag_immediate_exit = 1;
result = system(string); result = system(string);
diag_immediate_exit = 0; diag_immediate_exit = 0;
_errno = errno;
#if WITH_SYCLS #if WITH_SYCLS
_errno = errno;
Debug1("system() -> %d", result); Debug1("system() -> %d", result);
#endif /* WITH_SYCLS */
errno = _errno; errno = _errno;
#endif /* WITH_SYCLS */
return result; return result;
} }

2
xio-openssl.c
View file

@ -560,7 +560,6 @@ static int
return STAT_NORETRY; return STAT_NORETRY;
} }
xfd->addr = &xioaddr_openssl_listen;
xfd->dtype = XIODATA_OPENSSL; xfd->dtype = XIODATA_OPENSSL;
while (true) { /* loop over failed attempts */ while (true) { /* loop over failed attempts */
@ -930,7 +929,6 @@ int
//*ipproto = IPPROTO_TCP; //*ipproto = IPPROTO_TCP;
xfd->addr = &xioaddr_openssl;
xfd->dtype = XIODATA_OPENSSL; xfd->dtype = XIODATA_OPENSSL;
retropt_bool(opts, OPT_OPENSSL_FIPS, &opt_fips); retropt_bool(opts, OPT_OPENSSL_FIPS, &opt_fips);