Skip to content

Commit 7386a38

Browse files
author
jan.nijtmans
committed
Fix some more indenting
2 parents aca8bd2 + 2d6b4ee commit 7386a38

9 files changed

+354
-352
lines changed

unix/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ install-libraries: libraries
11011101
@if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ] ; then \
11021102
echo "Customizing tcl module path"; \
11031103
echo "if {![interp issafe]} { ::tcl::tm::roots [list $(TCL_MODULE_PATH)] }" >> \
1104-
"$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
1104+
"$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
11051105
fi
11061106

11071107
install-tzdata:

unix/installManPage

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Suffix=""
1212

1313
while true; do
1414
case $1 in
15-
-s | --symlinks ) Sym="-s " ;;
16-
-z | --compress ) Gzip=$2; shift ;;
15+
-s | --symlinks ) Sym="-s " ;;
16+
-z | --compress ) Gzip=$2; shift ;;
1717
-e | --extension ) Gz=$2; shift ;;
1818
-x | --suffix ) Suffix=$2; shift ;;
1919
-*) cat <<EOF

unix/tclEpollNotfy.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ PlatformEventsControl(
207207
newEvent.events |= EPOLLOUT;
208208
}
209209
if (isNew) {
210-
newPedPtr = (struct PlatformEventData *)
210+
newPedPtr = (struct PlatformEventData *)
211211
Tcl_Alloc(sizeof(struct PlatformEventData));
212-
newPedPtr->filePtr = filePtr;
213-
newPedPtr->tsdPtr = tsdPtr;
212+
newPedPtr->filePtr = filePtr;
213+
newPedPtr->tsdPtr = tsdPtr;
214214
filePtr->pedPtr = newPedPtr;
215215
}
216216
newEvent.data.ptr = filePtr->pedPtr;
@@ -367,7 +367,7 @@ PlatformEventsInit(void)
367367
filePtr->mask = TCL_READABLE;
368368
PlatformEventsControl(filePtr, tsdPtr, EPOLL_CTL_ADD, 1);
369369
if (!tsdPtr->readyEvents) {
370-
tsdPtr->maxReadyEvents = 512;
370+
tsdPtr->maxReadyEvents = 512;
371371
tsdPtr->readyEvents = (struct epoll_event *) Tcl_Alloc(
372372
tsdPtr->maxReadyEvents * sizeof(tsdPtr->readyEvents[0]));
373373
}

unix/tclLoadOSF.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ TclpDlopen(
128128
*/
129129

130130
if ((pkg = strrchr(fileName, '/')) == NULL) {
131-
pkg = fileName;
131+
pkg = fileName;
132132
} else {
133133
pkg++;
134134
}

unix/tclUnixCompat.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -994,17 +994,17 @@ TclWinCPUID(
994994
/* See: <http://en.wikipedia.org/wiki/CPUID> */
995995
#if defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64)
996996
__asm__ __volatile__("movq %%rbx, %%rsi \n\t" /* save %rbx */
997-
"cpuid \n\t"
998-
"xchgq %%rsi, %%rbx \n\t" /* restore the old %rbx */
999-
: "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
1000-
: "a"(index));
997+
"cpuid \n\t"
998+
"xchgq %%rsi, %%rbx \n\t" /* restore the old %rbx */
999+
: "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
1000+
: "a"(index));
10011001
status = TCL_OK;
10021002
#elif defined(__i386__) || defined(_M_IX86)
10031003
__asm__ __volatile__("mov %%ebx, %%esi \n\t" /* save %ebx */
1004-
"cpuid \n\t"
1005-
"xchg %%esi, %%ebx \n\t" /* restore the old %ebx */
1006-
: "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
1007-
: "a"(index));
1004+
"cpuid \n\t"
1005+
"xchg %%esi, %%ebx \n\t" /* restore the old %ebx */
1006+
: "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3])
1007+
: "a"(index));
10081008
status = TCL_OK;
10091009
#else
10101010
(void)index;

unix/tclUnixInit.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ static const char *const processors[NUMPROCESSORS] = {
5454

5555
typedef struct {
5656
union {
57-
unsigned int dwOemId;
58-
struct {
59-
int wProcessorArchitecture;
60-
int wReserved;
61-
};
57+
unsigned int dwOemId;
58+
struct {
59+
int wProcessorArchitecture;
60+
int wReserved;
61+
};
6262
};
6363
unsigned int dwPageSize;
6464
void *lpMinimumApplicationAddress;
@@ -860,15 +860,15 @@ TclpSetVariables(
860860
}
861861
Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_pkgPath", -1), NULL, pkgListObj, TCL_GLOBAL_ONLY);
862862
{
863-
/* Some platforms build configure scripts expect ~ expansion so do that */
864-
Tcl_Obj *origPaths;
865-
Tcl_Obj *resolvedPaths;
866-
867-
origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);
868-
resolvedPaths = TclResolveTildePathList(origPaths);
869-
if (resolvedPaths != origPaths && resolvedPaths != NULL) {
870-
Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL, resolvedPaths, TCL_GLOBAL_ONLY);
871-
}
863+
/* Some platforms build configure scripts expect ~ expansion so do that */
864+
Tcl_Obj *origPaths;
865+
Tcl_Obj *resolvedPaths;
866+
867+
origPaths = Tcl_GetVar2Ex(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);
868+
resolvedPaths = TclResolveTildePathList(origPaths);
869+
if (resolvedPaths != origPaths && resolvedPaths != NULL) {
870+
Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL, resolvedPaths, TCL_GLOBAL_ONLY);
871+
}
872872
}
873873

874874
#ifdef DJGPP

0 commit comments

Comments
 (0)