diff options
Diffstat (limited to 'src/util/getopt.c')
-rw-r--r-- | src/util/getopt.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/util/getopt.c b/src/util/getopt.c index 048f52ee0..678e2a61f 100644 --- a/src/util/getopt.c +++ b/src/util/getopt.c | |||
@@ -563,7 +563,7 @@ GN_getopt_internal (int argc, | |||
563 | if (ambig && ! exact) | 563 | if (ambig && ! exact) |
564 | { | 564 | { |
565 | if (GNopterr) | 565 | if (GNopterr) |
566 | FPRINTF (stderr, | 566 | fprintf (stderr, |
567 | _ ("%s: option `%s' is ambiguous\n"), | 567 | _ ("%s: option `%s' is ambiguous\n"), |
568 | argv[0], | 568 | argv[0], |
569 | argv[GNoptind]); | 569 | argv[GNoptind]); |
@@ -588,13 +588,13 @@ GN_getopt_internal (int argc, | |||
588 | { | 588 | { |
589 | if (argv[GNoptind - 1][1] == '-') | 589 | if (argv[GNoptind - 1][1] == '-') |
590 | /* --option */ | 590 | /* --option */ |
591 | FPRINTF (stderr, | 591 | fprintf (stderr, |
592 | _ ("%s: option `--%s' does not allow an argument\n"), | 592 | _ ("%s: option `--%s' does not allow an argument\n"), |
593 | argv[0], | 593 | argv[0], |
594 | pfound->name); | 594 | pfound->name); |
595 | else | 595 | else |
596 | /* +option or -option */ | 596 | /* +option or -option */ |
597 | FPRINTF (stderr, | 597 | fprintf (stderr, |
598 | _ ("%s: option `%c%s' does not allow an argument\n"), | 598 | _ ("%s: option `%c%s' does not allow an argument\n"), |
599 | argv[0], | 599 | argv[0], |
600 | argv[GNoptind - 1][0], | 600 | argv[GNoptind - 1][0], |
@@ -614,7 +614,7 @@ GN_getopt_internal (int argc, | |||
614 | { | 614 | { |
615 | if (GNopterr) | 615 | if (GNopterr) |
616 | { | 616 | { |
617 | FPRINTF (stderr, | 617 | fprintf (stderr, |
618 | _ ("%s: option `%s' requires an argument\n"), | 618 | _ ("%s: option `%s' requires an argument\n"), |
619 | argv[0], | 619 | argv[0], |
620 | argv[GNoptind - 1]); | 620 | argv[GNoptind - 1]); |
@@ -645,13 +645,13 @@ GN_getopt_internal (int argc, | |||
645 | { | 645 | { |
646 | if (argv[GNoptind][1] == '-') | 646 | if (argv[GNoptind][1] == '-') |
647 | /* --option */ | 647 | /* --option */ |
648 | FPRINTF (stderr, | 648 | fprintf (stderr, |
649 | _ ("%s: unrecognized option `--%s'\n"), | 649 | _ ("%s: unrecognized option `--%s'\n"), |
650 | argv[0], | 650 | argv[0], |
651 | nextchar); | 651 | nextchar); |
652 | else | 652 | else |
653 | /* +option or -option */ | 653 | /* +option or -option */ |
654 | FPRINTF (stderr, | 654 | fprintf (stderr, |
655 | _ ("%s: unrecognized option `%c%s'\n"), | 655 | _ ("%s: unrecognized option `%c%s'\n"), |
656 | argv[0], | 656 | argv[0], |
657 | argv[GNoptind][0], | 657 | argv[GNoptind][0], |
@@ -679,9 +679,9 @@ GN_getopt_internal (int argc, | |||
679 | { | 679 | { |
680 | if (posixly_correct) | 680 | if (posixly_correct) |
681 | /* 1003.2 specifies the format of this message. */ | 681 | /* 1003.2 specifies the format of this message. */ |
682 | FPRINTF (stderr, _ ("%s: illegal option -- %c\n"), argv[0], c); | 682 | fprintf (stderr, _ ("%s: illegal option -- %c\n"), argv[0], c); |
683 | else | 683 | else |
684 | FPRINTF (stderr, _ ("%s: invalid option -- %c\n"), argv[0], c); | 684 | fprintf (stderr, _ ("%s: invalid option -- %c\n"), argv[0], c); |
685 | } | 685 | } |
686 | return '?'; | 686 | return '?'; |
687 | } | 687 | } |
@@ -709,7 +709,7 @@ GN_getopt_internal (int argc, | |||
709 | if (GNopterr) | 709 | if (GNopterr) |
710 | { | 710 | { |
711 | /* 1003.2 specifies the format of this message. */ | 711 | /* 1003.2 specifies the format of this message. */ |
712 | FPRINTF (stderr, | 712 | fprintf (stderr, |
713 | _ ("%s: option requires an argument -- %c\n"), | 713 | _ ("%s: option requires an argument -- %c\n"), |
714 | argv[0], | 714 | argv[0], |
715 | c); | 715 | c); |
@@ -759,7 +759,7 @@ GN_getopt_internal (int argc, | |||
759 | if (ambig && ! exact) | 759 | if (ambig && ! exact) |
760 | { | 760 | { |
761 | if (GNopterr) | 761 | if (GNopterr) |
762 | FPRINTF (stderr, | 762 | fprintf (stderr, |
763 | _ ("%s: option `-W %s' is ambiguous\n"), | 763 | _ ("%s: option `-W %s' is ambiguous\n"), |
764 | argv[0], | 764 | argv[0], |
765 | argv[GNoptind]); | 765 | argv[GNoptind]); |
@@ -779,7 +779,7 @@ GN_getopt_internal (int argc, | |||
779 | else | 779 | else |
780 | { | 780 | { |
781 | if (GNopterr) | 781 | if (GNopterr) |
782 | FPRINTF (stderr, | 782 | fprintf (stderr, |
783 | _ ("%s: option `-W %s' does not allow an argument\n"), | 783 | _ ("%s: option `-W %s' does not allow an argument\n"), |
784 | argv[0], | 784 | argv[0], |
785 | pfound->name); | 785 | pfound->name); |
@@ -795,7 +795,7 @@ GN_getopt_internal (int argc, | |||
795 | else | 795 | else |
796 | { | 796 | { |
797 | if (GNopterr) | 797 | if (GNopterr) |
798 | FPRINTF (stderr, | 798 | fprintf (stderr, |
799 | _ ("%s: option `%s' requires an argument\n"), | 799 | _ ("%s: option `%s' requires an argument\n"), |
800 | argv[0], | 800 | argv[0], |
801 | argv[GNoptind - 1]); | 801 | argv[GNoptind - 1]); |
@@ -845,7 +845,7 @@ GN_getopt_internal (int argc, | |||
845 | if (GNopterr) | 845 | if (GNopterr) |
846 | { | 846 | { |
847 | /* 1003.2 specifies the format of this message. */ | 847 | /* 1003.2 specifies the format of this message. */ |
848 | FPRINTF (stderr, | 848 | fprintf (stderr, |
849 | _ ("%s: option requires an argument -- %c\n"), | 849 | _ ("%s: option requires an argument -- %c\n"), |
850 | argv[0], | 850 | argv[0], |
851 | c); | 851 | c); |
@@ -972,7 +972,7 @@ GNUNET_GETOPT_run (const char *binaryOptions, | |||
972 | } | 972 | } |
973 | if (i == count) | 973 | if (i == count) |
974 | { | 974 | { |
975 | FPRINTF (stderr, _ ("Use %s to get a list of options.\n"), "--help"); | 975 | fprintf (stderr, _ ("Use %s to get a list of options.\n"), "--help"); |
976 | cont = GNUNET_SYSERR; | 976 | cont = GNUNET_SYSERR; |
977 | } | 977 | } |
978 | } | 978 | } |
@@ -983,7 +983,7 @@ GNUNET_GETOPT_run (const char *binaryOptions, | |||
983 | is the only option that was provided */ | 983 | is the only option that was provided */ |
984 | if ((NULL != have_exclusive) && (optmatch > 1)) | 984 | if ((NULL != have_exclusive) && (optmatch > 1)) |
985 | { | 985 | { |
986 | FPRINTF (stderr, | 986 | fprintf (stderr, |
987 | _ ("Option `%s' can't be used with other options.\n"), | 987 | _ ("Option `%s' can't be used with other options.\n"), |
988 | have_exclusive); | 988 | have_exclusive); |
989 | cont = GNUNET_SYSERR; | 989 | cont = GNUNET_SYSERR; |
@@ -995,7 +995,7 @@ GNUNET_GETOPT_run (const char *binaryOptions, | |||
995 | { | 995 | { |
996 | if ((0 == seen[count]) && (allOptions[count].option_mandatory)) | 996 | if ((0 == seen[count]) && (allOptions[count].option_mandatory)) |
997 | { | 997 | { |
998 | FPRINTF (stderr, | 998 | fprintf (stderr, |
999 | _ ("Missing mandatory option `%s'.\n"), | 999 | _ ("Missing mandatory option `%s'.\n"), |
1000 | allOptions[count].name); | 1000 | allOptions[count].name); |
1001 | cont = GNUNET_SYSERR; | 1001 | cont = GNUNET_SYSERR; |