Merge recent gnulib changes, and remove some lint.

[chaz/tar] / tests / mksparse.c

diff --git a/tests/mksparse.c b/tests/mksparse.c
index 3a712f78e9d1a17d825d08c483e759df79f4bc62..5fab8d85933ecb332af69cc1e4e06f96aae486c3 100644 (file)
--- a/tests/mksparse.c
+++ b/tests/mksparse.c
@@ -30,8 +30,10 @@ char *progname;
 char *buffer;
 size_t buffer_size;
 
-void
-die (char *fmt, ...)
+static void die (char const *, ...) __attribute__ ((noreturn,
+                                                   format (printf, 1, 2)));
+static void
+die (char const *fmt, ...)
 {
   va_list ap;
 
@@ -40,12 +42,13 @@ die (char *fmt, ...)
   vfprintf (stderr, fmt, ap);
   va_end (ap);
   fprintf (stderr, "\n");
+  exit (1);
 }
 
-void
+static void
 mkhole (int fd, off_t displ)
 {
-  if (displ = lseek (fd, displ, SEEK_CUR) == -1)
+  if (lseek (fd, displ, SEEK_CUR) == -1)
     {
       perror ("lseek");
       exit (1);
@@ -53,11 +56,9 @@ mkhole (int fd, off_t displ)
   ftruncate (fd, lseek (fd, 0, SEEK_CUR));
 }
 
-void
+static void
 mksparse (int fd, off_t displ, char *marks)
 {
-  int i;
-
   for (; *marks; marks++)
     {
       memset (buffer, *marks, buffer_size);
@@ -66,7 +67,7 @@ mksparse (int fd, off_t displ, char *marks)
          perror ("write");
          exit (1);
        }
-      
+
       if (lseek (fd, displ, SEEK_CUR) == -1)
        {
          perror ("lseek");
@@ -75,14 +76,15 @@ mksparse (int fd, off_t displ, char *marks)
     }
 }
 
-void
-usage ()
+static void usage (void) __attribute__ ((noreturn));
+static void
+usage (void)
 {
   printf ("Usage: mksparse filename blocksize disp letters [disp letters...] [disp]\n");
   exit (1);
 }
 
-int
+static int
 xlat_suffix (off_t *vp, char *p)
 {
   if (p[1])
@@ -92,7 +94,7 @@ xlat_suffix (off_t *vp, char *p)
     case 'g':
     case 'G':
       *vp *= 1024;
-      
+
     case 'm':
     case 'M':
       *vp *= 1024;
@@ -107,7 +109,7 @@ xlat_suffix (off_t *vp, char *p)
     }
   return 0;
 }
-    
+
 int
 main (int argc, char **argv)
 {
@@ -115,20 +117,20 @@ main (int argc, char **argv)
   int fd;
   char *p;
   off_t n;
-  
+
   progname = strrchr (argv[0], '/');
   if (progname)
     progname++;
   else
     progname = argv[0];
-  
+
   if (argc < 4)
     usage ();
 
   fd = open (argv[1], O_CREAT|O_TRUNC|O_RDWR, 0644);
   if (fd < 0)
     die ("cannot open %s", argv[1]);
-  
+
   n = strtoul (argv[2], &p, 0);
   if (n <= 0 || (*p && xlat_suffix (&n, p)))
     die ("Invalid buffer size: %s", argv[2]);
@@ -136,11 +138,11 @@ main (int argc, char **argv)
   buffer = malloc (buffer_size);
   if (!buffer)
     die ("Not enough memory");
-  
+
   for (i = 3; i < argc; i += 2)
     {
       off_t displ;
-      
+
       displ = strtoul (argv[i], &p, 0);
       if (displ < 0 || (*p && xlat_suffix (&displ, p)))
        die ("Invalid displacement: %s", argv[i]);
@@ -153,7 +155,7 @@ main (int argc, char **argv)
       else
        mksparse (fd, displ, argv[i+1]);
     }
-      
+
   close(fd);
   return 0;
 }