src/share/native/com/sun/java/util/jar/pack/bands.cpp

*** 286,296 ****
  
  #define BAND_INIT(name, cspec, ix) \
    { e_##name,  #name, /*debug only*/ \
      cspec, ix }
  
! const band_init all_band_inits[] = {
  //BAND_INIT(archive_magic, BYTE1_spec, 0),
  //BAND_INIT(archive_header, UNSIGNED5_spec, 0),
  //BAND_INIT(band_headers, BYTE1_spec, 0),
    BAND_INIT(cp_Utf8_prefix, DELTA5_spec, 0),
    BAND_INIT(cp_Utf8_suffix, UNSIGNED5_spec, 0),
--- 286,296 ----
  
  #define BAND_INIT(name, cspec, ix) \
    { e_##name,  #name, /*debug only*/ \
      cspec, ix }
  
! const band_init all_band_inits[BAND_LIMIT+1] = {
  //BAND_INIT(archive_magic, BYTE1_spec, 0),
  //BAND_INIT(archive_header, UNSIGNED5_spec, 0),
  //BAND_INIT(band_headers, BYTE1_spec, 0),
    BAND_INIT(cp_Utf8_prefix, DELTA5_spec, 0),
    BAND_INIT(cp_Utf8_suffix, UNSIGNED5_spec, 0),
*** 446,463 ****
    BAND_INIT(file_size_hi, UNSIGNED5_spec, 0),
    BAND_INIT(file_size_lo, UNSIGNED5_spec, 0),
    BAND_INIT(file_modtime, DELTA5_spec, 0),
    BAND_INIT(file_options, UNSIGNED5_spec, 0),
  //BAND_INIT(file_bits, BYTE1_spec, 0),
! #ifndef PRODUCT
!   { 0, 0, 0, 0 }
! #else
!   { 0, 0 }
! #endif
  };
- #define NUM_BAND_INITS \
-         (sizeof(all_band_inits)/sizeof(all_band_inits[0]))
  
  band* band::makeBands(unpacker* u) {
    band* tmp_all_bands = U_NEW(band, BAND_LIMIT);
    for (int i = 0; i < BAND_LIMIT; i++) {
      assert((byte*)&all_band_inits[i+1]
--- 446,457 ----
    BAND_INIT(file_size_hi, UNSIGNED5_spec, 0),
    BAND_INIT(file_size_lo, UNSIGNED5_spec, 0),
    BAND_INIT(file_modtime, DELTA5_spec, 0),
    BAND_INIT(file_options, UNSIGNED5_spec, 0),
  //BAND_INIT(file_bits, BYTE1_spec, 0),
!   { 0, NULL, 0, 0 }
  };
  
  band* band::makeBands(unpacker* u) {
    band* tmp_all_bands = U_NEW(band, BAND_LIMIT);
    for (int i = 0; i < BAND_LIMIT; i++) {
      assert((byte*)&all_band_inits[i+1]