diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-26 15:15:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-26 15:15:36 (GMT) |
| commit | 6477dfd763c6c39e303dfebc8ead62f00cf5cefd (patch) | |
| tree | 31fc3b2953970e21307e4ace8f0d40ae5a5e9b69 | |
| parent | 6c0b2e84d70364c6ffcc6692a90ac2913e18965a (diff) | |
| parent | 96f84a6d9accbe42d686e87728ec5c65dc5746bc (diff) | |
| download | tcl-6477dfd763c6c39e303dfebc8ead62f00cf5cefd.zip tcl-6477dfd763c6c39e303dfebc8ead62f00cf5cefd.tar.gz tcl-6477dfd763c6c39e303dfebc8ead62f00cf5cefd.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclStrToD.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixCompat.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c index 33b91a3..26d21f2 100644 --- a/generic/tclStrToD.c +++ b/generic/tclStrToD.c @@ -2918,7 +2918,7 @@ QuickConversion( } ilim = ilim1; --k; - d *= 10.0; + d = d * 10.0; ++ieps; } @@ -2935,7 +2935,7 @@ QuickConversion( retval = (char *)Tcl_Alloc(len + 1); if (ilim == 0) { - d -= 5.; + d = d - 5.; if (d > eps.d) { *retval = '1'; *decpt = k; diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c index a088857..ef468f6 100644 --- a/unix/tclUnixCompat.c +++ b/unix/tclUnixCompat.c @@ -552,17 +552,17 @@ TclpGetHostByName( ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); #if defined(HAVE_GETHOSTBYNAME_R_5) - int h_errno; + int local_errno; return gethostbyname_r(name, &tsdPtr->hent, tsdPtr->hbuf, - sizeof(tsdPtr->hbuf), &h_errno); + sizeof(tsdPtr->hbuf), &local_errno); #elif defined(HAVE_GETHOSTBYNAME_R_6) struct hostent *hePtr = NULL; - int h_errno, result; + int local_errno, result; result = gethostbyname_r(name, &tsdPtr->hent, tsdPtr->hbuf, - sizeof(tsdPtr->hbuf), &hePtr, &h_errno); + sizeof(tsdPtr->hbuf), &hePtr, &local_errno); return (result == 0) ? hePtr : NULL; #elif defined(HAVE_GETHOSTBYNAME_R_3) @@ -622,17 +622,17 @@ TclpGetHostByAddr( ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); #if defined(HAVE_GETHOSTBYADDR_R_7) - int h_errno; + int local_errno; return gethostbyaddr_r(addr, length, type, &tsdPtr->hent, tsdPtr->hbuf, - sizeof(tsdPtr->hbuf), &h_errno); + sizeof(tsdPtr->hbuf), &local_errno); #elif defined(HAVE_GETHOSTBYADDR_R_8) struct hostent *hePtr; - int h_errno; + int local_errno; return (gethostbyaddr_r(addr, length, type, &tsdPtr->hent, tsdPtr->hbuf, - sizeof(tsdPtr->hbuf), &hePtr, &h_errno) == 0) + sizeof(tsdPtr->hbuf), &hePtr, &local_errno) == 0) ? &tsdPtr->hent : NULL; #else #define NEED_COPYHOSTENT 1 |