diff --git a/configure b/configure index 1a884ce..9144d46 100755 --- a/configure +++ b/configure @@ -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 ;; diff --git a/src/decode/casemul.c b/src/decode/casemul.c index 0ea9493..f6593b3 100644 --- a/src/decode/casemul.c +++ b/src/decode/casemul.c @@ -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); } diff --git a/src/decode/std/addin.c b/src/decode/std/addin.c index 64a4140..a24c960 100644 --- a/src/decode/std/addin.c +++ b/src/decode/std/addin.c @@ -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) diff --git a/src/decode/std/eact.c b/src/decode/std/eact.c index f63f2c9..c8847d7 100644 --- a/src/decode/std/eact.c +++ b/src/decode/std/eact.c @@ -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); diff --git a/src/decode/std/fkey.c b/src/decode/std/fkey.c index 1aef068..5f2df92 100644 --- a/src/decode/std/fkey.c +++ b/src/decode/std/fkey.c @@ -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) diff --git a/src/decode/std/lang.c b/src/decode/std/lang.c index a8472dc..e1afff6 100644 --- a/src/decode/std/lang.c +++ b/src/decode/std/lang.c @@ -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) diff --git a/src/utils/skip.c b/src/utils/skip.c index 6e17f2b..d385dc2 100644 --- a/src/utils/skip.c +++ b/src/utils/skip.c @@ -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 */