Hi Martin,
On 07/03/2019 01:09 PM, Martin Hundebøll wrote:
---
plugins/quectel.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/plugins/quectel.c b/plugins/quectel.c
index 83197991..3c6b9d9f 100644
--- a/plugins/quectel.c
+++ b/plugins/quectel.c
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <stdbool.h>
-#include <glib.h>
+#include <ell/ell.h>
#include <gatchat.h>
#include <gattty.h>
@@ -68,9 +68,7 @@ static int quectel_probe(struct ofono_modem *modem)
DBG("%p", modem);
- data = g_try_new0(struct quectel_data, 1);
- if (data == NULL)
- return -ENOMEM;
+ data = l_new(struct quectel_data, 1);
ofono_modem_set_data(modem, data);
@@ -89,7 +87,7 @@ static void quectel_remove(struct ofono_modem *modem)
ofono_modem_set_data(modem, NULL);
g_at_chat_unref(data->aux);
g_at_chat_unref(data->modem);
- g_free(data);
+ l_free(data);
}
static void cpin_notify(GAtResult *result, void *user_data)
@@ -281,7 +279,7 @@ static void quectel_set_online(struct ofono_modem *modem,
int online,
CALLBACK_WITH_FAILURE(cb, cbd->data);
- g_free(cbd);
+ l_free(cbd);
While this is pretty much fine in the end since everything just maps to
free, cb_data_new uses g_new0, so we should keep g_free until that is
converted.
}
static void quectel_pre_sim(struct ofono_modem *modem)
Regards,
-Denis
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
