(backport): Fix warnings in asserts (seen in debug-mode only). Fix some C++ usage.

Author: jan.nijtmans

.github/workflows/mac-build.yml

@@ -103,4 +103,4 @@ jobs:
         env:
           ERROR_ON_FAILURES: 1
           MAC_CI: 1
-        timeout-minutes: 15
+        timeout-minutes: 20

unix/tclSelectNotfy.c

@@ -180,17 +180,16 @@ static pthread_cond_t notifierCV = PTHREAD_COND_INITIALIZER;
 
 /*
  * The pollState bits:
- *
- * POLL_WANT is set by each thread before it waits on its condition variable.
- *	It is checked by the notifier before it does select.
- *
- * POLL_DONE is set by the notifier if it goes into select after seeing
- *	POLL_WANT. The idea is to ensure it tries a select with the same bits
- *	the initial thread had set.
  */
-
-#define POLL_WANT	0x1
-#define POLL_DONE	0x2
+enum SelectPollStateFlags {
+    POLL_WANT = 0x1,		/* Set by each thread before it waits on its
+				 * condition variable. Checked by the notifier
+				 * before it does select(). */
+    POLL_DONE = 0x2		/* Set by the notifier if it goes into select()
+				 * after seeing POLL_WANT. The idea is to
+				 * ensure it tries a select() with the same
+				 * bits the initial thread had set. */
+};
 
 /*
  * This is the thread ID of the notifier thread that does select.
@@ -254,33 +253,33 @@ typedef struct {
     const void *lpszClassName;
 } WNDCLASSW;
 
-extern void CloseHandle(void *);
-extern void *CreateEventW(void *, unsigned char, unsigned char,
+extern void		CloseHandle(void *);
+extern void *		CreateEventW(void *, unsigned char, unsigned char,
 			    void *);
-extern void *CreateWindowExW(void *, const void *, const void *,
+extern void *		CreateWindowExW(void *, const void *, const void *,
 			    unsigned int, int, int, int, int, void *, void *,
 			    void *, void *);
-extern unsigned int DefWindowProcW(void *, int, void *, void *);
-extern unsigned char DestroyWindow(void *);
-extern int DispatchMessageW(const MSG *);
-extern unsigned char GetMessageW(MSG *, void *, int, int);
-extern void MsgWaitForMultipleObjects(unsigned int, void *,
+extern unsigned int	DefWindowProcW(void *, int, void *, void *);
+extern unsigned char	DestroyWindow(void *);
+extern int		DispatchMessageW(const MSG *);
+extern unsigned char	GetMessageW(MSG *, void *, int, int);
+extern void		MsgWaitForMultipleObjects(unsigned int, void *,
 			    unsigned char, unsigned int, unsigned int);
-extern unsigned char PeekMessageW(MSG *, void *, int, int, int);
-extern unsigned char PostMessageW(void *, unsigned int, void *,
+extern unsigned char	PeekMessageW(MSG *, void *, int, int, int);
+extern unsigned char	PostMessageW(void *, unsigned int, void *,
 				    void *);
-extern void PostQuitMessage(int);
-extern void *RegisterClassW(const WNDCLASSW *);
-extern unsigned char ResetEvent(void *);
-extern unsigned char TranslateMessage(const MSG *);
+extern void		PostQuitMessage(int);
+extern void *		RegisterClassW(const WNDCLASSW *);
+extern unsigned char	ResetEvent(void *);
+extern unsigned char	TranslateMessage(const MSG *);
 
 /*
  * Threaded-cygwin specific constants and functions in this file:
  */
 
 #if TCL_THREADS && defined(__CYGWIN__)
