272451 - libjar-standalone is no longer needed

Status: VERIFIED FIXED

(Core :: Networking: JAR, defect)

Description

[Alfred Kayser]

The installers (using the 'standalone' version of libjar') don't need
wildcard pattern matching in the ZIP_Find functions, so this can be removed.
This saves about 3K code in the installer code, and cleans the installers
a little bit (removing some deadcode...).

This is a quick and easy fix, making the installers smaller (and thus quicker to
download).

Comment 1

[Alfred Kayser]

Patch pending (after https://bugzilla.mozilla.org/show_bug.cgi?id=214672 gets
committed...)

Comment 2

[Alfred Kayser]

See bug 247458 for a patch for both this 'bug' and that one.

Comment 3

[Alfred Kayser]

ZIP_FindInit
/toolkit/mozapps/installer/windows/wizard/setup/extra.c, line 8753 -- void* find = ZIP_FindInit(vZip, directory);
    In: /toolkit/mozapps/installer/windows/wizard/setup/extra.c, line 8744 -- int ExtractDirEntries(char* directory, void* vZip)
    Called from: /toolkit/mozapps/installer/windows/wizard/setup/ifuncns.c, line 499 -- dwReturn = ExtractDirEntries(NULL, vZip);

/xpinstall/wizard/os2/setup/extra.c, line 5895 -- void* find = ZIP_FindInit(vZip, directory);
    In: /xpinstall/wizard/os2/setup/extra.c, line 5886 -- int ExtractDirEntries(char* directory, void* vZip)
    Called from: /xpinstall/wizard/os2/setup/ifuncns.c, line 420 -- dwReturn = ExtractDirEntries(NULL, vZip);

/xpinstall/wizard/windows/setup/extra.c, line 8603 -- void* find = ZIP_FindInit(vZip, directory);
    In: /xpinstall/wizard/windows/setup/extra.c, line 8594 -- int ExtractDirEntries(char* directory, void* vZip)
    Called from: /xpinstall/wizard/windows/setup/ifuncns.c, line 505 -- dwReturn = ExtractDirEntries(NULL, vZip);

/xpinstall/wizard/unix/src2/nsZipExtractor.cpp, line 92 -- hFind = ZIP_FindInit(hZip, (const char *) NULL);
/toolkit/mozapps/installer/unix/wizard/nsZipExtractor.cpp, line 88 -- hFind = ZIP_FindInit(hZip, (const char *) NULL);
/xpinstall/wizard/mac/src/Deflation.c, line 116 -- hFind = ZIP_FindInit( hZip, NULL ); /* null to match all files in archive */
    All NULL's passed as pattern!

Comment 4

[Alfred Kayser]

Before:
    20.406 jar50_s.lib
     3.928 nsWildCard.obj
    13.592 nsZipArchive.obj
After:
    15.532 jar50_s.lib
    12.972 nsZipArchive.obj

So, 5K codesize savings for the standalone installer, saving 5K of the mozilla distribution package.

Comment 5

[Alfred Kayser]

The whole standalone version (clib/xpcom-less) of the libjar is no longer needed and can be removed completely.
First step would be to disable compilation of the standalone version.
Second step to remove all 'ifdef STANDALONE' stuff, 
and then may be some more libjar cleanup is possible, as there no longer a need to support two models.

Comment 6

[Alfred Kayser]

Fixed by bug 505784!