ICU-57131.0.1.tar.gz

[apple/icu.git] / icuSources / tools / toolutil / pkg_icu.cpp

diff --git a/icuSources/tools/toolutil/pkg_icu.cpp b/icuSources/tools/toolutil/pkg_icu.cpp
index 87ed0914f13096bf29f81f7afd618f29c4c7e783..471b1d45ec1220691c4513f5bea54c817c7761f4 100644 (file)
--- a/icuSources/tools/toolutil/pkg_icu.cpp
+++ b/icuSources/tools/toolutil/pkg_icu.cpp
@@ -1,9 +1,10 @@
 /******************************************************************************
 /******************************************************************************

- *   Copyright (C) 2008-2012, International Business Machines
+ *   Copyright (C) 2008-2015, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
 #include "unicode/utypes.h"
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
 #include "unicode/utypes.h"

+#include "unicode/localpointer.h"

 #include "unicode/putil.h"
 #include "cstring.h"
 #include "toolutil.h"
 #include "unicode/putil.h"
 #include "cstring.h"
 #include "toolutil.h"


@@ -16,9 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-

 // read a file list -------------------------------------------------------- ***
 
 U_NAMESPACE_USE
 // read a file list -------------------------------------------------------- ***
 
 U_NAMESPACE_USE


@@ -38,7 +36,7 @@ isListTextFile(const char *listname) {
     const char *listNameEnd=strchr(listname, 0);
     const char *suffix;
     int32_t i, length;
     const char *listNameEnd=strchr(listname, 0);
     const char *suffix;
     int32_t i, length;

-    for(i=0; i<LENGTHOF(listFileSuffixes); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(listFileSuffixes); ++i) {

         suffix=listFileSuffixes[i].suffix;
         length=listFileSuffixes[i].length;
         if((listNameEnd-listname)>length && 0==memcmp(listNameEnd-length, suffix, length)) {
         suffix=listFileSuffixes[i].suffix;
         length=listFileSuffixes[i].length;
         if((listNameEnd-listname)>length && 0==memcmp(listNameEnd-length, suffix, length)) {


@@ -135,6 +133,8 @@ readList(const char *filesPath, const char *listname, UBool readContents, Packag
         fclose(file);
     } else if((listNameEnd-listname)>4 && 0==memcmp(listNameEnd-4, ".dat", 4)) {
         // read the ICU .dat package
         fclose(file);
     } else if((listNameEnd-listname)>4 && 0==memcmp(listNameEnd-4, ".dat", 4)) {
         // read the ICU .dat package

+        // Accept a .dat file whose name differs from the ToC prefixes.
+        listPkg->setAutoPrefix();

         listPkg->readPackage(listname);
     } else {
         // list the single file itself
         listPkg->readPackage(listname);
     } else {
         // list the single file itself


@@ -150,33 +150,25 @@ readList(const char *filesPath, const char *listname, UBool readContents, Packag
 
 U_CAPI int U_EXPORT2
 writePackageDatFile(const char *outFilename, const char *outComment, const char *sourcePath, const char *addList, Package *pkg, char outType) {
 
 U_CAPI int U_EXPORT2
 writePackageDatFile(const char *outFilename, const char *outComment, const char *sourcePath, const char *addList, Package *pkg, char outType) {

-    Package *addListPkg = NULL;
-    UBool pkgDelete = FALSE;
+    LocalPointer<Package> ownedPkg;
+    LocalPointer<Package> addListPkg;

 
     if (pkg == NULL) {
 
     if (pkg == NULL) {

-        pkg = new Package;
-        if(pkg == NULL) {
+        ownedPkg.adoptInstead(new Package);
+        if(ownedPkg.isNull()) {

             fprintf(stderr, "icupkg: not enough memory\n");
             return U_MEMORY_ALLOCATION_ERROR;
         }
             fprintf(stderr, "icupkg: not enough memory\n");
             return U_MEMORY_ALLOCATION_ERROR;
         }

+        pkg = ownedPkg.getAlias();

 
 

-        addListPkg = readList(sourcePath, addList, TRUE, NULL);
-        if(addListPkg != NULL) {
+        addListPkg.adoptInstead(readList(sourcePath, addList, TRUE, NULL));
+        if(addListPkg.isValid()) {

             pkg->addItems(*addListPkg);
         } else {
             return U_ILLEGAL_ARGUMENT_ERROR;
         }
             pkg->addItems(*addListPkg);
         } else {
             return U_ILLEGAL_ARGUMENT_ERROR;
         }

-
-        pkgDelete = TRUE;

     }
 
     pkg->writePackage(outFilename, outType, outComment);
     }
 
     pkg->writePackage(outFilename, outType, outComment);

-
-    if (pkgDelete) {
-        delete pkg;
-        delete addListPkg;
-    }
-

     return 0;
 }
     return 0;
 }

-