AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1220 call initMsg() before printing error msg.

Browse Source 
X-SVN-Rev: 6724
This commit is contained in:
Yves Arrouye 2001-11-10 01:53:45 +00:00
parent b4bc10f1d7
commit 51c6835601
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
icu4c/source/extra/uconv/uconv.cpp
View File

@ -49,8 +49,35 @@
static const size_t buffsize = 4096;
static UResourceBundle *gBundle = 0;
static void initMsg(const char *pname) {
static int ps = 0;
if (!ps) {
char dataPath[500];
UErrorCode err = U_ZERO_ERROR;
ps = 1;
/* Get messages. */
strcpy(dataPath, u_getDataDirectory());
strcat(dataPath, "uconvmsg");
gBundle = u_wmsg_setPath(dataPath, &err);
if(U_FAILURE(err))
{
fprintf(stderr, "%s: warning: couldn't open resource bundle %s: %s\n",
pname,
dataPath,
u_errorName(err));
}
}
}
// Print all available codepage converters
static void printAllConverters()
static void printAllConverters(const char *pname)
{
UErrorCode err = U_ZERO_ERROR;
int32_t num;
@ -61,6 +88,7 @@ static void printAllConverters()
const char* const* convtable = UnicodeConverter::getAvailableNames(num, err);
if (U_FAILURE(err))
{
initMsg(pname);
u_wmsg("cantGetNames", u_wmsg_errorName(err));
return;
}
@ -247,33 +275,6 @@ static UBool convertFile(const char* fromcpage,
return ret;
}
static UResourceBundle *gBundle = 0;
static void initMsg(const char *pname) {
static int ps = 0;
if (!ps) {
char dataPath[500];
UErrorCode err = U_ZERO_ERROR;
ps = 1;
/* Get messages. */
strcpy(dataPath, u_getDataDirectory());
strcat(dataPath, "uconvmsg");
gBundle = u_wmsg_setPath(dataPath, &err);
if(U_FAILURE(err))
{
fprintf(stderr, "%s: warning: couldn't open resource bundle %s: %s\n",
pname,
dataPath,
u_errorName(err));
}
}
}
static void usage(const char *pname, int ecode)
{
const UChar *msg;
@ -327,7 +328,7 @@ int main(int argc, char** argv)
}
else if (strcmp("-l", *iter) == 0 || !strcmp("--list", *iter))
{
printAllConverters();
printAllConverters(pname);
goto normal_exit;
}
else if (strcmp("-h", *iter) == 0 || !strcmp("--help", *iter))