diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-03-31 17:09:53 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-08 16:35:09 +0200 |
| commit | 2e0d23ce7218baab6d08aede3a1269ac475e420d (patch) | |
| tree | a65aef62056665210cf89cf3b5b8c234d5d8cd9f | |
| parent | 72efb1b28da7daba1448def917d28b30014fde27 (diff) | |
serial-parsers: port to use object logging
| -rw-r--r-- | src/mm-port-serial-at.c | 2 | ||||
| -rw-r--r-- | src/mm-port-serial-at.h | 7 | ||||
| -rw-r--r-- | src/mm-serial-parsers.c | 13 | ||||
| -rw-r--r-- | src/mm-serial-parsers.h | 1 |
4 files changed, 13 insertions, 10 deletions
diff --git a/src/mm-port-serial-at.c b/src/mm-port-serial-at.c index 680c9297..c8e4782f 100644 --- a/src/mm-port-serial-at.c +++ b/src/mm-port-serial-at.c @@ -148,7 +148,7 @@ parse_response (MMPortSerial *port, /* Parse it; returns FALSE if there is nothing we can do with this * response yet. */ - if (!self->priv->response_parser_fn (self->priv->response_parser_user_data, string, &inner_error)) { + if (!self->priv->response_parser_fn (self->priv->response_parser_user_data, string, self, &inner_error)) { /* Copy what we got back in the response buffer. */ g_byte_array_append (response, (const guint8 *) string->str, string->len); g_string_free (string, TRUE); diff --git a/src/mm-port-serial-at.h b/src/mm-port-serial-at.h index 8e19409e..f447d144 100644 --- a/src/mm-port-serial-at.h +++ b/src/mm-port-serial-at.h @@ -53,9 +53,10 @@ typedef enum { /*< underscore_name=mm_port_serial_at_flag >*/ MM_PORT_SERIAL_AT_FLAG_GPS_CONTROL = 1 << 3, } MMPortSerialAtFlag; -typedef gboolean (*MMPortSerialAtResponseParserFn) (gpointer user_data, - GString *response, - GError **error); +typedef gboolean (*MMPortSerialAtResponseParserFn) (gpointer user_data, + GString *response, + gpointer log_object, + GError **error); typedef void (*MMPortSerialAtUnsolicitedMsgFn) (MMPortSerialAt *port, GMatchInfo *match_info, diff --git a/src/mm-serial-parsers.c b/src/mm-serial-parsers.c index b7bb3087..62592455 100644 --- a/src/mm-serial-parsers.c +++ b/src/mm-serial-parsers.c @@ -19,7 +19,7 @@ #include "mm-error-helpers.h" #include "mm-serial-parsers.h" -#include "mm-log.h" +#include "mm-log-object.h" /* Clean up the response by removing control characters like <CR><LF> etc */ static void @@ -161,9 +161,10 @@ mm_serial_parser_v1_add_filter (gpointer data, } gboolean -mm_serial_parser_v1_parse (gpointer data, - GString *response, - GError **error) +mm_serial_parser_v1_parse (gpointer data, + GString *response, + gpointer log_object, + GError **error) { MMSerialParserV1 *parser = (MMSerialParserV1 *) data; GMatchInfo *match_info; @@ -188,7 +189,7 @@ mm_serial_parser_v1_parse (gpointer data, response, &local_error)) { g_assert (local_error != NULL); - mm_dbg ("Got response filtered in serial port: %s", local_error->message); + mm_obj_dbg (log_object, "response filtered in serial port: %s", local_error->message); g_propagate_error (error, local_error); response_clean (response); return TRUE; @@ -361,7 +362,7 @@ done: response_clean (response); if (local_error) { - mm_dbg ("Got failure code %d: %s", local_error->code, local_error->message); + mm_obj_dbg (log_object, "operation failure: %d (%s)", local_error->code, local_error->message); g_propagate_error (error, local_error); } diff --git a/src/mm-serial-parsers.h b/src/mm-serial-parsers.h index 641c5e0f..523597b9 100644 --- a/src/mm-serial-parsers.h +++ b/src/mm-serial-parsers.h @@ -24,6 +24,7 @@ void mm_serial_parser_v1_set_custom_regex (gpointer data, GRegex *error); gboolean mm_serial_parser_v1_parse (gpointer parser, GString *response, + gpointer log_object, GError **error); void mm_serial_parser_v1_destroy (gpointer parser); gboolean mm_serial_parser_v1_is_known_error (const GError *error); |