mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-03-21 18:01:15 +00:00
Rewrite ruamoko plist support to use handles.
The plist code was written long before I thought of resource handles, and then it was forgotten. This is much nicer and safer than storing C pointers in progs memory space (*shudder*).
This commit is contained in:
Bill Currie
parent
763cec3838
commit
5fc4ef63f6
4 changed files with 268 additions and 69 deletions
|
|
@ -48,55 +48,149 @@ static __attribute__ ((used)) const char rcsid[] =
|
|||
|
||||
#include "rua_internal.h"
|
||||
|
||||
typedef struct bi_plist_s {
|
||||
struct bi_plist_s *next;
|
||||
struct bi_plist_s **prev;
|
||||
plitem_t *plitem;
|
||||
int own;
|
||||
} bi_plist_t;
|
||||
|
||||
typedef struct {
|
||||
hashtab_t *items;
|
||||
PR_RESMAP (bi_plist_t) plist_map;
|
||||
bi_plist_t *plists;
|
||||
hashtab_t *plist_tab;
|
||||
} plist_resources_t;
|
||||
|
||||
static inline void
|
||||
return_plitem (progs_t *pr, plitem_t *plitem)
|
||||
static bi_plist_t *
|
||||
plist_new (plist_resources_t *res)
|
||||
{
|
||||
memset (&R_INT (pr), 0, 8);
|
||||
memcpy (&R_INT (pr), &plitem, sizeof (plitem));
|
||||
PR_RESNEW (bi_plist_t, res->plist_map);
|
||||
}
|
||||
|
||||
static inline plitem_t *
|
||||
p_plitem (progs_t *pr, int n)
|
||||
static void
|
||||
plist_free (plist_resources_t *res, bi_plist_t *plist)
|
||||
{
|
||||
plitem_t *plitem;
|
||||
memcpy (&plitem, &P_INT (pr, n), sizeof (plitem));
|
||||
return plitem;
|
||||
PR_RESFREE (bi_plist_t, res->plist_map, plist);
|
||||
}
|
||||
|
||||
static inline plitem_t *
|
||||
record_plitem (progs_t *pr, plitem_t *plitem)
|
||||
static void
|
||||
plist_reset (plist_resources_t *res)
|
||||
{
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
if (plitem)
|
||||
Hash_AddElement (res->items, plitem);
|
||||
return plitem;
|
||||
PR_RESRESET (bi_plist_t, res->plist_map);
|
||||
}
|
||||
|
||||
static inline plitem_t *
|
||||
remove_plitem (progs_t *pr, plitem_t *plitem)
|
||||
static inline bi_plist_t *
|
||||
plist_get (plist_resources_t *res, unsigned index)
|
||||
{
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
PR_RESGET(res->plist_map, index);
|
||||
}
|
||||
|
||||
static inline int
|
||||
plist_index (plist_resources_t *res, bi_plist_t *plist)
|
||||
{
|
||||
PR_RESINDEX(res->plist_map, plist);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_plist_clear (progs_t *pr, void *data)
|
||||
{
|
||||
plist_resources_t *res = (plist_resources_t *) data;
|
||||
bi_plist_t *plist;
|
||||
|
||||
for (plist = res->plists; plist; plist = plist->next) {
|
||||
if (plist->own)
|
||||
PL_Free (plist->plitem);
|
||||
}
|
||||
|
||||
Hash_FlushTable (res->plist_tab);
|
||||
plist_reset (res);
|
||||
}
|
||||
|
||||
static inline int
|
||||
plist_handle (plist_resources_t *res, plitem_t *plitem)
|
||||
{
|
||||
bi_plist_t dummy = {0, 0, plitem, 0};
|
||||
bi_plist_t *plist = Hash_FindElement (res->plist_tab, &dummy);
|
||||
|
||||
Hash_DelElement (res->items, plitem);
|
||||
return plitem;
|
||||
if (plist)
|
||||
return plist_index (res, plist);
|
||||
|
||||
plist = plist_new (res);
|
||||
|
||||
if (!plist)
|
||||
return 0;
|
||||
|
||||
plist->next = res->plists;
|
||||
plist->prev = &res->plists;
|
||||
if (res->plists)
|
||||
res->plists->prev = &plist->next;
|
||||
res->plists = plist;
|
||||
|
||||
plist->plitem = plitem;
|
||||
|
||||
Hash_AddElement (res->plist_tab, plist);
|
||||
return plist_index (res, plist);
|
||||
}
|
||||
|
||||
static inline void
|
||||
plist_free_handle (plist_resources_t *res, bi_plist_t *plist)
|
||||
{
|
||||
Hash_DelElement (res->plist_tab, plist);
|
||||
*plist->prev = plist->next;
|
||||
plist_free (res, plist);
|
||||
}
|
||||
|
||||
static inline bi_plist_t *
|
||||
get_plist (progs_t *pr, const char *name, int handle)
|
||||
{
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
bi_plist_t *plist = plist_get (res, handle);
|
||||
|
||||
// plist->prev will be null if the handle is unallocated
|
||||
if (!plist || !plist->prev)
|
||||
PR_RunError (pr, "invalid plist passed to %s", name + 3);
|
||||
return plist;
|
||||
}
|
||||
|
||||
static inline int
|
||||
plist_retain (plist_resources_t *res, plitem_t *plitem)
|
||||
{
|
||||
int handle;
|
||||
bi_plist_t *plist;
|
||||
|
||||
if (!plitem)
|
||||
return 0;
|
||||
|
||||
handle = plist_handle (res, plitem);
|
||||
if (!handle) {
|
||||
// we're taking ownership of the plitem, but we have nowhere to store
|
||||
// it, so we have to lose it. However, in this situation, we have worse
|
||||
// things to worry about.
|
||||
PL_Free (plitem);
|
||||
return 0;
|
||||
}
|
||||
|
||||
plist = plist_get (res, handle);
|
||||
plist->own = 1;
|
||||
return handle;
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_GetPropertyList (progs_t *pr)
|
||||
{
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
plitem_t *plitem = PL_GetPropertyList (P_GSTRING (pr, 0));
|
||||
|
||||
return_plitem (pr, record_plitem (pr, plitem));
|
||||
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_WritePropertyList (progs_t *pr)
|
||||
{
|
||||
char *pl = PL_WritePropertyList (p_plitem (pr, 0));
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
char *pl = PL_WritePropertyList (plist->plitem);
|
||||
|
||||
R_STRING (pr) = PR_SetDynamicString (pr, pl);
|
||||
free (pl);
|
||||
}
|
||||
|
|
@ -104,117 +198,208 @@ bi_PL_WritePropertyList (progs_t *pr)
|
|||
static void
|
||||
bi_PL_Type (progs_t *pr)
|
||||
{
|
||||
R_INT (pr) = PL_Type (p_plitem (pr, 0));
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
|
||||
R_INT (pr) = PL_Type (plist->plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_String (progs_t *pr)
|
||||
{
|
||||
const char *str = PL_String (p_plitem (pr, 0));
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
const char *str = PL_String (plist->plitem);
|
||||
|
||||
RETURN_STRING (pr, str);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_ObjectForKey (progs_t *pr)
|
||||
{
|
||||
return_plitem (pr, PL_ObjectForKey (p_plitem (pr, 0), P_GSTRING (pr, 1)));
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
const char *key = P_GSTRING (pr, 1);
|
||||
plitem_t *plitem = PL_ObjectForKey (plist->plitem, key);
|
||||
|
||||
R_INT (pr) = 0;
|
||||
if (!plitem)
|
||||
return;
|
||||
R_INT (pr) = plist_handle (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_RemoveObjectForKey (progs_t *pr)
|
||||
{
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
const char *key = P_GSTRING (pr, 1);
|
||||
plitem_t *plitem = PL_RemoveObjectForKey (plist->plitem, key);
|
||||
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_ObjectAtIndex (progs_t *pr)
|
||||
{
|
||||
return_plitem (pr, PL_ObjectAtIndex (p_plitem (pr, 0), P_INT (pr, 1)));
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
int ind = P_INT (pr, 1);
|
||||
plitem_t *plitem = PL_ObjectAtIndex (plist->plitem, ind);
|
||||
|
||||
R_INT (pr) = 0;
|
||||
if (!plitem)
|
||||
return;
|
||||
R_INT (pr) = plist_handle (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_D_AllKeys (progs_t *pr)
|
||||
{
|
||||
return_plitem (pr, PL_D_AllKeys (p_plitem (pr, 0)));
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
plitem_t *plitem = PL_D_AllKeys (plist->plitem);
|
||||
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_D_NumKeys (progs_t *pr)
|
||||
{
|
||||
R_INT (pr) = PL_D_NumKeys (p_plitem (pr, 0));
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
|
||||
R_INT (pr) = PL_D_NumKeys (plist->plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_D_AddObject (progs_t *pr)
|
||||
{
|
||||
R_INT (pr) = PL_D_AddObject (p_plitem (pr, 0), P_GSTRING (pr, 1),
|
||||
remove_plitem (pr, p_plitem (pr, 2)));
|
||||
int dict_handle = P_INT (pr, 0);
|
||||
int obj_handle = P_INT (pr, 2);
|
||||
bi_plist_t *dict = get_plist (pr, __FUNCTION__, dict_handle);
|
||||
const char *key = P_GSTRING (pr, 1);
|
||||
bi_plist_t *obj = get_plist (pr, __FUNCTION__, obj_handle);
|
||||
|
||||
obj->own = 0;
|
||||
R_INT (pr) = PL_D_AddObject (dict->plitem, key, obj->plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_A_AddObject (progs_t *pr)
|
||||
{
|
||||
R_INT (pr) = PL_A_AddObject (p_plitem (pr, 0),
|
||||
remove_plitem (pr, p_plitem (pr, 1)));
|
||||
int arr_handle = P_INT (pr, 0);
|
||||
int obj_handle = P_INT (pr, 1);
|
||||
bi_plist_t *arr = get_plist (pr, __FUNCTION__, arr_handle);
|
||||
bi_plist_t *obj = get_plist (pr, __FUNCTION__, obj_handle);
|
||||
|
||||
obj->own = 0;
|
||||
R_INT (pr) = PL_A_AddObject (arr->plitem, obj->plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_A_NumObjects (progs_t *pr)
|
||||
{
|
||||
R_INT (pr) = PL_A_NumObjects (p_plitem (pr, 0));
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
|
||||
R_INT (pr) = PL_A_NumObjects (plist->plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_A_InsertObjectAtIndex (progs_t *pr)
|
||||
{
|
||||
R_INT (pr) = PL_A_InsertObjectAtIndex (p_plitem (pr, 0),
|
||||
remove_plitem (pr, p_plitem (pr, 1)),
|
||||
P_INT (pr, 2));
|
||||
int dict_handle = P_INT (pr, 0);
|
||||
int obj_handle = P_INT (pr, 1);
|
||||
bi_plist_t *arr = get_plist (pr, __FUNCTION__, dict_handle);
|
||||
bi_plist_t *obj = get_plist (pr, __FUNCTION__, obj_handle);
|
||||
int ind = P_INT (pr, 2);
|
||||
|
||||
obj->own = 0;
|
||||
R_INT (pr) = PL_A_InsertObjectAtIndex (arr->plitem, obj->plitem, ind);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_Free (progs_t *pr)
|
||||
bi_PL_RemoveObjectAtIndex (progs_t *pr)
|
||||
{
|
||||
PL_Free (remove_plitem (pr, p_plitem (pr, 0)));
|
||||
}
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
int ind = P_INT (pr, 1);
|
||||
plitem_t *plitem = PL_RemoveObjectAtIndex (plist->plitem, ind);
|
||||
|
||||
static void
|
||||
bi_PL_NewArray (progs_t *pr)
|
||||
{
|
||||
return_plitem (pr, record_plitem (pr, PL_NewArray ()));
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_NewData (progs_t *pr)
|
||||
{
|
||||
return_plitem (pr, record_plitem (pr, PL_NewData (P_GPOINTER (pr, 0),
|
||||
P_INT (pr, 1))));
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_NewString (progs_t *pr)
|
||||
{
|
||||
return_plitem (pr, record_plitem (pr, PL_NewString (P_GSTRING (pr, 0))));
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_NewDictionary (progs_t *pr)
|
||||
{
|
||||
return_plitem (pr, record_plitem (pr, PL_NewDictionary ()));
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
plitem_t *plitem = PL_NewDictionary ();
|
||||
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_plist_clear (progs_t *pr, void *data)
|
||||
bi_PL_NewArray (progs_t *pr)
|
||||
{
|
||||
plist_resources_t *res = (plist_resources_t *) data;
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
plitem_t *plitem = PL_NewArray ();
|
||||
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
Hash_FlushTable (res->items);
|
||||
static void
|
||||
bi_PL_NewData (progs_t *pr)
|
||||
{
|
||||
//FIXME not safe
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
plitem_t *plitem = PL_NewData (P_GPOINTER (pr, 0), P_INT (pr, 1));
|
||||
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_NewString (progs_t *pr)
|
||||
{
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
plitem_t *plitem = PL_NewString (P_GSTRING (pr, 0));
|
||||
|
||||
R_INT (pr) = plist_retain (res, plitem);
|
||||
}
|
||||
|
||||
static void
|
||||
bi_PL_Free (progs_t *pr)
|
||||
{
|
||||
plist_resources_t *res = PR_Resources_Find (pr, "plist");
|
||||
int handle = P_INT (pr, 0);
|
||||
bi_plist_t *plist = get_plist (pr, __FUNCTION__, handle);
|
||||
|
||||
if (!plist->own)
|
||||
PR_RunError (pr, "attempt to free unowned plist");
|
||||
|
||||
PL_Free (plist->plitem);
|
||||
|
||||
plist_free_handle (res, plist);
|
||||
}
|
||||
|
||||
static uintptr_t
|
||||
plist_get_hash (void *key, void *unused)
|
||||
{
|
||||
return (uintptr_t) key;
|
||||
bi_plist_t *plist = (bi_plist_t *) key;
|
||||
return (uintptr_t) plist->plitem;
|
||||
}
|
||||
|
||||
static int
|
||||
plist_compare (void *k1, void *k2, void *unused)
|
||||
{
|
||||
return k1 == k2;
|
||||
bi_plist_t *pl1 = (bi_plist_t *) k1;
|
||||
bi_plist_t *pl2 = (bi_plist_t *) k2;
|
||||
return pl1->plitem == pl2->plitem;
|
||||
}
|
||||
|
||||
static builtin_t builtins[] = {
|
||||
|
|
@ -223,6 +408,7 @@ static builtin_t builtins[] = {
|
|||
{"PL_Type", bi_PL_Type, -1},
|
||||
{"PL_String", bi_PL_String, -1},
|
||||
{"PL_ObjectForKey", bi_PL_ObjectForKey, -1},
|
||||
{"PL_RemoveObjectForKey", bi_PL_RemoveObjectForKey, -1},
|
||||
{"PL_ObjectAtIndex", bi_PL_ObjectAtIndex, -1},
|
||||
{"PL_D_AllKeys", bi_PL_D_AllKeys, -1},
|
||||
{"PL_D_NumKeys", bi_PL_D_NumKeys, -1},
|
||||
|
|
@ -230,6 +416,7 @@ static builtin_t builtins[] = {
|
|||
{"PL_A_AddObject", bi_PL_A_AddObject, -1},
|
||||
{"PL_A_NumObjects", bi_PL_A_NumObjects, -1},
|
||||
{"PL_A_InsertObjectAtIndex", bi_PL_A_InsertObjectAtIndex, -1},
|
||||
{"PL_RemoveObjectAtIndex", bi_PL_RemoveObjectAtIndex, -1},
|
||||
{"PL_NewDictionary", bi_PL_NewDictionary, -1},
|
||||
{"PL_NewArray", bi_PL_NewArray, -1},
|
||||
{"PL_NewData", bi_PL_NewData, -1},
|
||||
|
|
@ -242,8 +429,8 @@ void
|
|||
RUA_Plist_Init (progs_t *pr, int secure)
|
||||
{
|
||||
plist_resources_t *res = calloc (1, sizeof (plist_resources_t));
|
||||
res->items = Hash_NewTable (1021, 0, 0, 0);
|
||||
Hash_SetHashCompare (res->items, plist_get_hash, plist_compare);
|
||||
res->plist_tab = Hash_NewTable (1021, 0, 0, 0);
|
||||
Hash_SetHashCompare (res->plist_tab, plist_get_hash, plist_compare);
|
||||
|
||||
PR_Resources_Register (pr, "plist", res, bi_plist_clear);
|
||||
PR_RegisterBuiltins (pr, builtins);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef __ruamoko_plist_h
|
||||
#define __ruamoko_plist_h
|
||||
|
||||
struct plitem_s {integer [2] dummy;};
|
||||
#define PL_TEST(item) (item.dummy[0] || item.dummy[1])
|
||||
struct plitem_s {integer dummy;};
|
||||
#define PL_TEST(item) (item.dummy)
|
||||
typedef struct plitem_s plitem_t;
|
||||
typedef enum {QFDictionary, QFArray, QFBinary, QFString} pltype_t; // possible types
|
||||
|
||||
|
|
@ -11,6 +11,7 @@ typedef enum {QFDictionary, QFArray, QFBinary, QFString} pltype_t; // possible t
|
|||
@extern pltype_t (plitem_t str) PL_Type;
|
||||
@extern string (plitem_t str) PL_String;
|
||||
@extern plitem_t (plitem_t item, string key) PL_ObjectForKey;
|
||||
@extern plitem_t (plitem_t item, string key) PL_RemoveObjectForKey;
|
||||
@extern plitem_t (plitem_t item, integer index) PL_ObjectAtIndex;
|
||||
@extern plitem_t (plitem_t item) PL_D_AllKeys;
|
||||
@extern integer (plitem_t item) PL_D_NumKeys;
|
||||
|
|
@ -18,6 +19,7 @@ typedef enum {QFDictionary, QFArray, QFBinary, QFString} pltype_t; // possible t
|
|||
@extern integer (plitem_t array_item, plitem_t item) PL_A_AddObject;
|
||||
@extern integer (plitem_t item) PL_A_NumObjects;
|
||||
@extern integer (plitem_t array_item, plitem_t item, integer index) PL_A_InsertObjectAtIndex;
|
||||
@extern plitem_t (plitem_t array_item, integer index) PL_RemoveObjectAtIndex;
|
||||
@extern plitem_t () PL_NewDictionary;
|
||||
@extern plitem_t () PL_NewArray;
|
||||
@extern plitem_t (void []data, integer len) PL_NewData;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ string (plitem_t pl) PL_WritePropertyList = #0;
|
|||
pltype_t (plitem_t str) PL_Type = #0;
|
||||
string (plitem_t str) PL_String = #0;
|
||||
plitem_t (plitem_t item, string key) PL_ObjectForKey = #0;
|
||||
plitem_t (plitem_t item, string key) PL_RemoveObjectForKey = #0;
|
||||
plitem_t (plitem_t item, integer index) PL_ObjectAtIndex = #0;
|
||||
plitem_t (plitem_t item) PL_D_AllKeys = #0;
|
||||
integer (plitem_t item) PL_D_NumKeys = #0;
|
||||
|
|
@ -12,6 +13,7 @@ integer (plitem_t dict, string key, plitem_t value) PL_D_AddObject = #0;
|
|||
integer (plitem_t array_item, plitem_t item) PL_A_AddObject = #0;
|
||||
integer (plitem_t item) PL_A_NumObjects = #0;
|
||||
integer (plitem_t array_item, plitem_t item, integer index) PL_A_InsertObjectAtIndex = #0;
|
||||
plitem_t (plitem_t array_item, integer index) PL_RemoveObjectAtIndex = #0;
|
||||
plitem_t () PL_NewDictionary = #0;
|
||||
plitem_t () PL_NewArray = #0;
|
||||
plitem_t (void []data, integer len) PL_NewData = #0;
|
||||
|
|
|
|||
|
|
@ -21,13 +21,21 @@ string read_file (string filename)
|
|||
void test_plist (void)
|
||||
{
|
||||
local string data, l;
|
||||
local plitem_t pl;
|
||||
local plitem_t pl, item, i;
|
||||
|
||||
data = read_file ("/home/bill/.quakeforge.dir");
|
||||
pl = PL_GetPropertyList ("{" + data + "}");
|
||||
l = PL_WritePropertyList (pl);
|
||||
printf ("%s", data);
|
||||
printf ("%s", l);
|
||||
i = PL_ObjectForKey (pl, "QF");
|
||||
item = PL_RemoveObjectForKey (pl, "QF");
|
||||
l = PL_WritePropertyList (item);
|
||||
printf ("%s", l);
|
||||
PL_Free (item);
|
||||
//Because i and item both point to the same plitem, and item has been,
|
||||
//freed, freeing i will generate an error
|
||||
//l = PL_WritePropertyList (i);
|
||||
PL_Free (pl);
|
||||
str_free (data);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue