diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-19 16:12:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-19 16:12:00 (GMT) |
| commit | 7208478d1c5c7ed65b3d0bdaced2740830f3859b (patch) | |
| tree | eef639b380b170cca7cd66f4c51ec6ac69e1a03a /unix | |
| parent | 20547771bb29c967bf3eb2c0d8b17df50ddb8950 (diff) | |
| download | tcl-7208478d1c5c7ed65b3d0bdaced2740830f3859b.zip tcl-7208478d1c5c7ed65b3d0bdaced2740830f3859b.tar.gz tcl-7208478d1c5c7ed65b3d0bdaced2740830f3859b.tar.bz2 | |
Backport fix for [bda99f2393]: gets stdin problem when non-blocking - Windows
(cherry-pick): Fix indentation/brace usage style issues
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclLoadDyld.c | 16 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 1 | ||||
| -rw-r--r-- | unix/tclUnixTest.c | 2 | ||||
| -rw-r--r-- | unix/tclXtNotify.c | 2 | ||||
| -rw-r--r-- | unix/tclXtTest.c | 2 |
5 files changed, 15 insertions, 8 deletions
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c index b831e36..375771c 100644 --- a/unix/tclLoadDyld.c +++ b/unix/tclLoadDyld.c @@ -253,8 +253,12 @@ TclpDlopen( &dyldObjFileImage); if (err == NSObjectFileImageSuccess && dyldObjFileImage) { int nsflags = NSLINKMODULE_OPTION_RETURN_ON_ERROR; - if (!(flags & 1)) nsflags |= NSLINKMODULE_OPTION_PRIVATE; - if (!(flags & 2)) nsflags |= NSLINKMODULE_OPTION_BINDNOW; + if (!(flags & 1)) { + nsflags |= NSLINKMODULE_OPTION_PRIVATE; + } + if (!(flags & 2)) { + nsflags |= NSLINKMODULE_OPTION_BINDNOW; + } module = NSLinkModule(dyldObjFileImage, nativePath, nsflags); NSDestroyObjectFileImage(dyldObjFileImage); if (module) { @@ -646,8 +650,12 @@ TclpLoadMemory( * Extract the module we want from the image of the object file. */ - if (!(flags & 1)) nsflags |= NSLINKMODULE_OPTION_PRIVATE; - if (!(flags & 2)) nsflags |= NSLINKMODULE_OPTION_BINDNOW; + if (!(flags & 1)) { + nsflags |= NSLINKMODULE_OPTION_PRIVATE; + } + if (!(flags & 2)) { + nsflags |= NSLINKMODULE_OPTION_BINDNOW; + } module = NSLinkModule(dyldObjFileImage, "[Memory Based Bundle]", nsflags); NSDestroyObjectFileImage(dyldObjFileImage); if (!module) { diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index d6e5386..2195ab0 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -1325,7 +1325,6 @@ TcpConnect( for (statePtr->myaddr = statePtr->myaddrlist; statePtr->myaddr != NULL; statePtr->myaddr = statePtr->myaddr->ai_next) { - /* * No need to try combinations of local and remote addresses of * different families. diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c index 4f052a8..008a2f0 100644 --- a/unix/tclUnixTest.c +++ b/unix/tclUnixTest.c @@ -70,7 +70,7 @@ static Tcl_ObjCmdProc TestfindexecutableCmd; static Tcl_ObjCmdProc TestforkCmd; static Tcl_ObjCmdProc TestgotsigCmd; static Tcl_FileProc TestFileHandlerProc; -static void AlarmHandler(int signum); +static void AlarmHandler(int signum); /* *---------------------------------------------------------------------- diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c index 4388009..5f99239 100644 --- a/unix/tclXtNotify.c +++ b/unix/tclXtNotify.c @@ -91,7 +91,7 @@ static int WaitForEvent(const Tcl_Time * timePtr); * Functions defined in this file for use by users of the Xt Notifier: */ -MODULE_SCOPE void InitNotifier(void); +MODULE_SCOPE void InitNotifier(void); MODULE_SCOPE XtAppContext TclSetAppContext(XtAppContext ctx); /* diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c index e660c69..d4b4251 100644 --- a/unix/tclXtTest.c +++ b/unix/tclXtTest.c @@ -21,7 +21,7 @@ static Tcl_ObjCmdProc TesteventloopCmd; * Functions defined in tclXtNotify.c for use by users of the Xt Notifier: */ -extern void InitNotifier(void); +extern void InitNotifier(void); extern XtAppContext TclSetAppContext(XtAppContext ctx); /* |