ICU 56 update step 1

source/tools/gencnval/gencnval.c

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1999-2012, International Business Machines
+*   Copyright (C) 1999-2015 International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  gencnval.c
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 1999nov05
 *   created by: Markus W. Scherer
@@ skipping 113 matching lines @@
 static uint16_t knownAliasesCount = 0;
 /*static uint16_t duplicateKnownAliasesCount = 0;*/
 
 /* Used for storing the lists section that point to aliases */
 static uint16_t aliasLists[MAX_LIST_SIZE];
 static uint16_t aliasListsSize = 0;
 
 /* Were the standard tags declared before the aliases. */
 static UBool standardTagsUsed = FALSE;
 static UBool verbose = FALSE;
+static UBool quiet = FALSE;
 static int lineNum = 1;
 
 static UConverterAliasOptions tableOptions = {
     UCNV_IO_STD_NORMALIZED,
     1 /* containsCnvOptionInfo */
 };
 
 
 /**
  * path to convrtrs.txt
@@ skipping 48 matching lines @@
 #define GET_ALIAS_NUM(str) ((uint16_t)((str - stringStore) >> 1))
 #define GET_TAG_NUM(str) ((uint16_t)((str - tagStore) >> 1))
 
 enum
 {
     HELP1,
     HELP2,
     VERBOSE,
     COPYRIGHT,
     DESTDIR,
-    SOURCEDIR
+    SOURCEDIR,
+    QUIET
 };
 
 static UOption options[]={
     UOPTION_HELP_H,
     UOPTION_HELP_QUESTION_MARK,
     UOPTION_VERBOSE,
     UOPTION_COPYRIGHT,
     UOPTION_DESTDIR,
-    UOPTION_SOURCEDIR
+    UOPTION_SOURCEDIR,
+    UOPTION_QUIET
 };
 
 extern int
 main(int argc, char* argv[]) {
     int i, n;
     char pathBuf[512];
     FileStream *in;
     UNewDataMemory *out;
     UErrorCode errorCode=U_ZERO_ERROR;
 
     U_MAIN_INIT_ARGS(argc, argv);
 
     /* preset then read command line options */
     options[DESTDIR].value=options[SOURCEDIR].value=u_getDataDirectory();
     argc=u_parseArgs(argc, argv, sizeof(options)/sizeof(options[0]), options);
 
     /* error handling, printing usage message */
     if(argc<0) {
         fprintf(stderr,
             "error in command line argument \"%s\"\n",
             argv[-argc]);
     }
     if(argc<0 || options[HELP1].doesOccur || options[HELP2].doesOccur) {
         fprintf(stderr,
             "usage: %s [-options] [convrtrs.txt]\n"
             "\tread convrtrs.txt and create " U_ICUDATA_NAME "_" DATA_NAME "." DATA_TYPE "\n"
             "options:\n"
             "\t-h or -? or --help  this usage text\n"
             "\t-v or --verbose     prints out extra information about the alias table\n"
+            "\t-q or --quiet       do not display warnings and progress\n"
             "\t-c or --copyright   include a copyright notice\n"
             "\t-d or --destdir     destination directory, followed by the path\n"
             "\t-s or --sourcedir   source directory, followed by the path\n",
             argv[0]);
         return argc<0 ? U_ILLEGAL_ARGUMENT_ERROR : U_ZERO_ERROR;
     }
 
     if(options[VERBOSE].doesOccur) {
         verbose = TRUE;
     }
 
+    if(options[QUIET].doesOccur) {
+        quiet = TRUE;
+    }
+
     if(argc>=2) {
         path=argv[1];
     } else {
         path=options[SOURCEDIR].value;
         if(path!=NULL && *path!=0) {
             char *end;
 
             uprv_strcpy(pathBuf, path);
             end = uprv_strchr(pathBuf, 0);
             if(*(end-1)!=U_FILE_SEP_CHAR) {
@@ skipping 656 matching lines @@
             GET_TAG_STR(tags[tag].tag),
             GET_ALIAS_STR(converters[converter].converter));*/
         for (aliasNum = 0; aliasNum < aliasList->aliasCount; aliasNum++) {
             uint16_t value;
 /*            printf("   %s\n",
                 GET_ALIAS_STR(aliasList->aliases[aliasNum]));*/
             if (aliasList->aliases[aliasNum]) {
                 value = aliasList->aliases[aliasNum] + offset;
             } else {
                 value = 0;
-                if (tag != 0) { /* Only show the warning when it's not the leftover tag. */
+                if (tag != 0 && !quiet) { /* Only show the warning when it's not the leftover tag. */
                     fprintf(stderr, "%s: warning: tag %s does not have a default alias for %s\n",
                             path,
                             GET_TAG_STR(tags[tag].tag),
                             GET_ALIAS_STR(converters[converter].converter));
                 }
             }
             aliasLists[aliasListsSize++] = value;
             if (aliasListsSize >= MAX_LIST_SIZE) {
                 fprintf(stderr, "%s: error: Too many alias lists\n", path);
                 exit(U_BUFFER_OVERFLOW_ERROR);
@@ skipping 176 matching lines @@
 
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */