diff options
Diffstat (limited to 'libqmi-glib')
-rw-r--r-- | libqmi-glib/qmi-message.c | 2 | ||||
-rw-r--r-- | libqmi-glib/qmi-message.h | 2 | ||||
-rw-r--r-- | libqmi-glib/qmi-utils.c | 74 | ||||
-rw-r--r-- | libqmi-glib/qmi-utils.h | 82 | ||||
-rw-r--r-- | libqmi-glib/test/test-utils.c | 48 |
5 files changed, 104 insertions, 104 deletions
diff --git a/libqmi-glib/qmi-message.c b/libqmi-glib/qmi-message.c index c693d2e..e0484d2 100644 --- a/libqmi-glib/qmi-message.c +++ b/libqmi-glib/qmi-message.c @@ -464,7 +464,7 @@ gboolean qmi_message_tlv_get (QmiMessage *self, guint8 type, guint16 *length, - guint8 **value, + const guint8 **value, GError **error) { struct tlv *tlv; diff --git a/libqmi-glib/qmi-message.h b/libqmi-glib/qmi-message.h index 6bcac8c..6dba715 100644 --- a/libqmi-glib/qmi-message.h +++ b/libqmi-glib/qmi-message.h @@ -59,7 +59,7 @@ void qmi_message_tlv_foreach (QmiMessage *self, gboolean qmi_message_tlv_get (QmiMessage *self, guint8 type, guint16 *length, - guint8 **value, + const guint8 **value, GError **error); gboolean qmi_message_tlv_add (QmiMessage *self, diff --git a/libqmi-glib/qmi-utils.c b/libqmi-glib/qmi-utils.c index 4f0b292..5b3ddf8 100644 --- a/libqmi-glib/qmi-utils.c +++ b/libqmi-glib/qmi-utils.c @@ -62,9 +62,9 @@ qmi_utils_str_hex (gconstpointer mem, } void -qmi_utils_read_guint8_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint8 *out) +qmi_utils_read_guint8_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint8 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -78,9 +78,9 @@ qmi_utils_read_guint8_from_buffer (guint8 **buffer, } void -qmi_utils_read_gint8_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint8 *out) +qmi_utils_read_gint8_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint8 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -94,9 +94,9 @@ qmi_utils_read_gint8_from_buffer (guint8 **buffer, } void -qmi_utils_read_guint16_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint16 *out) +qmi_utils_read_guint16_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint16 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -110,9 +110,9 @@ qmi_utils_read_guint16_from_buffer (guint8 **buffer, } void -qmi_utils_read_gint16_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint16 *out) +qmi_utils_read_gint16_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint16 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -126,9 +126,9 @@ qmi_utils_read_gint16_from_buffer (guint8 **buffer, } void -qmi_utils_read_guint32_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint32 *out) +qmi_utils_read_guint32_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint32 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -142,9 +142,9 @@ qmi_utils_read_guint32_from_buffer (guint8 **buffer, } void -qmi_utils_read_gint32_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint32 *out) +qmi_utils_read_gint32_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint32 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -158,9 +158,9 @@ qmi_utils_read_gint32_from_buffer (guint8 **buffer, } void -qmi_utils_read_guint64_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint64 *out) +qmi_utils_read_guint64_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint64 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -174,9 +174,9 @@ qmi_utils_read_guint64_from_buffer (guint8 **buffer, } void -qmi_utils_read_gint64_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint64 *out) +qmi_utils_read_gint64_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint64 *out) { g_assert (out != NULL); g_assert (buffer != NULL); @@ -190,10 +190,10 @@ qmi_utils_read_gint64_from_buffer (guint8 **buffer, } void -qmi_utils_read_sized_guint_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint n_bytes, - guint64 *out) +qmi_utils_read_sized_guint_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint n_bytes, + guint64 *out) { guint64 tmp = 0; @@ -358,11 +358,11 @@ qmi_utils_write_sized_guint_to_buffer (guint8 **buffer, } void -qmi_utils_read_string_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint8 length_prefix_size, - guint16 max_size, - gchar **out) +qmi_utils_read_string_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint8 length_prefix_size, + guint16 max_size, + gchar **out) { guint16 string_length; guint16 valid_string_length; @@ -409,10 +409,10 @@ qmi_utils_read_string_from_buffer (guint8 **buffer, } void -qmi_utils_read_fixed_size_string_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint16 fixed_size, - gchar *out) +qmi_utils_read_fixed_size_string_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint16 fixed_size, + gchar *out) { g_assert (out != NULL); g_assert (buffer != NULL); diff --git a/libqmi-glib/qmi-utils.h b/libqmi-glib/qmi-utils.h index 1e7671f..87d69dd 100644 --- a/libqmi-glib/qmi-utils.h +++ b/libqmi-glib/qmi-utils.h @@ -36,38 +36,38 @@ gchar *qmi_utils_str_hex (gconstpointer mem, /* Reading/Writing integer variables */ -void qmi_utils_read_guint8_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint8 *out); -void qmi_utils_read_gint8_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint8 *out); - -void qmi_utils_read_guint16_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint16 *out); -void qmi_utils_read_gint16_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint16 *out); - -void qmi_utils_read_guint32_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint32 *out); -void qmi_utils_read_gint32_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint32 *out); - -void qmi_utils_read_guint64_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint64 *out); -void qmi_utils_read_gint64_from_buffer (guint8 **buffer, - guint16 *buffer_size, - gint64 *out); - -void qmi_utils_read_sized_guint_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint n_bytes, - guint64 *out); +void qmi_utils_read_guint8_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint8 *out); +void qmi_utils_read_gint8_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint8 *out); + +void qmi_utils_read_guint16_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint16 *out); +void qmi_utils_read_gint16_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint16 *out); + +void qmi_utils_read_guint32_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint32 *out); +void qmi_utils_read_gint32_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint32 *out); + +void qmi_utils_read_guint64_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint64 *out); +void qmi_utils_read_gint64_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + gint64 *out); + +void qmi_utils_read_sized_guint_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint n_bytes, + guint64 *out); void qmi_utils_write_guint8_to_buffer (guint8 **buffer, guint16 *buffer_size, @@ -104,20 +104,20 @@ void qmi_utils_write_sized_guint_to_buffer (guint8 **buffer, /* Reading/Writing string variables */ -void qmi_utils_read_string_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint8 length_prefix_size, - guint16 max_size, - gchar **out); +void qmi_utils_read_string_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint8 length_prefix_size, + guint16 max_size, + gchar **out); void qmi_utils_write_string_to_buffer (guint8 **buffer, guint16 *buffer_size, guint8 length_prefix_size, const gchar *in); -void qmi_utils_read_fixed_size_string_from_buffer (guint8 **buffer, - guint16 *buffer_size, - guint16 fixed_size, - gchar *out); +void qmi_utils_read_fixed_size_string_from_buffer (const guint8 **buffer, + guint16 *buffer_size, + guint16 fixed_size, + gchar *out); void qmi_utils_write_fixed_size_string_to_buffer (guint8 **buffer, guint16 *buffer_size, guint16 fixed_size, diff --git a/libqmi-glib/test/test-utils.c b/libqmi-glib/test/test-utils.c index d64ae04..e328642 100644 --- a/libqmi-glib/test/test-utils.c +++ b/libqmi-glib/test/test-utils.c @@ -20,13 +20,13 @@ static void test_utils_uint8 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; guint8 out_buffer[8] = { 0 }; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -49,13 +49,13 @@ test_utils_uint8 (void) static void test_utils_int8 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; guint8 out_buffer[8] = { 0 }; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -78,17 +78,17 @@ test_utils_int8 (void) static void test_utils_uint16 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; - static guint16 values[4] = { + static const guint16 values[4] = { 0x500F, 0xE2EB, 0x00B6, 0x0000 }; guint8 out_buffer[8] = { 0 }; guint i; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -115,17 +115,17 @@ test_utils_uint16 (void) static void test_utils_int16 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; - static gint16 values[4] = { + static const gint16 values[4] = { 0x500F, 0xE2EB, 0x00B6, 0x0000 }; guint8 out_buffer[8] = { 0 }; guint i; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -152,17 +152,17 @@ test_utils_int16 (void) static void test_utils_uint32 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; - static guint32 values[2] = { + static const guint32 values[2] = { 0xE2EB500F, 0x000000B6 }; guint8 out_buffer[8] = { 0 }; guint i; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -189,17 +189,17 @@ test_utils_uint32 (void) static void test_utils_int32 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; - static gint32 values[2] = { + static const gint32 values[2] = { 0xE2EB500F, 0x000000B6 }; guint8 out_buffer[8] = { 0 }; guint i; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -226,17 +226,17 @@ test_utils_int32 (void) static void test_utils_uint64 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; - static guint64 values[1] = { + static const guint64 values[1] = { 0x000000B6E2EB500FULL }; guint8 out_buffer[8] = { 0 }; guint i; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -263,17 +263,17 @@ test_utils_uint64 (void) static void test_utils_int64 (void) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; - static gint64 values[1] = { + static const gint64 values[1] = { 0x000000B6E2EB500FLL }; guint8 out_buffer[8] = { 0 }; guint i; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; @@ -300,7 +300,7 @@ test_utils_int64 (void) static void common_test_utils_uint_sized (guint n_bytes) { - static guint8 in_buffer[8] = { + static const guint8 in_buffer[8] = { 0x0F, 0x50, 0xEB, 0xE2, 0xB6, 0x00, 0x00, 0x00 }; guint64 value = 0x000000B6E2EB500FULL; @@ -310,7 +310,7 @@ common_test_utils_uint_sized (guint n_bytes) guint64 tmp; guint i; guint16 in_buffer_size; - guint8 *in_buffer_walker; + const guint8 *in_buffer_walker; guint16 out_buffer_size; guint8 *out_buffer_walker; |