Use more 'bool' type internally

Author: jan.nijtmans

generic/tkArray.h

@@ -201,7 +201,7 @@ AT##_BufferSize(size_t numElems)						\
 }										\
 										\
 __TK_ARRAY_UNUSED								\
-static int									\
+static bool									\
 AT##_IsEmpty(const AT *arr)							\
 {										\
     assert(!arr || arr->size != 0xdeadbeef);					\
@@ -365,7 +365,7 @@ AT##_Free(AT **arrp)								\
 }										\
 										\
 __TK_ARRAY_UNUSED								\
-static int									\
+static Tcl_Size									\
 AT##_Find(const AT *arr, const ElemType *elem)					\
 {										\
     assert(!arr || arr->size != 0xdeadbeef);					\
@@ -374,15 +374,15 @@ AT##_Find(const AT *arr, const ElemType *elem)					\
 	size_t i;								\
 	for (i = 0; i < arr->size; ++i) {					\
 	    if (memcmp(&buf[i], elem, sizeof(ElemType)) == 0) {			\
-		return (int) i;							\
+		return (Tcl_Size) i;							\
 	    }									\
 	}									\
     }										\
     return -1;									\
 }										\
 										\
 __TK_ARRAY_UNUSED								\
-static int									\
+static bool									\
 AT##_Contains(const AT *arr, const ElemType *elem)				\
 {										\
     return AT##_Find(arr, elem) != -1;						\
@@ -412,7 +412,7 @@ AT##_BufferSize(size_t numElems)						\
 }										\
 										\
 __TK_ARRAY_UNUSED								\
-static int									\
+static bool									\
 AT##_IsEmpty(const AT *arr)							\
 {										\
     assert(!arr || arr->size != 0xdeadbeef);					\
@@ -574,7 +574,7 @@ AT##_Free(AT **arrp)								\
 }										\
 										\
 __TK_ARRAY_UNUSED								\
-static int									\
+static Tcl_Size									\
 AT##_Find(const AT *arr, const ElemType *elem)					\
 {										\
     assert(!arr || arr->size != 0xdeadbeef);					\
@@ -583,15 +583,15 @@ AT##_Find(const AT *arr, const ElemType *elem)					\
 	size_t i;								\
 	for (i = 0; i < arr->size; ++i) {					\
 	    if (buf[i] == elem) {						\
-		return (int) i;							\
+		return (Tcl_Size) i;							\
 	    }									\
 	}									\
     }										\
     return -1;									\
 }										\
 										\
 __TK_ARRAY_UNUSED								\
