From 1ae7dbe21e474e77e136dd23bd7c56a0dda160c2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 27 Mar 2001 13:29:52 +0000 Subject: [PATCH] Remove unused limit and option. --- ChangeLog | 4 ++++ acconfig.h | 9 +-------- src/ChangeLog | 6 ++++++ src/xgettext.c | 16 ++-------------- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99d494d5e..a1972ebcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-03-25 Bruno Haible + + * acconfig.h (WARN_ID_LEN): Remove macro. + 2001-03-21 Bruno Haible * INSTALL (Particular Systems): Add recommendations for AIX 3. diff --git a/acconfig.h b/acconfig.h index 2de2b9ec5..68847033f 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,5 +1,5 @@ /* Special definitions, processed by autoheader. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation. + Copyright (C) 1995-1998, 2001 Free Software Foundation. Ulrich Drepper , 1995. */ /* Default value for alignment of strings in .mo file. */ @@ -39,13 +39,6 @@ # define INVALID_PATH_CHAR "\1\2\3\4\5\6\7\10\11\12\13\14\15\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37 \177\\:." #endif -/* Length from which starting on warnings about too long strings are given. - Several systems have limits for strings itself, more have problems with - strings in their tools (important here: gencat). 1024 bytes is a - conservative limit. Because many translation let the message size grow - (German translations are always bigger) choose a length < 1024. */ -#define WARN_ID_LEN 900 - /* This is the page width for the message_print function. It should not be set to more than 79 characters (Emacs users will appreciate it). It is used to wrap the msgid and msgstr strings, and also to diff --git a/src/ChangeLog b/src/ChangeLog index bd02633e9..7a494380d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-03-25 Bruno Haible + + * xgettext.c (warn_id_len): Remove unused variable. + (main): Don't set it. 'l' option becomes a nop. + (usage): Remove mention of --string-limits/-l. + 2001-03-23 Bruno Haible * msgcomm.c (main): Don't give an error message if there are "too few" diff --git a/src/xgettext.c b/src/xgettext.c index cdfe29fb9..186b7cd2d 100644 --- a/src/xgettext.c +++ b/src/xgettext.c @@ -105,10 +105,6 @@ static int omit_header; /* String containing name the program is called with. */ const char *program_name; -/* String length from with on warning are given for possible problem - while exceeding tools limits. */ -static size_t warn_id_len; - /* Long options. */ static const struct option long_options[] = { @@ -220,7 +216,6 @@ main (argc, argv) /* Set program name for messages. */ program_name = argv[0]; error_print_progname = error_print; - warn_id_len = WARN_ID_LEN; #ifdef HAVE_SETLOCALE /* Set locale via LC_ALL. */ @@ -295,12 +290,7 @@ main (argc, argv) xgettext_lex_keyword (optarg); break; case 'l': - { - char *endp; - size_t tmp_val = strtoul (optarg, &endp, 0); - if (endp[0] == '\0') - warn_id_len = tmp_val; - } + /* Accepted for backward compatibility with 0.10.35. */ break; case 'L': scanner = language_to_scanner (optarg); @@ -553,13 +543,11 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -j, --join-existing join messages with existing file\n\ -k, --keyword[=WORD] additonal keyword to be looked for (without\n\ WORD means not to use default keywords)\n\ - -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n\ -L, --language=NAME recognise the specified language (C, C++, PO),\n\ otherwise is guessed from file extension\n\ -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n\ -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n\ - --no-location do not write '#: filename:line' lines\n"), - WARN_ID_LEN); + --no-location do not write '#: filename:line' lines\n")); /* xgettext: no-wrap */ fputs (_("\ -n, --add-location generate '#: filename:line' lines (default)\n\ -- 2.47.3