head	1.1;
access;
symbols;
locks; strict;
comment	@ * @;


1.1
date	2026.06.28.06.16.27;	author tsutsui;	state Exp;
branches;
next	;
commitid	J1Yf621yszsDTwLG;


desc
@@


1.1
log
@ja-freewnn-{lib,server}: fix builds with gcc 14 and later

- Add necessary standard headers to pull proper prototypes in test
  programs in the generated configure script to avoid errors caused
  by -Wimplicit-function-declaration (which is fatal on -std=gnu23)
- Use proper qsort(3)-compatible comparator prototypes
- Add missing prototypes for several function pointer arguments
- Fix other -Wimcompatiple-pointer-types warnings
- Appease several -Wpointer-compare and -Wpointer-sign warnings
- Move -Wchar-subscripts fixes from SUBST to explicit patch files
- Also fix wnn_sStrncpy() to use the correct conversion direction
  (found during -Wincompatiple-pointer-types cleanup)

While here, take MAINTAINERship.

Bump PKGREVISIONs.
@
text
@$NetBSD$

- Fix build with -std=gnu23 (i.e. gcc14 and later)

--- Wnn/jlib/jl.c.orig	2026-06-25 14:24:34.268341077 +0000
+++ Wnn/jlib/jl.c
@@@@ -2623,17 +2623,19 @@@@ jl_dic_list_e (env, dicinfo)
 
 static int
 sort_func_ws (a, b)
-     register char *a, *b;
+     const void *a, *b;
 {
   int ah, bh, ai, bi, iah, ibh, iai, ibi;
-  ah = ((struct wnn_jdata *) a)->hindo;
-  bh = ((struct wnn_jdata *) b)->hindo;
-  iah = ((struct wnn_jdata *) a)->int_hindo;
-  ibh = ((struct wnn_jdata *) b)->int_hindo;
-  ai = ((struct wnn_jdata *) a)->ima;
-  bi = ((struct wnn_jdata *) b)->ima;
-  iai = ((struct wnn_jdata *) a)->int_ima;
-  ibi = ((struct wnn_jdata *) b)->int_ima;
+  const struct wnn_jdata *ja = a;
+  const struct wnn_jdata *jb = b;
+  ah = ja->hindo;
+  bh = jb->hindo;
+  iah = ja->int_hindo;
+  ibh = jb->int_hindo;
+  ai = ja->ima;
+  bi = jb->ima;
+  iai = ja->int_ima;
+  ibi = jb->int_ima;
 
   if (ai == WNN_IMA_OFF && ah == WNN_ENTRY_NO_USE)
     return (1);
@@@@ -2677,7 +2679,7 @@@@ jl_word_search_e (env, dic_no, yomi, jdp
     if_dead_disconnect (env, -1);
   jd = (struct wnn_jdata *) wordrb.buf;
 /*    for(cnt = 0 ; jd[cnt].dic_no != -1; cnt++); */
-  qsort ((char *) jd, cnt, sizeof (struct wnn_jdata), sort_func_ws);
+  qsort (jd, cnt, sizeof (struct wnn_jdata), sort_func_ws);
   *jdp = jd;
   return (cnt);
 }
@@@@ -2696,7 +2698,7 @@@@ jl_word_search_by_env_e (env, yomi, jdp)
     if_dead_disconnect (env, -1);
   jd = (struct wnn_jdata *) wordrb.buf;
 /*    for(cnt = 0 ; jd[cnt].dic_no != -1; cnt++); */
-  qsort ((char *) jd, cnt, sizeof (struct wnn_jdata), sort_func_ws);
+  qsort (jd, cnt, sizeof (struct wnn_jdata), sort_func_ws);
   *jdp = jd;
   return (cnt);
 }
@