/[LeafOK_CVS]/lbbs/src/menu.c
ViewVC logotype

Diff of /lbbs/src/menu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.55 by sysadm, Fri May 23 13:32:51 2025 UTC Revision 1.56 by sysadm, Sun May 25 06:53:29 2025 UTC
# Line 1318  int unload_menu(MENU_SET *p_menu_set) Line 1318  int unload_menu(MENU_SET *p_menu_set)
1318                  p_menu_set->p_menu_screen_dict = NULL;                  p_menu_set->p_menu_screen_dict = NULL;
1319          }          }
1320    
1321          unload_menu_shm(p_menu_set);          detach_menu_shm(p_menu_set);
1322    
1323          if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1)          if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1)
1324          {          {
# Line 1329  int unload_menu(MENU_SET *p_menu_set) Line 1329  int unload_menu(MENU_SET *p_menu_set)
1329          return 0;          return 0;
1330  }  }
1331    
1332  int load_menu_shm(MENU_SET *p_menu_set)  int set_menu_shm_readonly(MENU_SET *p_menu_set)
1333  {  {
1334          void *p_shm;          void *p_shm;
1335    
# Line 1346  int load_menu_shm(MENU_SET *p_menu_set) Line 1346  int load_menu_shm(MENU_SET *p_menu_set)
1346          return 0;          return 0;
1347  }  }
1348    
1349  int unload_menu_shm(MENU_SET *p_menu_set)  int detach_menu_shm(MENU_SET *p_menu_set)
1350  {  {
1351          p_menu_set->menu_count = 0;          p_menu_set->menu_count = 0;
1352          p_menu_set->menu_item_count = 0;          p_menu_set->menu_item_count = 0;
# Line 1359  int unload_menu_shm(MENU_SET *p_menu_set Line 1359  int unload_menu_shm(MENU_SET *p_menu_set
1359          p_menu_set->p_menu_screen_buf = NULL;          p_menu_set->p_menu_screen_buf = NULL;
1360          p_menu_set->p_menu_screen_buf_free = NULL;          p_menu_set->p_menu_screen_buf_free = NULL;
1361    
1362            p_menu_set->p_menu_name_dict = NULL;
1363            p_menu_set->p_menu_screen_dict = NULL;
1364    
1365          if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)          if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)
1366          {          {
1367                  log_error("shmdt() error (%d)\n", errno);                  log_error("shmdt() error (%d)\n", errno);
1368                  return -1;                  return -1;
1369          }          }
         p_menu_set->p_reserved = NULL;  
   
         if (p_menu_set->p_menu_name_dict != NULL)  
         {  
                 trie_dict_destroy(p_menu_set->p_menu_name_dict);  
                 p_menu_set->p_menu_name_dict = NULL;  
         }  
1370    
1371          if (p_menu_set->p_menu_screen_dict != NULL)          p_menu_set->p_reserved = NULL;
         {  
                 trie_dict_destroy(p_menu_set->p_menu_screen_dict);  
                 p_menu_set->p_menu_screen_dict = NULL;  
         }  
1372    
1373          return 0;          return 0;
1374  }  }

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
webmaster@leafok.com
 ViewVC Help
Powered by ViewVC 1.3.0-beta1