diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2023-07-23 10:49:49 +0900 |
|---|---|---|
| committer | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2023-10-03 21:45:12 +0900 |
| commit | 924684fd9f39ddb67d20f771ea1c0a2f636e2cd4 (patch) | |
| tree | e9f81f8dc77a93e92dca1d33359916cc13a68904 | |
| parent | 1d7618ea5abd048dca73b0a5d7008fb96543aeb0 (diff) | |
| download | libhinawa-924684fd9f39ddb67d20f771ea1c0a2f636e2cd4.tar.gz | |
fw_fcp: change signature of FwFcp.command()
The function was defined to return void, while it has an argument for
GLib.Error. In GNOME convention, such function should return gboolean.
This commit change the signature according to the convention.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
| -rw-r--r-- | src/fw_fcp.c | 15 | ||||
| -rw-r--r-- | src/fw_fcp.h | 4 | ||||
| -rw-r--r-- | src/hinawa.map | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/fw_fcp.c b/src/fw_fcp.c index 96aa822..e044cf6 100644 --- a/src/fw_fcp.c +++ b/src/fw_fcp.c @@ -286,19 +286,20 @@ static gboolean complete_command_transaction(HinawaFwFcp *self, const guint8 *cm * @error: A [struct@GLib.Error]. Error can be generated with four domains; Hinoko.FwNodeError and * Hinoko.FwReqError. * - * Transfer command frame for FCP. When receiving response frame for FCP, [signal@FwFcp::responded] + * Transfer command frame for FCP. When receiving response frame for FCP, [signal@FwFcp::responded2] * signal is emitted. * - * Since: 2.1. - * Deprecated: 2.6: Use [method@FwFcp.command_with_tstamp], instead. + * Returns: TRUE if the overall operation finishes successfully, otherwise FALSE. + * + * Since: 3.0. */ -void hinawa_fw_fcp_command(HinawaFwFcp *self, const guint8 *cmd, gsize cmd_size, - guint timeout_ms, GError **error) +gboolean hinawa_fw_fcp_command(HinawaFwFcp *self, const guint8 *cmd, gsize cmd_size, + guint timeout_ms, GError **error) { guint tstamp[2]; // Finish transaction for command frame. - (void)complete_command_transaction(self, cmd, cmd_size, tstamp, timeout_ms, error); + return complete_command_transaction(self, cmd, cmd_size, tstamp, timeout_ms, error); } /** @@ -314,7 +315,7 @@ void hinawa_fw_fcp_command(HinawaFwFcp *self, const guint8 *cmd, gsize cmd_size, * @error: A [struct@GLib.Error]. Error can be generated with four domains; Hinoko.FwNodeError and * Hinoko.FwReqError. * - * Transfer command frame for FCP. When receiving response frame for FCP, [signal@FwFcp::responded] + * Transfer command frame for FCP. When receiving response frame for FCP, [signal@FwFcp::responded2] * signal is emitted. * * Each value of @tstamp is unsigned 16 bit integer including higher 3 bits for three low order bits diff --git a/src/fw_fcp.h b/src/fw_fcp.h index 2a37086..ad80279 100644 --- a/src/fw_fcp.h +++ b/src/fw_fcp.h @@ -56,8 +56,8 @@ void hinawa_fw_fcp_transaction(HinawaFwFcp *self, gboolean hinawa_fw_fcp_bind(HinawaFwFcp *self, HinawaFwNode *node, GError **error); void hinawa_fw_fcp_unbind(HinawaFwFcp *self); -void hinawa_fw_fcp_command(HinawaFwFcp *self, const guint8 *cmd, gsize cmd_size, - guint timeout_ms, GError **error); +gboolean hinawa_fw_fcp_command(HinawaFwFcp *self, const guint8 *cmd, gsize cmd_size, + guint timeout_ms, GError **error); gboolean hinawa_fw_fcp_command_with_tstamp(HinawaFwFcp *self, const guint8 *cmd, gsize cmd_size, guint tstamp[2], guint timeout_ms, GError **error); diff --git a/src/hinawa.map b/src/hinawa.map index 713dc0f..0acbeb7 100644 --- a/src/hinawa.map +++ b/src/hinawa.map @@ -60,7 +60,6 @@ HINAWA_2_1_0 { "hinawa_fw_req_transaction_async"; "hinawa_fw_req_transaction_sync"; - "hinawa_fw_fcp_command"; "hinawa_fw_fcp_avc_transaction"; } HINAWA_2_0_0; @@ -113,4 +112,5 @@ HINAWA_3_0_0 { "hinawa_fw_resp_reserve"; "hinawa_fw_fcp_bind"; + "hinawa_fw_fcp_command"; } HINAWA_2_6_0; |