Use intptr_t instead of long to store a pointer.

[tinc] / lib / getopt.c

diff --git a/lib/getopt.c b/lib/getopt.c
index 5f74dee..b2f88b4 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -85,8 +85,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define getpid() GetCurrentProcessId()
 #endif
 
-#include "gettext.h"
-
 /* This version of `getopt' appears to the caller like standard Unix `getopt'
    but it behaves differently for the user, since it allows the user
    to intersperse the options with the other arguments.
@@ -669,7 +667,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
       if (ambig && !exact)
        {
          if (opterr)
-           fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+           fprintf (stderr, "%s: option `%s' is ambiguous\n",
                     argv[0], argv[optind]);
          nextchar += strlen (nextchar);
          optind++;
@@ -693,12 +691,12 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
                   if (argv[optind - 1][1] == '-')
                    /* --option */
                    fprintf (stderr,
-                    _("%s: option `--%s' doesn't allow an argument\n"),
+                    "%s: option `--%s' doesn't allow an argument\n",
                     argv[0], pfound->name);
                   else
                    /* +option or -option */
                    fprintf (stderr,
-                    _("%s: option `%c%s' doesn't allow an argument\n"),
+                    "%s: option `%c%s' doesn't allow an argument\n",
                     argv[0], argv[optind - 1][0], pfound->name);
 
                  nextchar += strlen (nextchar);
@@ -715,7 +713,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
                {
                  if (opterr)
                    fprintf (stderr,
-                          _("%s: option `%s' requires an argument\n"),
+                          "%s: option `%s' requires an argument\n",
                           argv[0], argv[optind - 1]);
                  nextchar += strlen (nextchar);
                  optopt = pfound->val;
@@ -744,11 +742,11 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
            {
              if (argv[optind][1] == '-')
                /* --option */
-               fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+               fprintf (stderr, "%s: unrecognized option `--%s'\n",
                         argv[0], nextchar);
              else
                /* +option or -option */
-               fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+               fprintf (stderr, "%s: unrecognized option `%c%s'\n",
                         argv[0], argv[optind][0], nextchar);
            }
          nextchar = (char *) "";
@@ -774,10 +772,10 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
          {
            if (posixly_correct)
              /* 1003.2 specifies the format of this message.  */
-             fprintf (stderr, _("%s: illegal option -- %c\n"),
+             fprintf (stderr, "%s: illegal option -- %c\n",
                       argv[0], c);
            else
-             fprintf (stderr, _("%s: invalid option -- %c\n"),
+             fprintf (stderr, "%s: invalid option -- %c\n",
                       argv[0], c);
          }
        optopt = c;
@@ -807,7 +805,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
            if (opterr)
              {
                /* 1003.2 specifies the format of this message.  */
-               fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+               fprintf (stderr, "%s: option requires an argument -- %c\n",
                         argv[0], c);
              }
            optopt = c;
@@ -854,7 +852,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
        if (ambig && !exact)
          {
            if (opterr)
-             fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+             fprintf (stderr, "%s: option `-W %s' is ambiguous\n",
                       argv[0], argv[optind]);
            nextchar += strlen (nextchar);
            optind++;
@@ -872,8 +870,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
                else
                  {
                    if (opterr)
-                     fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
+                     fprintf (stderr,
+                              "%s: option `-W %s' doesn't allow an argument\n",
                               argv[0], pfound->name);
 
                    nextchar += strlen (nextchar);
@@ -888,7 +886,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
                  {
                    if (opterr)
                      fprintf (stderr,
-                              _("%s: option `%s' requires an argument\n"),
+                              "%s: option `%s' requires an argument\n",
                               argv[0], argv[optind - 1]);
                    nextchar += strlen (nextchar);
                    return optstring[0] == ':' ? ':' : '?';
@@ -937,7 +935,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
                  {
                    /* 1003.2 specifies the format of this message.  */
                    fprintf (stderr,
-                          _("%s: option requires an argument -- %c\n"),
+                          "%s: option requires an argument -- %c\n",
                           argv[0], c);
                  }
                optopt = c;