[GNUnet-SVN] r15180 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2011-05-07 09:37:10 +0200 (Sat, 07 May 2011)
New Revision: 15180

Modified:
   gnunet/src/util/getopt.c
Log:
clean up


Modified: gnunet/src/util/getopt.c
===================================================================
--- gnunet/src/util/getopt.c    2011-05-07 07:33:14 UTC (rev 15179)
+++ gnunet/src/util/getopt.c    2011-05-07 07:37:10 UTC (rev 15180)
@@ -506,7 +506,6 @@
 {
   static int __getopt_initialized = 0;
   static int GNopterr = 1;
-  static int GNoptopt = '?';
 
   GNoptarg = NULL;
 
@@ -670,7 +669,6 @@
                      argv[0], argv[GNoptind]);
           nextchar += strlen (nextchar);
           GNoptind++;
-          GNoptopt = 0;
           return '?';
         }
 
@@ -703,8 +701,6 @@
                                  pfound->name);
                     }
                   nextchar += strlen (nextchar);
-
-                  GNoptopt = pfound->val;
                   return '?';
                 }
             }
@@ -723,7 +719,6 @@
                                argv[0], argv[GNoptind - 1]);
                     }
                   nextchar += strlen (nextchar);
-                  GNoptopt = pfound->val;
                   return (optstring[0] == ':') ? ':' : '?';
                 }
             }
@@ -758,7 +753,6 @@
             }
           nextchar = (char *) "";
           GNoptind++;
-          GNoptopt = 0;
           return '?';
         }
     }
@@ -783,7 +777,6 @@
             else
               fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
           }
-        GNoptopt = c;
         return '?';
       }
     /* Convenience. Treat POSIX -W foo same as long option --foo */
@@ -813,7 +806,6 @@
                 fprintf (stderr, _("%s: option requires an argument -- %c\n"),
                          argv[0], c);
               }
-            GNoptopt = c;
             if (optstring[0] == ':')
               c = ':';
             else
@@ -944,7 +936,6 @@
                              _("%s: option requires an argument -- %c\n"),
                              argv[0], c);
                   }
-                GNoptopt = c;
                 if (optstring[0] == ':')
                   c = ':';
                 else