cake
/
libg1m
Archived
1
0
Fork 0

Miscallaneous modifications.

This commit is contained in:
Thomas Touhey 2017-03-20 02:49:13 +01:00
parent 022e083a50
commit 598a065a65
7 changed files with 18 additions and 4 deletions

8
configure vendored
View File

@ -71,8 +71,8 @@ Build options:
--loglevel=LOGLEVEL library log level [$loglevel]
Installation options:
--noinstall-manpages should not install manpages
--noinstall-devel should not install developement files
--no-manpages should not make and install manpages
--no-devel should not install developement files
Installation directories:
--root=ROOT installation root [$root]
@ -147,8 +147,8 @@ got '$level'"
fi
# then set
loglevel=$level ;;
--noinstall-manpages) install_manpages= ;;
--noinstall-devel) install_devel= ;;
--no-manpages) install_manpages= ;;
--no-devel) install_devel= ;;
--root=*) root="${arg#*=}" ;;
--hprefix=*) hprefix="${arg#*=}" ;;
--prefix=*) prefix="${arg#*=}"; prefix_set=y ;;

View File

@ -48,10 +48,12 @@ static int read_internal(g1m_buffer_t *buffer, uint32_t signature,
/* check type */
if (signature != hd.signature) {
#if LOGLEVEL <= ll_error
const char *a = (char*)&signature, *b = (char*)&hd.signature;
log_error("signature mismatch!");
log_error("expected '%c%c%c%c', got '%c%c%c%c'",
a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
#endif
return (g1m_error_magic);
}

View File

@ -101,6 +101,7 @@ int g1m_decode_std_cp_addin(g1m_t **h, g1m_buffer_t *buffer,
struct _classpad_subheader *cp, uint32_t *check)
{
int err = 0;
(void)std; (void)cp;
/* read the add-in subheader */
DREAD(cphd, c1a_subheader)
@ -165,6 +166,7 @@ int g1m_decode_std_cg_addin(g1m_t **h, g1m_buffer_t *buffer,
struct _prizm_subheader *prizm, uint32_t *check)
{
int err = 0;
(void)std; (void)prizm;
/* read the add-in subheader */
DREAD(cghd, g3a_subheader)

View File

@ -256,6 +256,8 @@ static int eact_decode_line_result(g1m_line_t *handle, uint8_t *buf, size_t size
static int eact_decode_line_stdheading(g1m_line_t *handle, uint8_t *buf,
size_t size)
{
(void)size;
/* log */
log_info("Standard heading raw data is:");
logm_info(buf, size);
@ -282,6 +284,8 @@ static int eact_decode_line_stdheading(g1m_line_t *handle, uint8_t *buf,
static int eact_decode_line_picture(g1m_line_t *handle, uint8_t *buf,
size_t size)
{
(void)size;
/* log */
log_info("Picture raw data is:");
logm_info(buf, size);
@ -319,6 +323,8 @@ static int eact_decode_line_picture(g1m_line_t *handle, uint8_t *buf,
static int eact_decode_line_text(g1m_line_t *handle, uint8_t *buf, size_t size)
{
(void)size;
/* log */
log_info("Text raw data is:");
logm_info(buf, size);

View File

@ -141,6 +141,7 @@ int g1m_decode_std_cg_fkey(g1m_t **h, g1m_buffer_t *buffer,
struct _prizm_subheader *prizm, uint32_t *check)
{
int err = g1m_error_alloc; uint8_t *data = NULL;
(void)std; (void)prizm;
/* read the subheader */
DREAD(lhd, g3l_lang_header)

View File

@ -106,6 +106,7 @@ int g1m_decode_std_cg_lang(g1m_t **h, g1m_buffer_t *buffer,
struct _prizm_subheader *prizm, uint32_t *check)
{
int err = g1m_error_alloc; uint8_t *data = NULL;
(void)std; (void)prizm;
/* read the subheader */
DREAD(lhd, g3l_lang_header)

View File

@ -31,7 +31,9 @@ int g1m_skip(g1m_buffer_t *buffer, size_t size, uint32_t *checksum)
{
uint8_t buf[1024]; int err;
uint32_t add = 0;
#if LOGLEVEL <= ll_error
size_t orig = size;
#endif
while (size) {
/* read that much */