Changeset 28472

Timestamp:

05/17/2014 05:20:26 PM (11 years ago)

Author:

wonderboymusic

Message:

Eliminate the use of extract() in MO::import_from_reader().

See #22400.

File:

• trunk/src/wp-includes/pomo/mo.php (modified) (3 diffs)

trunk/src/wp-includes/pomo/mo.php

@@ -156 +156 @@
             return false;
 
-        extract( $header );
-
         // support revision 0 of MO format specs, only
-        if ($revision != 0)
-            return false;
+        if ( $header['revision'] != 0 ) {
+            return false;
+        }
 
         // seek to data blocks
-        $reader->seekto($originals_lenghts_addr);
+        $reader->seekto( $header['originals_lenghts_addr'] );
 
         // read originals' indices
-        $originals_lengths_length = $translations_lenghts_addr - $originals_lenghts_addr;
-        if ( $originals_lengths_length != $total * 8 )
-            return false;
+        $originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+        if ( $originals_lengths_length != $header['total'] * 8 ) {
+            return false;
+        }
 
         $originals = $reader->read($originals_lengths_length);
-        if ( $reader->strlen( $originals ) != $originals_lengths_length )
-            return false;
+        if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
+            return false;
+        }
 
         // read translations' indices
-        $translations_lenghts_length = $hash_addr - $translations_lenghts_addr;
-        if ( $translations_lenghts_length != $total * 8 )
-            return false;
+        $translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+        if ( $translations_lenghts_length != $header['total'] * 8 ) {
+            return false;
+        }
 
         $translations = $reader->read($translations_lenghts_length);
-        if ( $reader->strlen( $translations ) != $translations_lenghts_length )
-            return false;
+        if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
+            return false;
+        }
 
         // transform raw data into set of indices
@@ -188 +191 @@
 
         // skip hash table
-        $strings_addr = $hash_addr + $hash_length * 4;
+        $strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
 
         $reader->seekto($strings_addr);
@@ -195 +198 @@
         $reader->close();
 
-        for ( $i = 0; $i < $total; $i++ ) {
+        for ( $i = 0; $i < $header['total']; $i++ ) {
             $o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
             $t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );