tar: pacify GCC 5.1 -Wformat-signedness

[chaz/tar] / lib / wordsplit.c

diff --git a/lib/wordsplit.c b/lib/wordsplit.c
index bd5d59d4d95bbb1283fa55f12ec6a8cdb5d3f02c..69db2e0335e9b57c1710d2669dec043c42cc2b20 100644 (file)
--- a/lib/wordsplit.c
+++ b/lib/wordsplit.c
@@ -1,5 +1,5 @@
 /* wordsplit - a word splitter
-   Copyright (C) 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -61,7 +61,7 @@ _wsplt_alloc_die (struct wordsplit *wsp)
   abort ();
 }
 
-static void
+static void __WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2))
 _wsplt_error (const char *fmt, ...)
 {
   va_list ap;
@@ -221,7 +221,7 @@ struct wordsplit_node
 {
   struct wordsplit_node *prev; /* Previous element */
   struct wordsplit_node *next; /* Next element */
-  int flags;                   /* Node flags */
+  unsigned flags;              /* Node flags */
   union
   {
     struct
@@ -795,7 +795,10 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
       else
        value = "";
     }
+
   /* FIXME: handle defstr */
+  (void) defstr;
+
   if (value)
     {
       if (flg & _WSNF_QUOTE)
@@ -1461,7 +1464,7 @@ wordsplit_process_list (struct wordsplit *wsp, size_t start)
 }
 
 int
-wordsplit_len (const char *command, size_t length, struct wordsplit *wsp, 
+wordsplit_len (const char *command, size_t length, struct wordsplit *wsp,
                int flags)
 {
   int rc;