-static const WCHAR className[] = L"TclNotifier";
-static unsigned int NotifierProc(void *hwnd, unsigned int message,
+static const WCHAR className[] = {'T', 'c', 'l', 'N', 'o', 't', 'i', 'f', 'i', 'e', 'r', '\0'};
+static unsigned int	NotifierProc(void *hwnd, unsigned int message,
 			    void *wParam, void *lParam);
 #endif /* TCL_THREADS && defined(__CYGWIN__) */
 #ifdef __cplusplus
@@ -921,7 +920,7 @@ int
 TclAsyncNotifier(
     int sigNumber,		/* Signal number. */
     TCL_UNUSED(Tcl_ThreadId),	/* Target thread. */
-    TCL_UNUSED(void *),	/* Notifier data. */
+    TCL_UNUSED(void *),		/* Notifier data. */
     int *flagPtr,		/* Flag to mark. */
     int value)			/* Value of mark. */
 {

unix/tclUnixFile.c

@@ -46,9 +46,10 @@ TclpFindExecutable(
     TCL_UNUSED(const char *) /*argv0*/)
 {
     size_t length;
-    WCHAR buf[PATH_MAX] = L"";
+    WCHAR buf[PATH_MAX];
     char name[PATH_MAX * TCL_UTF_MAX + 1];
 
+    buf[0] = '\0';
     GetModuleFileNameW(NULL, buf, PATH_MAX);
     cygwin_conv_path(3, buf, name, sizeof(name));
     length = strlen(name);
@@ -166,7 +167,8 @@ TclpFindExecutable(
     if (name[0] == '/')
 #endif
     {
-	Tcl_ExternalToUtfDStringEx(NULL, NULL, name, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
+	Tcl_ExternalToUtfDStringEx(NULL, NULL, name, TCL_INDEX_NONE,
+		TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
 	TclSetObjNameOfExecutable(Tcl_DStringToObj(&utfName), NULL);
 	goto getShlibName;
     }
@@ -627,7 +629,8 @@ TclpGetUserHome(
     Tcl_DString ds;
     const char *native;
 
-    if (Tcl_UtfToExternalDStringEx(NULL, NULL, name, TCL_INDEX_NONE, 0, &ds, NULL) != TCL_OK) {
+    if (Tcl_UtfToExternalDStringEx(NULL, NULL, name, TCL_INDEX_NONE, 0, &ds,
+	    NULL) != TCL_OK) {
 	Tcl_DStringFree(&ds);
 	return NULL;
     }
@@ -639,7 +642,8 @@ TclpGetUserHome(
     if (pwPtr == NULL) {
 	return NULL;
     }
-    if (Tcl_ExternalToUtfDStringEx(NULL, NULL, pwPtr->pw_dir, TCL_INDEX_NONE, 0, bufferPtr, NULL) != TCL_OK) {
+    if (Tcl_ExternalToUtfDStringEx(NULL, NULL, pwPtr->pw_dir, TCL_INDEX_NONE,
+	    0, bufferPtr, NULL) != TCL_OK) {
 	return NULL;
     } else {
 	return Tcl_DStringValue(bufferPtr);
@@ -821,7 +825,8 @@ TclpGetCwd(
 	}
 	return NULL;
     }
-    if (Tcl_ExternalToUtfDStringEx(interp, NULL, buffer, TCL_INDEX_NONE, 0, bufferPtr, NULL) != TCL_OK) {
+    if (Tcl_ExternalToUtfDStringEx(interp, NULL, buffer, TCL_INDEX_NONE, 0,
+	    bufferPtr, NULL) != TCL_OK) {
 	return NULL;
     }
     return Tcl_DStringValue(bufferPtr);
@@ -1112,7 +1117,8 @@ TclpNativeToNormalized(
 {
     Tcl_DString ds;
 
-    Tcl_ExternalToUtfDStringEx(NULL, NULL, (const char *) clientData, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
+    Tcl_ExternalToUtfDStringEx(NULL, NULL, (const char *) clientData,
+	    TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
     return Tcl_DStringToObj(&ds);
 }
 

win/tclWinThrd.c

@@ -50,7 +50,7 @@ static CRITICAL_SECTION initLock;
 
 typedef struct WMutex {
     CRITICAL_SECTION crit;
-    volatile LONG thread;
+    volatile DWORD thread;
     int counter;
 } WMutex;
 
@@ -564,7 +564,7 @@ static void
 WMutexLock(
     WMutex *wmPtr)
 {
-    LONG mythread = GetCurrentThreadId();
+    DWORD mythread = GetCurrentThreadId();
 
     if (wmPtr->thread == mythread) {
 	// We owned the lock already, so it's recursive.
@@ -813,7 +813,7 @@ Tcl_ConditionWait(
 
     counter = wmPtr->counter;
     wmPtr->counter = 0;
-    LONG mythread = GetCurrentThreadId();
+    DWORD mythread = GetCurrentThreadId();
     assert(wmPtr->thread == mythread);
     wmPtr->thread = 0;
     LeaveCriticalSection(&wmPtr->crit);