X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-dirname.c;h=44898dd9850ecda98d6299e57dd60336eba53b03;hb=279193baa28766dc01c1d1f7605841cd420f6410;hp=eace24e87e201b76e5d05640e307c905cebb265b;hpb=1e4ece4ab9850fbfa88c9ec43ea518c7bc266792;p=gnulib.git

diff --git a/tests/test-dirname.c b/tests/test-dirname.c
index eace24e87..44898dd98 100644
--- a/tests/test-dirname.c
+++ b/tests/test-dirname.c
@@ -1,23 +1,20 @@
 /* Test the gnulib dirname module.
    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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 Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 
@@ -154,8 +151,9 @@ main ()
 		 || (dirlen + 1 == strlen (dir) && dir[dirlen] == '.'))))
 	{
 	  ok = false;
-	  printf ("dir_name `%s': got `%s' len %d, expected `%s' len %d\n",
-		  t->name, dir, dirlen, t->dir, strlen (t->dir));
+	  printf ("dir_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+		  t->name, dir, dirlen,
+		  t->dir, (unsigned long) strlen (t->dir));
 	}
       if (strcmp (last, t->last))
 	{
@@ -169,8 +167,9 @@ main ()
 		     && ISSLASH (base[baselen])))))
 	{
 	  ok = false;
-	  printf ("base_name `%s': got `%s' len %d, expected `%s' len %d\n",
-		  t->name, base, baselen, t->base, strlen (t->base));
+	  printf ("base_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+		  t->name, base, baselen,
+		  t->base, (unsigned long) strlen (t->base));
 	}
       if (strcmp (stripped, t->stripped) || modified != t->modified)
 	{