X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-argp.c;h=14ed52d87c67db3230627f8b3ba4934b51e2498c;hb=7181bcb1f4e217aa247ea299ac6a16a670954108;hp=d1f005499de26d45e410402489ab441fdbc4c728;hpb=c0fea97ccf33a4e6b6f9116216b1634663f29474;p=gnulib.git

diff --git a/tests/test-argp.c b/tests/test-argp.c
index d1f005499..14ed52d87 100644
--- a/tests/test-argp.c
+++ b/tests/test-argp.c
@@ -1,20 +1,19 @@
 /* Test suite for argp.
-   Copyright (C) 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc.
    This file is part of the GNUlib Library.
 
-   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/>.  */
 
 #include <config.h>
 
@@ -229,7 +228,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     {
     case ARGP_KEY_INIT:
       for (i = 0; state->root_argp->children[i].argp; i++)
-	state->child_inputs[i] = args;
+        state->child_inputs[i] = args;
       break;
 
     case 't':
@@ -349,7 +348,7 @@ test6(struct argp *argp)
 
 void
 test_optional(struct argp *argp, int argc, char **argv,
-	      struct test_args *args, char *val, char *a)
+              struct test_args *args, char *val, char *a)
 {
   int index;
   if (argp_parse (argp, argc, argv, 0, &index, args))
@@ -360,7 +359,7 @@ test_optional(struct argp *argp, int argc, char **argv,
   if (!val)
     {
       if (args->optional)
-	fail("option processed incorrectly");
+        fail("option processed incorrectly");
     }
   else if (strcmp (args->optional, val))
     fail("option processed incorrectly");
@@ -368,9 +367,9 @@ test_optional(struct argp *argp, int argc, char **argv,
   if (a)
     {
       if (index == argc)
-	fail("expected command line argument not found");
+        fail("expected command line argument not found");
       else if (strcmp(argv[index], a))
-	fail("expected command line argument does not match");
+        fail("expected command line argument does not match");
     }
 }