mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-14 09:21:03 +00:00
ICU-535 Fixed some compiler warnings
X-SVN-Rev: 2543
This commit is contained in:
parent
5244d856d6
commit
3d3eb3058e
1 changed files with 45 additions and 42 deletions
|
@ -41,6 +41,7 @@ extern void pkg_mode_common(UPKGOptions* o, FileStream *stream, UErrorCode *stat
|
|||
|
||||
U_CDECL_END
|
||||
|
||||
static int executeMakefile(const UPKGOptions *o);
|
||||
static void loadLists(UPKGOptions *o, UErrorCode *status);
|
||||
|
||||
/* This sets the modes that are available */
|
||||
|
@ -303,54 +304,56 @@ main(int argc, char* argv[]) {
|
|||
return 0; /* nothing to do. */
|
||||
}
|
||||
|
||||
/* POSIX - execute makefile */
|
||||
{
|
||||
char cmd[1024];
|
||||
/*char pwd[1024];*/
|
||||
char *make;
|
||||
int rc;
|
||||
return executeMakefile(&o);
|
||||
}
|
||||
|
||||
/* POSIX - execute makefile */
|
||||
static int executeMakefile(const UPKGOptions *o)
|
||||
{
|
||||
char cmd[1024];
|
||||
/*char pwd[1024];*/
|
||||
char *make;
|
||||
int rc;
|
||||
|
||||
make = getenv("MAKE");
|
||||
make = getenv("MAKE");
|
||||
|
||||
if(!make || !make[0]) {
|
||||
make = U_MAKE;
|
||||
}
|
||||
|
||||
/*getcwd(pwd, 1024);*/
|
||||
#ifdef WIN32
|
||||
sprintf(cmd, "%s %s%s -f \"%s\" %s %s %s",
|
||||
make,
|
||||
o.install ? "INSTALLTO=" : "",
|
||||
o.install ? o.install : "",
|
||||
o.makeFile,
|
||||
o.clean ? "clean" : "",
|
||||
o.rebuild ? "rebuild" : "",
|
||||
o.install ? "install" : "");
|
||||
#else
|
||||
sprintf(cmd, "%s %s%s -f %s %s %s %s",
|
||||
make,
|
||||
o.install ? "INSTALLTO=" : "",
|
||||
o.install ? o.install : "",
|
||||
o.makeFile,
|
||||
o.clean ? "clean" : "",
|
||||
o.rebuild ? "rebuild" : "",
|
||||
o.install ? "install" : "");
|
||||
#endif
|
||||
if(o.verbose) {
|
||||
puts(cmd);
|
||||
}
|
||||
|
||||
rc = system(cmd);
|
||||
|
||||
if(rc < 0) {
|
||||
fprintf(stderr, "# Failed, rc=%d\n", rc);
|
||||
}
|
||||
return rc < 128 ? rc : (rc >> 8);
|
||||
if(!make || !make[0]) {
|
||||
make = U_MAKE;
|
||||
}
|
||||
|
||||
return 0;
|
||||
/*getcwd(pwd, 1024);*/
|
||||
#ifdef WIN32
|
||||
sprintf(cmd, "%s %s%s -f \"%s\" %s %s %s",
|
||||
make,
|
||||
o->install ? "INSTALLTO=" : "",
|
||||
o->install ? o->install : "",
|
||||
o->makeFile,
|
||||
o->clean ? "clean" : "",
|
||||
o->rebuild ? "rebuild" : "",
|
||||
o->install ? "install" : "");
|
||||
#else
|
||||
sprintf(cmd, "%s %s%s -f %s %s %s %s",
|
||||
make,
|
||||
o->install ? "INSTALLTO=" : "",
|
||||
o->install ? o->install : "",
|
||||
o->makeFile,
|
||||
o->clean ? "clean" : "",
|
||||
o->rebuild ? "rebuild" : "",
|
||||
o->install ? "install" : "");
|
||||
#endif
|
||||
if(o->verbose) {
|
||||
puts(cmd);
|
||||
}
|
||||
|
||||
rc = system(cmd);
|
||||
|
||||
if(rc < 0) {
|
||||
fprintf(stderr, "# Failed, rc=%d\n", rc);
|
||||
}
|
||||
return rc < 128 ? rc : (rc >> 8);
|
||||
}
|
||||
|
||||
|
||||
static void loadLists(UPKGOptions *o, UErrorCode *status)
|
||||
{
|
||||
CharList *l, *tail = NULL, *tail2 = NULL;
|
||||
|
|
Loading…
Add table
Reference in a new issue