Skip to content

Commit 023151a

Browse files
author
jan.nijtmans
committed
Merge 9.0. Fix indenting
2 parents 1cb7e31 + 137f00e commit 023151a

File tree

9 files changed

+100
-154
lines changed

9 files changed

+100
-154
lines changed

‎generic/tclBasic.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3374,10 +3374,10 @@ Tcl_SetCommandInfoFromToken(
33743374
if (infoPtr->objProc == NULL) {
33753375
info->proc = InvokeObj2Command;
33763376
info->clientData = cmdPtr;
3377-
info->nreProc = NULL;
3377+
info->nreProc = NULL;
33783378
} else {
33793379
if (infoPtr->objProc != info->proc) {
3380-
info->nreProc = NULL;
3380+
info->nreProc = NULL;
33813381
info->proc = infoPtr->objProc;
33823382
}
33833383
info->clientData = infoPtr->objClientData;

‎generic/tclEncoding.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ Tcl_ExternalToUtfEx(
14911491
}
14921492

14931493
if (encodingPtr->toUtfProc == UtfToUtfProc) {
1494-
/* UTF-8 -> TUTF-8 */
1494+
/* UTF-8 -> TUTF-8 */
14951495
flags |= ENCODING_INPUT;
14961496
}
14971497

@@ -1510,14 +1510,14 @@ Tcl_ExternalToUtfEx(
15101510
int chunkFlags = flags;
15111511
int chunkCharLimit = INT_MAX;
15121512

1513-
/* Determine chunk sizes */
1513+
/* Determine chunk sizes */
15141514
chunkDstLen = dstSpaceLeft > INT_MAX ? INT_MAX : (int)dstSpaceLeft;
15151515
if (srcBytesLeft > INT_MAX) {
15161516
chunkSrcLen = INT_MAX;
15171517
/* not last chunk: ensure END not set */
15181518
chunkFlags &= ~TCL_ENCODING_END;
15191519
} else {
1520-
/* For the last chunk we pass on the original TCL_ENCODING_END flag */
1520+
/* For the last chunk we pass on the original TCL_ENCODING_END flag */
15211521
chunkSrcLen = (int)srcBytesLeft;
15221522
}
15231523
if (srcBytesRead > 0) {
@@ -1546,15 +1546,15 @@ Tcl_ExternalToUtfEx(
15461546
&chunkDstWritten, &chunkDstChars);
15471547

15481548

1549-
assert(chunkSrcRead <= srcBytesLeft);
1549+
assert(chunkSrcRead <= srcBytesLeft);
15501550
srcBytesLeft -= chunkSrcRead;
15511551
srcBytesRead += chunkSrcRead;
15521552
src += chunkSrcRead;
15531553

15541554
assert(chunkDstWritten <= dstSpaceLeft);
15551555
dstSpaceLeft -= chunkDstWritten;
15561556
dstBytesWritten += chunkDstWritten;
1557-
dst += chunkDstWritten;
1557+
dst += chunkDstWritten;
15581558

15591559
assert(chunkDstChars <= chunkCharLimit); /* NOT necessarily true in 9.0! */
15601560
dstCharsWritten += chunkDstChars;
@@ -2062,7 +2062,7 @@ Tcl_UtfToExternalEx(
20622062
}
20632063

20642064
if (encodingPtr->toUtfProc == UtfToUtfProc) {
2065-
/* TUTF-8 -> UTF-8 */
2065+
/* TUTF-8 -> UTF-8 */
20662066
flags &= ~ENCODING_INPUT; /* Ensure bit not set */
20672067
}
20682068

@@ -2086,14 +2086,14 @@ Tcl_UtfToExternalEx(
20862086
int chunkFlags = flags;
20872087
int chunkCharLimit = INT_MAX;
20882088

2089-
/* Determine chunk sizes */
2089+
/* Determine chunk sizes */
20902090
chunkDstLen = dstSpaceLeft > INT_MAX ? INT_MAX : (int)dstSpaceLeft;
20912091
if (srcBytesLeft > INT_MAX) {
20922092
chunkSrcLen = INT_MAX;
20932093
/* not last chunk: ensure END not set */
20942094
chunkFlags &= ~TCL_ENCODING_END;
20952095
} else {
2096-
/* For last chunk we pass on the original TCL_ENCODING_END flag */
2096+
/* For last chunk we pass on the original TCL_ENCODING_END flag */
20972097
chunkSrcLen = (int)srcBytesLeft;
20982098
}
20992099
if (srcBytesRead > 0) {
@@ -2121,15 +2121,15 @@ Tcl_UtfToExternalEx(
21212121
chunkSrcLen, chunkFlags, statePtr, dst, chunkDstLen, &chunkSrcRead,
21222122
&chunkDstWritten, &chunkDstChars);
21232123

2124-
assert(chunkSrcRead <= srcBytesLeft);
2124+
assert(chunkSrcRead <= srcBytesLeft);
21252125
srcBytesLeft -= chunkSrcRead;
21262126
srcBytesRead += chunkSrcRead;
21272127
src += chunkSrcRead;
21282128

21292129
assert(chunkDstWritten <= dstSpaceLeft);
21302130
dstSpaceLeft -= chunkDstWritten;
21312131
dstBytesWritten += chunkDstWritten;
2132-
dst += chunkDstWritten;
2132+
dst += chunkDstWritten;
21332133

21342134
assert(chunkDstChars <= chunkCharLimit); /* NOT necessarily true in 9.0! */
21352135
dstCharsWritten += chunkDstChars;

‎generic/tclPkgConfig.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static Tcl_Config const cfg[] = {
142142
{"scriptdir,runtime", CFG_RUNTIME_SCRDIR},
143143
{"includedir,runtime", CFG_RUNTIME_INCDIR},
144144
{"docdir,runtime", CFG_RUNTIME_DOCDIR},
145-
#if !defined(STATIC_BUILD)
145+
#if !defined(STATIC_BUILD) && defined(CFG_RUNTIME_DLLFILE)
146146
{"dllfile,runtime", CFG_RUNTIME_DLLFILE},
147147
#endif
148148

‎generic/tclProc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,7 @@ int
16791679
TclObjInterpProc(
16801680
void *clientData, /* Record describing procedure to be
16811681
* interpreted. */
1682-
Tcl_Interp *interp, /* Interpreter in which procedure was
1682+
Tcl_Interp *interp, /* Interpreter in which procedure was
16831683
* invoked. */
16841684
int objc, /* Count of number of arguments to this
16851685
* procedure. */

‎generic/tclTest.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ Tcltest_Init(
599599
Tcl_CreateObjCommand2(interp, "testchannelevent", TestChannelEventCmd,
600600
NULL, NULL);
601601
Tcl_CreateObjCommand2(interp, "testchancreate", TestChanCreateCmd,
602-
NULL, NULL);
602+
NULL, NULL);
603603
Tcl_CreateObjCommand2(interp, "testcmdtoken", TestcmdtokenCmd, NULL,
604604
NULL);
605605
Tcl_CreateObjCommand2(interp, "testcmdinfo", TestcmdinfoCmd, NULL,
@@ -2280,9 +2280,9 @@ static int UtfExtWrapper(
22802280
case UTF_TO_EXTERNAL_EX:
22812281
result = Tcl_UtfToExternalEx(interp, encoding, srcBufPtr,
22822282
srcNumBytes, flags, encStatePtr, dstBufPtr, dstLen,
2283-
optObjs[SRCREADVAR] ? &srcRead : NULL,
2283+
optObjs[SRCREADVAR] ? &srcRead : NULL,
22842284
&dstWrote,
2285-
optObjs[DSTCHARSVAR] ? &dstChars : NULL);
2285+
optObjs[DSTCHARSVAR] ? &dstChars : NULL);
22862286
break;
22872287
}
22882288
if (memcmp(dstBufPtr + bufLen - 4, "\xAB\xCD\xEF\xAB", 4)) {
@@ -2377,7 +2377,7 @@ TestencodingCmd(
23772377
const char *string;
23782378
TclEncoding *encodingPtr;
23792379
static const char *const optionStrings[] = {
2380-
"create", "delete", "nullength",
2380+
"create", "delete", "nullength",
23812381
"Tcl_ExternalToUtf", "Tcl_UtfToExternal",
23822382
"Tcl_ExternalToUtfEx", "Tcl_UtfToExternalEx",
23832383
"Tcl_GetEncodingNameFromEnvironment", "Tcl_GetEncodingNameForUser", NULL
@@ -9285,15 +9285,15 @@ TestChanSourceInput(
92859285
to += nbytes;
92869286
ncopied += nbytes;
92879287
}
9288-
int nchunks = (maxReadCount-ncopied)/chanPtr->len;
9288+
int nchunks = (maxReadCount-ncopied)/chanPtr->len;
92899289
char *end = to + (nchunks * chanPtr->len);
92909290
int nremain = (maxReadCount-ncopied) - (end - to);
92919291
/* Copy the data in chunks */
92929292
while (to < end) {
92939293
memmove(to, chanPtr->data, chanPtr->len);
92949294
to += chanPtr->len;
92959295
}
9296-
assert(to == end);
9296+
assert(to == end);
92979297
if (nremain) {
92989298
assert(nremain < chanPtr->len);
92999299
memmove(outPtr + maxReadCount - nremain, chanPtr->data, nremain);
@@ -9310,7 +9310,7 @@ TestChanSourceClose2 (
93109310
int flags)
93119311
{
93129312
if (flags && instanceData)
9313-
Tcl_Free(instanceData);
9313+
Tcl_Free(instanceData);
93149314
return 0;
93159315
}
93169316

‎tests/socket.test‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ test socket_$af-1.20 {arg parsing for socket command} -constraints [list socket
367367
set path(script) [makeFile {} script]
368368

369369
test socket_$af-2.1 {tcp connection} -constraints [list socket supported_$af stdio] -setup {
370-
file delete $path(script)
370+
catch {file delete $path(script)}
371371
set f [open $path(script) w]
372372
puts $f {
373373
set timer [after 10000 "set x timed_out"]
@@ -399,7 +399,7 @@ test socket_$af-2.1 {tcp connection} -constraints [list socket supported_$af std
399399
} -result {ready done {}}
400400
test socket_$af-2.2 {tcp connection with client port specified} -setup {
401401
set port [randport]
402-
file delete $path(script)
402+
catch {file delete $path(script)}
403403
set f [open $path(script) w]
404404
puts $f {
405405
set timer [after 10000 "set x timeout"]
@@ -433,7 +433,7 @@ test socket_$af-2.2 {tcp connection with client port specified} -setup {
433433
close $f
434434
} -result {ready 1}
435435
test socket_$af-2.3 {tcp connection with client interface specified} -setup {
436-
file delete $path(script)
436+
catch {file delete $path(script)}
437437
set f [open $path(script) w]
438438
puts $f {
439439
set timer [after 2000 "set x done"]
@@ -466,7 +466,7 @@ test socket_$af-2.3 {tcp connection with client interface specified} -setup {
466466
close $f
467467
} -result [list ready [list hello $localhost]]
468468
test socket_$af-2.4 {tcp connection with server interface specified} -setup {
469-
file delete $path(script)
469+
catch {file delete $path(script)}
470470
set f [open $path(script) w]
471471
puts $f [list set localhost $localhost]
472472
puts $f {
@@ -500,7 +500,7 @@ test socket_$af-2.4 {tcp connection with server interface specified} -setup {
500500
close $f
501501
} -result {ready hello}
502502
test socket_$af-2.5 {tcp connection with redundant server port} -setup {
503-
file delete $path(script)
503+
catch {file delete $path(script)}
504504
set f [open $path(script) w]
505505
puts $f {
506506
set timer [after 10000 "set x timeout"]
@@ -543,7 +543,7 @@ test socket_$af-2.6 {tcp connection} -constraints [list socket supported_$af] -b
543543
set status
544544
} -result ok
545545
test socket_$af-2.7 {echo server, one line} -constraints [list socket supported_$af stdio] -setup {
546-
file delete $path(script)
546+
catch {file delete $path(script)}
547547
set f [open $path(script) w]
548548
puts $f {
549549
set timer [after 10000 "set x timeout"]
@@ -634,7 +634,7 @@ test socket_$af-2.8 {echo server, loop 50 times, single connection} -setup {
634634
set path(script) [makeFile {} script]
635635
test socket_$af-2.9 {socket conflict} -constraints [list socket supported_$af stdio] -body {
636636
set s [socket -server accept 0]
637-
file delete $path(script)
637+
catch {file delete $path(script)}
638638
set f [open $path(script) w]
639639
puts $f [list set ::tcl::unsupported::socketAF $::tcl::unsupported::socketAF]
640640
puts $f "socket -server accept [lindex [fconfigure $s -sockname] 2]"
@@ -702,7 +702,7 @@ test socket_$af-2.11 {detecting new data} -constraints [list socket supported_$a
702702
close $sock
703703
} -result {a:one b: c:two}
704704
test socket_$af-2.12 {Bug 1758a0b603?} [list socket stdio supported_$af] {
705-
file delete $path(script)
705+
catch {file delete $path(script)}
706706
set f [open $path(script) w]
707707
puts $f {
708708
set server [socket -server accept_client 0]
@@ -741,7 +741,7 @@ test socket_$af-2.12 {Bug 1758a0b603?} [list socket stdio supported_$af] {
741741
set ::done
742742
} 0
743743
test socket_$af-2.13 {Bug 1758a0b603} {socket stdio notWine} {
744-
file delete $path(script)
744+
catch {file delete $path(script)}
745745
set f [open $path(script) w]
746746
puts $f {
747747
set server [socket -server accept 0]
@@ -783,7 +783,7 @@ test socket_$af-2.13 {Bug 1758a0b603} {socket stdio notWine} {
783783
} write
784784

785785
test socket_$af-3.1 {socket conflict} -constraints [list socket supported_$af stdio] -setup {
786-
file delete $path(script)
786+
catch {file delete $path(script)}
787787
set f [open $path(script) w]
788788
puts $f [list set localhost $localhost]
789789
puts $f {
@@ -804,7 +804,7 @@ test socket_$af-3.1 {socket conflict} -constraints [list socket supported_$af st
804804
close $f
805805
} -returnCodes error -result {couldn't open socket: address already in use}
806806
test socket_$af-3.2 {server with several clients} -setup {
807-
file delete $path(script)
807+
catch {file delete $path(script)}
808808
set f [open $path(script) w]
809809
puts $f [list set localhost $localhost]
810810
puts $f {
@@ -867,7 +867,7 @@ test socket_$af-3.2 {server with several clients} -setup {
867867
} -result {ready done}
868868

869869
test socket_$af-4.1 {server with several clients} -setup {
870-
file delete $path(script)
870+
catch {file delete $path(script)}
871871
set f [open $path(script) w]
872872
puts $f [list set localhost $localhost]
873873
puts $f {
@@ -964,7 +964,7 @@ test socket_$af-6.1 {accept callback error} -constraints [list socket supported_
964964
}
965965
set handler [interp bgerror {}]
966966
interp bgerror {} [namespace which myHandler]
967-
file delete $path(script)
967+
catch {file delete $path(script)}
968968
} -body {
969969
set f [open $path(script) w]
970970
puts $f [list set localhost $localhost]
@@ -1006,7 +1006,7 @@ test socket_$af-6.3 {writable fileevent on server socket} -setup {
10061006
} -returnCodes 1 -result "channel is not writable"
10071007

10081008
test socket_$af-7.1 {testing socket specific options} -setup {
1009-
file delete $path(script)
1009+
catch {file delete $path(script)}
10101010
set f [open $path(script) w]
10111011
puts $f {
10121012
set ss [socket -server accept 0]
@@ -1036,7 +1036,7 @@ test socket_$af-7.1 {testing socket specific options} -setup {
10361036
close $f
10371037
} -result {0 0 3}
10381038
test socket_$af-7.2 {testing socket specific options} -setup {
1039-
file delete $path(script)
1039+
catch {file delete $path(script)}
10401040
set f [open $path(script) w]
10411041
puts $f [list set ::tcl::unsupported::socketAF $::tcl::unsupported::socketAF]
10421042
puts $f {
@@ -1664,8 +1664,8 @@ set path(script1) [makeFile {} script1]
16641664
set path(script2) [makeFile {} script2]
16651665

16661666
test socket_$af-12.1 {testing inheritance of server sockets} -setup {
1667-
file delete $path(script1)
1668-
file delete $path(script2)
1667+
catch {file delete $path(script1)}
1668+
catch {file delete $path(script2)}
16691669
# Script1 is just a 10 second delay. If the server socket is inherited, it
16701670
# will be held open for 10 seconds
16711671
set f [open $path(script1) w]
@@ -1706,8 +1706,8 @@ test socket_$af-12.1 {testing inheritance of server sockets} -setup {
17061706
catch {close $p}
17071707
} -result {server socket was not inherited}
17081708
test socket_$af-12.2 {testing inheritance of client sockets} -setup {
1709-
file delete $path(script1)
1710-
file delete $path(script2)
1709+
catch {file delete $path(script1)}
1710+
catch {file delete $path(script2)}
17111711
# Script1 is just a 20 second delay. If the server socket is inherited, it
17121712
# will be held open for 20 seconds
17131713
set f [open $path(script1) w]
@@ -1775,8 +1775,8 @@ test socket_$af-12.2 {testing inheritance of client sockets} -setup {
17751775
close $p
17761776
} -result {client socket was not inherited}
17771777
test socket_$af-12.3 {testing inheritance of accepted sockets} -setup {
1778-
file delete $path(script1)
1779-
file delete $path(script2)
1778+
catch {file delete $path(script1)}
1779+
catch {file delete $path(script2)}
17801780
set f [open $path(script1) w]
17811781
# SEGVs on Windows, but works when changed to as in *-12.4 below
17821782
puts $f {
@@ -1839,8 +1839,8 @@ test socket_$af-12.3 {testing inheritance of accepted sockets} -setup {
18391839
close $p
18401840
} -result {accepted socket was not inherited}
18411841
test socket_$af-12.4 {testing inheritance of accepted sockets} -setup {
1842-
file delete $path(script1)
1843-
file delete $path(script2)
1842+
catch {file delete $path(script1)}
1843+
catch {file delete $path(script2)}
18441844
set f [open $path(script1) w]
18451845
puts $f {
18461846
fileevent stdin readable {set forever 0}

‎win/Makefile.in‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,14 +1000,13 @@ install-headers:
10001000
fi; \
10011001
done;
10021002
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
1003-
@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
1004-
$(GENERIC_DIR)/tclOO.h $(GENERIC_DIR)/tclOODecls.h \
1005-
$(GENERIC_DIR)/tclPlatDecls.h \
1006-
$(GENERIC_DIR)/tclTomMath.h \
1007-
$(GENERIC_DIR)/tclTomMathDecls.h \
1008-
$(TOMMATH_DIR)/tommath.h ; \
1003+
@for i in "$(GENERIC_DIR)/tcl.h" "$(GENERIC_DIR)/tclDecls.h" \
1004+
"$(GENERIC_DIR)/tclOO.h" "$(GENERIC_DIR)/tclOODecls.h" \
1005+
"$(GENERIC_DIR)/tclPlatDecls.h" \
1006+
"$(GENERIC_DIR)/tclTomMath.h" \
1007+
"$(GENERIC_DIR)/tclTomMathDecls.h"; \
10091008
do \
1010-
$(COPY) $$i "$(INCLUDE_INSTALL_DIR)"; \
1009+
$(COPY) "$$i" "$(INCLUDE_INSTALL_DIR)"; \
10111010
done;
10121011

10131012
# Optional target to install private headers

0 commit comments

Comments
 (0)