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

Don't ignore errors in the ascii/binary conversions.

Browse Source 
Instead of silently ignoring errors and logging a warning, the
conversion functions now return an error code that can be checked by the
caller.
This commit is contained in:
Jef Driesen 2012-07-06 09:23:18 +02:00
parent 4296f974d0
commit 2a72da59ad
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mares_common.c
View File

@ -54,7 +54,7 @@ mares_common_device_init (mares_common_device_t *device, const device_backend_t
}
static void
static int
mares_common_convert_binary_to_ascii (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize)
{
assert (osize == 2 * isize);
@ -72,10 +72,12 @@ mares_common_convert_binary_to_ascii (const unsigned char input[], unsigned int
unsigned char lsn = input[i] & 0x0F;
output[i * 2 + 1] = ascii[lsn];
}
return 0;
}
static void
static int
mares_common_convert_ascii_to_binary (const unsigned char input[], unsigned int isize, unsigned char output[], unsigned int osize)
{
assert (isize == 2 * osize);
@ -92,13 +94,15 @@ mares_common_convert_ascii_to_binary (const unsigned char input[], unsigned int
else if (ascii >= 'a' && ascii <= 'f')
number = 10 + ascii - 'a';
else
WARNING ("Invalid character.");
return -1; /* Invalid character */
value <<= 4;
value += number;
}
output[i] = value;
}
return 0;
}