Index: act_geo.c =================================================================== --- act_geo.c (revision 30897) +++ act_geo.c (revision 30898) @@ -46,7 +46,7 @@ PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnLine, y = fgw_coord(&argv[2])); PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnLine, r = fgw_coord(&argv[3])); PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnLine, idp = fgw_idpath(&argv[4])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[4], PCB_PTR_DOMAIN_IDPATH)) + if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[4], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); if ((obj == NULL) || (obj->type != PCB_OBJ_LINE)) @@ -69,7 +69,7 @@ PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnArc, y = fgw_coord(&argv[2])); PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnArc, r = fgw_coord(&argv[3])); PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnArc, idp = fgw_idpath(&argv[4])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[4], PCB_PTR_DOMAIN_IDPATH)) + if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[4], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj(PCB, idp); if ((obj == NULL) || (obj->type != PCB_OBJ_ARC)) @@ -89,9 +89,9 @@ PCB_ACT_CONVARG(1, FGW_IDPATH, IntersectObjObj, idp1 = fgw_idpath(&argv[1])); PCB_ACT_CONVARG(2, FGW_IDPATH, IntersectObjObj, idp2 = fgw_idpath(&argv[2])); - if ((idp1 == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[1], PCB_PTR_DOMAIN_IDPATH)) + if ((idp1 == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[1], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; - if ((idp2 == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH)) + if ((idp2 == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj1 = pcb_idpath2obj(PCB, idp1); obj2 = pcb_idpath2obj(PCB, idp2); Index: act_idpath.c =================================================================== --- act_idpath.c (revision 30897) +++ act_idpath.c (revision 30898) @@ -46,12 +46,12 @@ cmd = act_read_keywords_sphash(cmd_); if (cmd == act_read_keywords_alloc) { list = calloc(sizeof(pcb_idpath_list_t), 1); - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, list); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, list); return 0; } PCB_ACT_CONVARG(2, FGW_IDPATH_LIST, IDPList, list = fgw_idpath_list(&argv[2])); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH_LIST)) + if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST)) return FGW_ERR_PTR_DOMAIN; switch(cmd) { @@ -65,7 +65,7 @@ return 0; case act_read_keywords_free: - fgw_ptr_unreg(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH_LIST); + fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST); pcb_idpath_list_clear(list); free(list); PCB_ACT_IRES(0); @@ -75,7 +75,7 @@ case act_read_keywords_push: case act_read_keywords_prepend: PCB_ACT_CONVARG(3, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[3])); - if (!fgw_ptr_in_domain(&pcb_fgw, &argv[3], PCB_PTR_DOMAIN_IDPATH)) + if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; if (cmd == act_read_keywords_append) pcb_idpath_list_append(list, idp); @@ -103,7 +103,7 @@ res->val.ptr_struct = NULL; return 0; } - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); return 0; case act_read_keywords_pop: @@ -113,7 +113,7 @@ res->val.ptr_struct = NULL; return 0; } - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); pcb_idpath_list_remove(idp); return 0; @@ -135,7 +135,7 @@ PCB_ACT_CONVARG(1, FGW_STR, IDP, cmd = argv[1].val.str); PCB_ACT_CONVARG(2, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[2])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH)) + if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; @@ -142,7 +142,7 @@ switch(act_read_keywords_sphash(cmd)) { case act_read_keywords_free: pcb_idpath_list_remove(idp); - fgw_ptr_unreg(&pcb_fgw, &argv[2], PCB_PTR_DOMAIN_IDPATH); + fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH); free(idp); PCB_ACT_IRES(0); return 0; @@ -151,7 +151,7 @@ obj = pcb_idpath2obj(PCB, idp); idp = pcb_obj2idpath(obj); res->type = FGW_IDPATH; - fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); + fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); return 0; case act_read_keywords_print: @@ -181,7 +181,7 @@ } PCB_ACT_CONVARG(iidx, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[iidx])); - if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[iidx], PCB_PTR_DOMAIN_IDPATH)) + if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[iidx], RND_PTR_DOMAIN_IDPATH)) return FGW_ERR_PTR_DOMAIN; obj = pcb_idpath2obj_in(root_data, idp); Index: act_read.c =================================================================== --- act_read.c (revision 30897) +++ act_read.c (revision 30898) @@ -100,7 +100,7 @@ } -pcb_action_t act_read_action_list[] = { +rnd_action_t act_read_action_list[] = { {"GetValue", pcb_act_GetValue, pcb_acth_GetValue, pcb_acts_GetValue}, {"IDPList", pcb_act_IDPList, pcb_acth_IDPList, pcb_acts_IDPList}, {"IDP", pcb_act_IDP, pcb_acth_IDP, pcb_acts_IDP}, @@ -121,7 +121,7 @@ void pplg_uninit_act_read(void) { - pcb_remove_actions_by_cookie(act_read_cookie); + rnd_remove_actions_by_cookie(act_read_cookie); } int pplg_init_act_read(void)