diff options
Diffstat (limited to 'jnlib')
| -rw-r--r-- | jnlib/ChangeLog | 10 | ||||
| -rw-r--r-- | jnlib/argparse.c | 5 | ||||
| -rw-r--r-- | jnlib/dotlock.c | 5 | ||||
| -rw-r--r-- | jnlib/stringhelp.c | 8 | ||||
| -rw-r--r-- | jnlib/t-stringhelp.c | 3 | ||||
| -rw-r--r-- | jnlib/w32-afunix.c | 2 |
6 files changed, 29 insertions, 4 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index c8ea2efa7..5da8927ff 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,13 @@ +2008-10-20 Werner Koch <[email protected]> + + * w32-afunix.c (_w32_sock_connect): Mark ADDRLEN as unused. + + * dotlock.c (release_dotlock): Do not mix declaration and code. + + * stringhelp.c (make_basename): Silent gcc warning about unused arg. + * argparse.c (store_alias): Ditto. + (find_long_option): + 2008-10-15 Werner Koch <[email protected]> * logging.c (do_logv) [W32]: Flush the log stream. diff --git a/jnlib/argparse.c b/jnlib/argparse.c index 120b09eb8..5813b9b82 100644 --- a/jnlib/argparse.c +++ b/jnlib/argparse.c @@ -229,6 +229,9 @@ store_alias( ARGPARSE_ARGS *arg, char *name, char *value ) * and fix the probelms IRIX has with (ALIAS_DEV)arg.. * used as lvalue */ + (void)arg; + (void)name; + (void)value; #if 0 ALIAS_DEF a = jnlib_xmalloc( sizeof *a ); a->name = name; @@ -507,6 +510,8 @@ find_long_option( ARGPARSE_ARGS *arg, int i; size_t n; + (void)arg; + /* Would be better if we can do a binary search, but it is not possible to reorder our option table because we would mess up our help strings - What we can do is: Build a nice option diff --git a/jnlib/dotlock.c b/jnlib/dotlock.c index 66ab258ea..53a43244d 100644 --- a/jnlib/dotlock.c +++ b/jnlib/dotlock.c @@ -516,6 +516,10 @@ make_dotlock ( DOTLOCK h, long timeout ) int release_dotlock( DOTLOCK h ) { +#ifndef HAVE_DOSISH_SYSTEM + int pid, same_node; +#endif + /* To avoid atexit race conditions we first check whether there are any locks left. It might happen that another atexit handler tries to release the lock while the atexit handler of this module @@ -540,7 +544,6 @@ release_dotlock( DOTLOCK h ) return -1; } #else - int pid, same_node; pid = read_lockfile (h, &same_node); if ( pid == -1 ) diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c index 50e869cea..b13d8b001 100644 --- a/jnlib/stringhelp.c +++ b/jnlib/stringhelp.c @@ -237,11 +237,12 @@ length_sans_trailing_ws (const unsigned char *line, size_t len) char * make_basename(const char *filepath, const char *inputpath) { - char *p; - #ifdef __riscos__ return riscos_make_basename(filepath, inputpath); -#endif +#else + char *p; + + (void)inputpath; /* Only required for riscos. */ if ( !(p=strrchr(filepath, '/')) ) #ifdef HAVE_DRIVE_LETTERS @@ -253,6 +254,7 @@ make_basename(const char *filepath, const char *inputpath) } return jnlib_xstrdup(p+1); +#endif } diff --git a/jnlib/t-stringhelp.c b/jnlib/t-stringhelp.c index 12331d241..f6590230e 100644 --- a/jnlib/t-stringhelp.c +++ b/jnlib/t-stringhelp.c @@ -121,6 +121,9 @@ test_compare_filenames (void) int main (int argc, char **argv) { + (void)argc; + (void)argv; + test_percent_escape (); test_compare_filenames (); diff --git a/jnlib/w32-afunix.c b/jnlib/w32-afunix.c index 0b03c74b2..63653941e 100644 --- a/jnlib/w32-afunix.c +++ b/jnlib/w32-afunix.c @@ -103,6 +103,8 @@ _w32_sock_connect (int sockfd, struct sockaddr *addr, int addrlen) unsigned short port; char nonce[16]; int ret; + + (void)addrlen; unaddr = (struct sockaddr_un *)addr; if (read_port_and_nonce (unaddr->sun_path, &port, nonce)) |