Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a7b459 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 7c8318c0: Merge "PackageInfo is a class, not a struct" 

* commit '7c8318c0':
  PackageInfo is a class, not a struct
parents 897a2cfc 7c8318c0

tools/obbtool/Main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void usage(void) 
        "   Prints the OBB signature information of a file.\n\n", gProgName);

}



void doAdd(const char* filename, struct PackageInfo* info) {

void doAdd(const char* filename, PackageInfo* info) {

    ObbFile *obb = new ObbFile();

    if (obb->readFrom(filename)) {

        fprintf(stderr, "ERROR: %s: OBB signature already present\n", filename);
@@ -182,7 +182,7 @@ int main(int argc, char* const argv[]) 
{

    int opt;

    int option_index = 0;

    struct PackageInfo package_info;

    PackageInfo package_info;



    int result = 1;    // pessimistically assume an error.