master 8c1345b48dd 1/2: Pacify gcc 16 -Wuseless-cast in oldXMenu

Paul Eggert <[email protected]> Wed, 15 Jul 2026 14:39:58 -0400 (EDT)
Newsgroups gmane.emacs.diffs
Message-ID <[email protected]>
branch: master
commit 8c1345b48dd67ec3ea31b298ff790e811cef25ae
Author: Paul Eggert <[email protected]>
Commit: Paul Eggert <[email protected]>

    Pacify gcc 16 -Wuseless-cast in oldXMenu
    
    * oldXMenu/Create.c (XMenuCreate):
    * oldXMenu/XCrAssoc.c (XCreateAssocTable):
    Omit useless casts.
---
 oldXMenu/Create.c   | 12 ++++++------
 oldXMenu/XCrAssoc.c |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index a4aab027bd7..dc0e8f3f38b 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -201,7 +201,7 @@ XMenuCreate(Display *display, Window parent, register char const *def_env)
   /*
    * Create the XAssocTable
    */
-  assoc_tab = (XAssocTable *)XCreateAssocTable(XASSOC_TABLE_SIZE);
+  assoc_tab = XCreateAssocTable (XASSOC_TABLE_SIZE);
   if(assoc_tab == NULL) {
     _XMErrorCode= XME_CREATE_ASSOC;
     return(NULL);
@@ -441,31 +441,31 @@ XMenuCreate(Display *display, Window parent, register char const *def_env)
     switch (inact_pnum)
       {
       case 0:
-	data = (char *)dimple1_bits;
+	data = dimple1_bits;
 	width = dimple1_width;
 	height = dimple1_height;
 	break;
 
       case 1:
-	data = (char *)dimple3_bits;
+	data = dimple3_bits;
 	width = dimple3_width;
 	height = dimple3_height;
 	break;
 
       case 2:
-	data = (char *)gray1_bits;
+	data = gray1_bits;
 	width = gray1_width;
 	height = gray1_height;
 	break;
 
       case 3:
-	data = (char *)gray3_bits;
+	data = gray3_bits;
 	width = gray3_width;
 	height = gray3_height;
 	break;
 
       case 4:
-	data = (char *)cross_weave_bits;
+	data = cross_weave_bits;
 	width = cross_weave_width;
 	height = cross_weave_height;
 	break;
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index e017cbbbccf..86d93bb747e 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -52,7 +52,7 @@ XAssocTable *XCreateAssocTable(register int size)
 	}
 
 	/* calloc the buckets (actually just their headers). */
-	buckets = (XAssoc *)calloc((unsigned)size, (unsigned)sizeof(XAssoc));
+	buckets = calloc (size, sizeof (XAssoc));
 	if (buckets == NULL) {
 		/* calloc call failed! */
 		errno = ENOMEM;
@@ -72,4 +72,3 @@ XAssocTable *XCreateAssocTable(register int size)
 
 	return(table);
 }
-