FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move duplicated code to a common function.

Browse Source
This commit is contained in:
Jef Driesen 2013-05-01 07:38:18 +02:00
parent 59b17858f4
commit 2203163a3a
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/hw_frog.c
View File

@ -80,6 +80,26 @@ static const dc_device_vtable_t hw_frog_device_vtable = {
}; };
static int
hw_frog_strncpy (unsigned char *data, unsigned int size, const char *text)
{
// Check the maximum length.
size_t length = (text ? strlen (text) : 0);
if (length > size) {
return -1;
}
// Copy the text.
if (length)
memcpy (data, text, length);
// Pad with spaces.
memset (data + length, 0x20, size - length);
return 0;
}
static dc_status_t static dc_status_t
hw_frog_transfer (hw_frog_device_t *device, hw_frog_transfer (hw_frog_device_t *device,
dc_event_progress_t *progress, dc_event_progress_t *progress,
@ -498,19 +518,13 @@ hw_frog_device_display (dc_device_t *abstract, const char *text)
if (!ISINSTANCE (abstract)) if (!ISINSTANCE (abstract))
return DC_STATUS_INVALIDARGS; return DC_STATUS_INVALIDARGS;
// Check the maximum length. // Pad the data packet with spaces.
size_t length = (text ? strlen (text) : 0); unsigned char packet[SZ_DISPLAY] = {0};
if (length > SZ_DISPLAY) { if (hw_frog_strncpy (packet, sizeof (packet), text) != 0) {
ERROR (abstract->context, "Invalid parameter specified."); ERROR (abstract->context, "Invalid parameter specified.");
return DC_STATUS_INVALIDARGS; return DC_STATUS_INVALIDARGS;
} }
// Pad the data packet with spaces.
unsigned char packet[SZ_DISPLAY] = {0};
if (length)
memcpy (packet, text, length);
memset (packet + length, 0x20, sizeof (packet) - length);
// Send the command. // Send the command.
dc_status_t rc = hw_frog_transfer (device, NULL, DISPLAY, packet, sizeof (packet), NULL, 0); dc_status_t rc = hw_frog_transfer (device, NULL, DISPLAY, packet, sizeof (packet), NULL, 0);
if (rc != DC_STATUS_SUCCESS) if (rc != DC_STATUS_SUCCESS)
@ -528,19 +542,13 @@ hw_frog_device_customtext (dc_device_t *abstract, const char *text)
if (!ISINSTANCE (abstract)) if (!ISINSTANCE (abstract))
return DC_STATUS_INVALIDARGS; return DC_STATUS_INVALIDARGS;
// Check the maximum length. // Pad the data packet with spaces.
size_t length = (text ? strlen (text) : 0); unsigned char packet[SZ_CUSTOMTEXT] = {0};
if (length > SZ_CUSTOMTEXT) { if (hw_frog_strncpy (packet, sizeof (packet), text) != 0) {
ERROR (abstract->context, "Invalid parameter specified."); ERROR (abstract->context, "Invalid parameter specified.");
return DC_STATUS_INVALIDARGS; return DC_STATUS_INVALIDARGS;
} }
// Pad the data packet with spaces.
unsigned char packet[SZ_CUSTOMTEXT] = {0};
if (length)
memcpy (packet, text, length);
memset (packet + length, 0x20, sizeof (packet) - length);
// Send the command. // Send the command.
dc_status_t rc = hw_frog_transfer (device, NULL, CUSTOMTEXT, packet, sizeof (packet), NULL, 0); dc_status_t rc = hw_frog_transfer (device, NULL, CUSTOMTEXT, packet, sizeof (packet), NULL, 0);
if (rc != DC_STATUS_SUCCESS) if (rc != DC_STATUS_SUCCESS)