remove glib dependency by provide compatible replacements
This commit is contained in:
@@ -354,8 +354,8 @@ static void parser_context_free(JSONParserContext *ctxt)
|
||||
for (i = 0; i < ctxt->tokens.count; i++) {
|
||||
qobject_decref(ctxt->tokens.buf[i]);
|
||||
}
|
||||
g_free(ctxt->tokens.buf);
|
||||
g_free(ctxt);
|
||||
free(ctxt->tokens.buf);
|
||||
free(ctxt);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -64,5 +64,5 @@ QBool *qobject_to_qbool(const QObject *obj)
|
||||
static void qbool_destroy_obj(QObject *obj)
|
||||
{
|
||||
assert(obj != NULL);
|
||||
g_free(qobject_to_qbool(obj));
|
||||
free(qobject_to_qbool(obj));
|
||||
}
|
||||
|
||||
@@ -432,8 +432,8 @@ static void qentry_destroy(QDictEntry *e)
|
||||
assert(e->value != NULL);
|
||||
|
||||
qobject_decref(e->value);
|
||||
g_free(e->key);
|
||||
g_free(e);
|
||||
free(e->key);
|
||||
free(e);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -474,7 +474,7 @@ static void qdict_destroy_obj(QObject *obj)
|
||||
}
|
||||
}
|
||||
|
||||
g_free(qdict);
|
||||
free(qdict);
|
||||
}
|
||||
|
||||
static void qdict_flatten_qdict(QDict *qdict, QDict *target,
|
||||
@@ -509,7 +509,7 @@ static void qdict_flatten_qlist(QList *qlist, QDict *target, const char *prefix)
|
||||
qdict_put_obj(target, new_key, value);
|
||||
}
|
||||
|
||||
g_free(new_key);
|
||||
free(new_key);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -550,7 +550,7 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
|
||||
delete = true;
|
||||
}
|
||||
|
||||
g_free(new_key);
|
||||
free(new_key);
|
||||
|
||||
if (delete) {
|
||||
qdict_del(qdict, entry->key);
|
||||
|
||||
@@ -64,5 +64,5 @@ QFloat *qobject_to_qfloat(const QObject *obj)
|
||||
static void qfloat_destroy_obj(QObject *obj)
|
||||
{
|
||||
assert(obj != NULL);
|
||||
g_free(qobject_to_qfloat(obj));
|
||||
free(qobject_to_qfloat(obj));
|
||||
}
|
||||
|
||||
@@ -63,5 +63,5 @@ QInt *qobject_to_qint(const QObject *obj)
|
||||
static void qint_destroy_obj(QObject *obj)
|
||||
{
|
||||
assert(obj != NULL);
|
||||
g_free(qobject_to_qint(obj));
|
||||
free(qobject_to_qint(obj));
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@ QObject *qlist_pop(QList *qlist)
|
||||
QTAILQ_REMOVE(&qlist->head, entry, next);
|
||||
|
||||
ret = entry->value;
|
||||
g_free(entry);
|
||||
free(entry);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -163,8 +163,8 @@ static void qlist_destroy_obj(QObject *obj)
|
||||
QTAILQ_FOREACH_SAFE(entry, &qlist->head, next, next_entry) {
|
||||
QTAILQ_REMOVE(&qlist->head, entry, next);
|
||||
qobject_decref(entry->value);
|
||||
g_free(entry);
|
||||
free(entry);
|
||||
}
|
||||
|
||||
g_free(qlist);
|
||||
free(qlist);
|
||||
}
|
||||
|
||||
@@ -144,6 +144,6 @@ static void qstring_destroy_obj(QObject *obj)
|
||||
|
||||
assert(obj != NULL);
|
||||
qs = qobject_to_qstring(obj);
|
||||
g_free(qs->string);
|
||||
g_free(qs);
|
||||
free(qs->string);
|
||||
free(qs);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user