-static int									\
+static bool									\
 AT##_Contains(const AT *arr, const ElemType *elem)				\
 {										\
     return AT##_Find(arr, elem) != -1;						\

generic/tkBind.c

@@ -1233,7 +1233,7 @@ ClearPromotionLists(
  * otherwise this should belong to function TkBindInit().
  */
 TCL_DECLARE_MUTEX(bindMutex);
-static int initialized = 0;
+static bool initialized = false;
 
 void
 TkBindInit(
@@ -1367,7 +1367,7 @@ TkBindInit(
 		Tcl_SetHashValue(hPtr, eiPtr);
 	    }
 
-	    initialized = 1;
+	    initialized = true;
 	}
 	Tcl_MutexUnlock(&bindMutex);
     }
@@ -2778,7 +2778,7 @@ MatchPatterns(
     PatSeq *bestPhysPtr;
     unsigned bestModMask;
     const PSModMaskArr *bestModMaskArr = NULL;
-    int isModKeyOnly = 0;
+    bool isModKeyOnly = false;
     Tcl_Size i;
 
     assert(dispPtr);
@@ -2808,7 +2808,7 @@ MatchPatterns(
     if (IsKeyEventType(curEvent->xev.type)) {
 	for (i = 0; i < dispPtr->numModKeyCodes; ++i) {
 	    if (dispPtr->modKeyCodes[i] == curEvent->xev.xkey.keycode) {
-		isModKeyOnly = 1;
+		isModKeyOnly = true;
 		break;
 	    }
 	}

generic/tkBitmap.c

@@ -93,7 +93,7 @@ typedef struct {
 } DataKey;
 
 typedef struct {
-    int initialized;		/* 0 means table below needs initializing. */
+    bool initialized;		/* 0 means table below needs initializing. */
     Tcl_HashTable predefBitmapTable;
 				/* Hash table created by Tk_DefineBitmap to
 				 * map from a name to a collection of in-core
@@ -1025,7 +1025,7 @@ BitmapInit(
      */
 
     if (!tsdPtr->initialized) {
-	tsdPtr->initialized = 1;
+	tsdPtr->initialized = true;
 	dummy = Tcl_CreateInterp();
 	Tcl_InitHashTable(&tsdPtr->predefBitmapTable, TCL_STRING_KEYS);
 

generic/tkButton.c

@@ -17,7 +17,7 @@
 #include "default.h"
 
 typedef struct {
-    int defaultsInitialized;
+    bool defaultsInitialized;
 } ThreadSpecificData;
 static Tcl_ThreadDataKey dataKey;
 
@@ -633,7 +633,7 @@ ButtonCreate(
 
     if (!tsdPtr->defaultsInitialized) {
 	TkpButtonSetDefaults();
-	tsdPtr->defaultsInitialized = 1;
+	tsdPtr->defaultsInitialized = true;
     }
 
     if (objc < 2) {

generic/tkConfig.c

@@ -46,7 +46,7 @@
  */
 
 typedef struct {
-    int initialized;		/* 0 means table below needs initializing. */
+    bool initialized;		/* 0 means table below needs initializing. */
     Tcl_HashTable hashTable;
 } ThreadSpecificData;
 static Tcl_ThreadDataKey dataKey;
@@ -206,7 +206,7 @@ Tk_CreateOptionTable(
 
     if (!tsdPtr->initialized) {
 	Tcl_InitHashTable(&tsdPtr->hashTable, TCL_ONE_WORD_KEYS);
-	tsdPtr->initialized = 1;
+	tsdPtr->initialized = true;
     }
 
     /*
@@ -592,7 +592,7 @@ DoObjConfig(
 				 * representation of the value if
 				 * savedOptionPtr is NULL. */
     const Tk_OptionSpec *specPtr;
-    int nullOK;
+    bool nullOK;
 
     /*
      * Save the old object form for the value, if there is one.
@@ -624,7 +624,7 @@ DoObjConfig(
     } else {
 	oldInternalPtr = (char *)&internal.internalForm;
     }
-    nullOK = (optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1));
+    nullOK = (optionPtr->specPtr->flags & (TK_OPTION_NULL_OK|TCL_NULL_OK|1)) != 0;
     switch (optionPtr->specPtr->type) {
     case TK_OPTION_BOOLEAN: {
 	int newBool;

generic/tkDList.h

@@ -253,31 +253,31 @@ LT##_ElemInit(struct ElemType *elem)						\
 }										\
 										\
 __TK_DLIST_UNUSED								\
-static int									\
+static bool									\
 LT##_IsEmpty(LT *head)								\
 {										\
     assert(head);								\
     return head->first == NULL;							\
 }										\
 										\
 __TK_DLIST_UNUSED								\
-static int									\
+static bool									\
 LT##_IsLinked(struct ElemType *elem)						\
 {										\
     assert(elem);								\
     return elem->_dl_.next && elem->_dl_.prev;					\
 }										\
 										\
 __TK_DLIST_UNUSED								\
-static int									\
+static bool									\
 LT##_IsFirst(struct ElemType *elem)						\
 {										\
     assert(LT##_IsLinked(elem));						\
     return elem->_dl_.prev->_dl_.prev == elem;					\
 }										\
 										\
 __TK_DLIST_UNUSED								\
-static int									\
+static bool									\
 LT##_IsLast(struct ElemType *elem)						\
 {										\
     assert(LT##_IsLinked(elem));						\
@@ -317,11 +317,11 @@ LT##_Prev(struct ElemType *elem)						\
 }										\
 										\
 __TK_DLIST_UNUSED								\
-static unsigned									\
+static size_t									\
 LT##_Size(const LT *head)							\
 {										\
     const struct ElemType *elem;						\
-    unsigned size = 0;								\
+    size_t size = 0;								\
     assert(head);								\
     if ((elem = head->first)) {							\
 	for ( ; elem != (void *) head; elem = elem->_dl_.next) {		\

generic/tkEntry.c

@@ -1553,13 +1553,13 @@ EntryWorldChanged(
  *--------------------------------------------------------------
  */
 
-int
+bool
 TkpDrawEntryBorderAndFocus(
     TCL_UNUSED(Entry *),
     TCL_UNUSED(Drawable),
-    TCL_UNUSED(int))
+    TCL_UNUSED(bool))
 {
-    return 0;
+    return false;
 }
 
 /*

generic/tkEntry.h

@@ -301,8 +301,8 @@ enum selelement {
  * the Entry widget.
  */
 
-MODULE_SCOPE int	TkpDrawEntryBorderAndFocus(Entry *entryPtr,
-			    Drawable d, int isSpinbox);
+MODULE_SCOPE bool	TkpDrawEntryBorderAndFocus(Entry *entryPtr,
+			    Drawable d, bool isSpinbox);
 MODULE_SCOPE int	TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d);
 
 #endif /* _TKENTRY */

generic/tkFileFilter.c

@@ -15,7 +15,7 @@
 
 static int		AddClause(Tcl_Interp *interp, FileFilter *filterPtr,
 			    Tcl_Obj *patternsObj, Tcl_Obj *ostypesObj,
-			    int isWindows);
+			    bool isWindows);
 static FileFilter *	GetFilter(FileFilterList *flistPtr, const char *name);
 
 /*
@@ -77,7 +77,7 @@ TkGetFileFilters(
     Tcl_Interp *interp,		/* Interpreter to use for error reporting. */
     FileFilterList *flistPtr,	/* Stores the list of file filters. */
     Tcl_Obj *types,		/* Value of the -filetypes option. */
-    int isWindows)		/* True if we are running on Windows. */
+    bool isWindows)		/* True if we are running on Windows. */
 {
     Tcl_Size i, listObjc;
     Tcl_Obj ** listObjv = NULL;
@@ -226,7 +226,7 @@ AddClause(
     FileFilter *filterPtr,	/* Stores the new filter clause */
     Tcl_Obj *patternsObj,	/* A Tcl list of glob patterns. */
     Tcl_Obj *ostypesObj,	/* A Tcl list of Mac OSType strings. */
-    int isWindows)		/* True if we are running on Windows; False if
+    bool isWindows)		/* True if we are running on Windows; False if
 				 * we are running on the Mac; Glob patterns
 				 * need to be processed differently on these
 				 * two platforms */

generic/tkFileFilter.h

@@ -77,7 +77,7 @@ MODULE_SCOPE void	TkFreeFileFilters(FileFilterList *flistPtr);
 MODULE_SCOPE void	TkInitFileFilters(FileFilterList *flistPtr);
 MODULE_SCOPE int	TkGetFileFilters(Tcl_Interp *interp,
 			    FileFilterList *flistPtr, Tcl_Obj *valuePtr,
-			    int isWindows);
+			    bool isWindows);
 
 #ifdef __cplusplus
 }