mer-hybris/libgbinder
1
0
Fork 0
mirror of https://github.com/mer-hybris/libgbinder synced 2025-11-04 06:44:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gbinder] Housekeeping

Browse Source
This commit is contained in:
Slava Monich
2025-09-17 03:58:09 +03:00
parent 0ac9ea19f4
commit 0b52f117a1
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gbinder_rpc_protocol.c
View File

@@ -1,7 +1,7 @@
/*
* Copyright (C) 2018-2022 Jolla Ltd.
* Copyright (C) 2025 Jolla Mobile Ltd.
* Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2018-2022 Jolla Ltd.
* Copyright (C) 2018-2025 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -123,7 +123,8 @@ gbinder_rpc_protocol_aidl_write_fmq_descriptor(
}
gbinder_writer_append_int32(writer, desc->data.fds->num_ints);
for (i = 0; i < desc->data.fds->num_ints; i++) {
gbinder_writer_append_int32(writer, gbinder_fds_get_fd(desc->data.fds, desc->data.fds->num_fds + i));
gbinder_writer_append_int32(writer, gbinder_fds_get_fd(desc->data.fds,
desc->data.fds->num_fds + i));
}
gbinder_writer_append_parcelable_finish(writer, size_offset);
@@ -393,6 +394,7 @@ gbinder_rpc_protocol_hidl_write_fmq_descriptor(
GBinderFds* fds = gutil_memdup(desc->data.fds, fds_total);
mqdesc->data.fds = fds;
gbinder_writer_add_cleanup(writer, g_free, mqdesc);
gbinder_writer_add_cleanup(writer, g_free, fds);
/* Fill in the grantor vector descriptor */
@@ -402,7 +404,6 @@ gbinder_rpc_protocol_hidl_write_fmq_descriptor(
mqdesc->grantors.owns_buffer = TRUE;
gbinder_writer_add_cleanup(writer, g_free, vec_buf);
}
gbinder_writer_add_cleanup(writer, g_free, mqdesc);
/* Write the FMQ descriptor object */
parent.index = gbinder_writer_append_buffer_object(writer,

8
src/gbinder_writer.c
View File

@@ -1,7 +1,7 @@
/*
* Copyright (C) 2018-2024 Jolla Ltd.
* Copyright (C) 2025 Jolla Mobile Ltd.
* Copyright (C) 2018-2024 Slava Monich <slava@monich.com>
* Copyright (C) 2018-2024 Jolla Ltd.
* Copyright (C) 2018-2025 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -994,8 +994,8 @@ gbinder_writer_append_parcelable_start(
if (has_data) {
/* Non-null */
gbinder_writer_data_append_int32(data, 1);
size_offset = data->bytes->len;
/*
* Write the dummy parcelable size which is later fixed using
* gbinder_writer_data_append_parcelable_finish.
@@ -1007,7 +1007,7 @@ gbinder_writer_append_parcelable_start(
}
return size_offset;
}
}
return -1;
}

10
src/gbinder_writer_p.h
View File

@@ -1,7 +1,7 @@
/*
* Copyright (C) 2018-2022 Jolla Ltd.
* Copyright (C) 2025 Jolla Mobile Ltd.
* Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2018-2022 Jolla Ltd.
* Copyright (C) 2018-2025 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -181,12 +181,14 @@ gbinder_writer_data_append_fd(
gssize
gbinder_writer_append_parcelable_start(
GBinderWriter* writer,
gboolean has_data);
gboolean has_data)
GBINDER_INTERNAL;
void
gbinder_writer_append_parcelable_finish(
GBinderWriter* writer,
gssize offset);
gssize offset)
GBINDER_INTERNAL;
#endif /* GBINDER_WRITER_PRIVATE_H */

10
unit/unit_writer/unit_writer.c
View File

@@ -1,7 +1,7 @@
/*
* Copyright (C) 2018-2024 Slava Monich <slava@monich.com>
* Copyright (C) 2018-2022 Jolla Ltd.
* Copyright (C) 2025 Jolla Mobile Ltd.
* Copyright (C) 2018-2025 Slava Monich <slava@monich.com>
* Copyright (C) 2018-2022 Jolla Ltd.
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -92,7 +92,8 @@ static
GBinderLocalRequest*
test_local_request_new_64_hidl()
{
return test_local_request_new_with_io_dev(&gbinder_io_64, GBINDER_DEFAULT_HWBINDER);
return test_local_request_new_with_io_dev(&gbinder_io_64,
GBINDER_DEFAULT_HWBINDER);
}
/*==========================================================================*
@@ -1657,7 +1658,8 @@ int main(int argc, char* argv[])
} else {
close(test_fd);
g_test_add_func(TEST_("fmq_descriptor"), test_fmq_descriptor);
g_test_add_func(TEST_("fmq_descriptor_aidl"), test_fmq_descriptor_aidl);
g_test_add_func(TEST_("fmq_descriptor_aidl"),
test_fmq_descriptor_aidl);
}
}
#endif /* GBINDER_FMQ_SUPPORTED */