ui/common/menu.c

changeset 966
e411ed7c5f10
parent 890
8d30cbd1c465
--- a/ui/common/menu.c	Sun Dec 07 14:39:03 2025 +0100
+++ b/ui/common/menu.c	Sun Dec 07 15:23:03 2025 +0100
@@ -89,20 +89,20 @@
     return s ? strdup(s) : NULL;
 }
 
-int* uic_copy_groups(const int* groups, size_t *ngroups) {
-    *ngroups = 0;
-    if (!groups) {
+int* uic_copy_states(const int* states, size_t *nstates) {
+    *nstates = 0;
+    if (!states) {
         return NULL;
     }
 
     size_t n;
-    for (n = 0; groups[n] > -1; n++) { }
+    for (n = 0; states[n] > -1; n++) { }
 
-    if (ngroups > 0) {
+    if (nstates > 0) {
         int* newarray = calloc(n+1, sizeof(int));
-        memcpy(newarray, groups, n * sizeof(int));
+        memcpy(newarray, states, n * sizeof(int));
         newarray[n] = -1;
-        *ngroups = n;
+        *nstates = n;
         return newarray;
     }
     return NULL;
@@ -152,7 +152,7 @@
     item->icon = nl_strdup(args->icon);
     item->userdata = args->onclickdata;
     item->callback = args->onclick;
-    item->groups = uic_copy_groups(args->groups, &item->ngroups);
+    item->states = uic_copy_states(args->states, &item->nstates);
 
     add_item((UiMenuItemI*)item);
 }
@@ -179,7 +179,7 @@
     item->varname = nl_strdup(args->varname);
     item->userdata = args->onchangedata;
     item->callback = args->onchange;
-    item->groups = uic_copy_groups(args->groups, &item->ngroups);
+    item->states = uic_copy_states(args->nstates, &item->nstates);
     
     add_item((UiMenuItemI*)item);
 }
@@ -196,7 +196,7 @@
     item->varname = nl_strdup(args->varname);
     item->userdata = args->onchangedata;
     item->callback = args->onchange;
-    item->groups = uic_copy_groups(args->groups, &item->ngroups);
+    item->states = uic_copy_states(args->nstates, &item->nstates);
 
     add_item((UiMenuItemI*)item);
 }
@@ -296,14 +296,14 @@
         }
         case UI_MENU_ITEM: {
             UiMenuItem *i = (UiMenuItem*)item;
-            free(i->groups);
+            free(i->states);
             free(i->label);
             free(i->icon);
             break;
         }
         case UI_MENU_CHECK_ITEM: {
             UiMenuCheckItem *i = (UiMenuCheckItem*)item;
-            free(i->groups);
+            free(i->states);
             free(i->label);
             free(i->icon);
             free(i->varname);
@@ -311,7 +311,7 @@
         }
         case UI_MENU_RADIO_ITEM: {
             UiMenuRadioItem *i = (UiMenuRadioItem*)item;
-            free(i->groups);
+            free(i->states);
             free(i->label);
             free(i->icon);
             free(i->varname);

mercurial