File tree Expand file tree Collapse file tree 2 files changed +26
-26
lines changed Expand file tree Collapse file tree 2 files changed +26
-26
lines changed Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ public function read($sFileName)
115
115
$ bbdBlocks = (self ::BIG_BLOCK_SIZE - self ::BIG_BLOCK_DEPOT_BLOCKS_POS )/4 ;
116
116
}
117
117
// @codeCoverageIgnoreEnd
118
-
118
+
119
119
for ($ i = 0 ; $ i < $ bbdBlocks ; ++$ i ) {
120
120
$ bigBlockDepotBlocks [$ i ] = self ::getInt4d ($ this ->data , $ pos );
121
121
$ pos += 4 ;
@@ -193,26 +193,26 @@ public function getStream($stream)
193
193
}
194
194
195
195
return $ streamData ;
196
- } else {
197
- $ numBlocks = $ this ->props [$ stream ]['size ' ] / self ::BIG_BLOCK_SIZE ;
198
- if ($ this ->props [$ stream ]['size ' ] % self ::BIG_BLOCK_SIZE != 0 ) {
199
- ++$ numBlocks ;
200
- }
196
+ }
201
197
202
- if ($ numBlocks == 0 ) {
203
- return '' ;// @codeCoverageIgnore
204
- }
198
+ $ numBlocks = $ this ->props [$ stream ]['size ' ] / self ::BIG_BLOCK_SIZE ;
199
+ if ($ this ->props [$ stream ]['size ' ] % self ::BIG_BLOCK_SIZE != 0 ) {
200
+ ++$ numBlocks ;
201
+ }
205
202
206
- $ block = $ this ->props [$ stream ]['startBlock ' ];
203
+ if ($ numBlocks == 0 ) {
204
+ return '' ;// @codeCoverageIgnore
205
+ }
207
206
208
- while ($ block != -2 ) {
209
- $ pos = ($ block + 1 ) * self ::BIG_BLOCK_SIZE ;
210
- $ streamData .= substr ($ this ->data , $ pos , self ::BIG_BLOCK_SIZE );
211
- $ block = self ::getInt4d ($ this ->bigBlockChain , $ block *4 );
212
- }
207
+ $ block = $ this ->props [$ stream ]['startBlock ' ];
213
208
214
- return $ streamData ;
209
+ while ($ block != -2 ) {
210
+ $ pos = ($ block + 1 ) * self ::BIG_BLOCK_SIZE ;
211
+ $ streamData .= substr ($ this ->data , $ pos , self ::BIG_BLOCK_SIZE );
212
+ $ block = self ::getInt4d ($ this ->bigBlockChain , $ block *4 );
215
213
}
214
+
215
+ return $ streamData ;
216
216
}
217
217
218
218
/**
Original file line number Diff line number Diff line change @@ -1244,9 +1244,9 @@ public function errorCode()
1244
1244
{
1245
1245
if (PCLZIP_ERROR_EXTERNAL == 1 ) {
1246
1246
return (PclErrorCode ());
1247
- } else {
1248
- return ($ this ->error_code );
1249
1247
}
1248
+
1249
+ return ($ this ->error_code );
1250
1250
}
1251
1251
// --------------------------------------------------------------------------------
1252
1252
@@ -1289,9 +1289,9 @@ public function errorName($p_with_code = false)
1289
1289
1290
1290
if ($ p_with_code ) {
1291
1291
return ($ v_value . ' ( ' . $ this ->error_code . ') ' );
1292
- } else {
1293
- return ($ v_value );
1294
1292
}
1293
+
1294
+ return ($ v_value );
1295
1295
}
1296
1296
// --------------------------------------------------------------------------------
1297
1297
@@ -1304,13 +1304,13 @@ public function errorInfo($p_full = false)
1304
1304
{
1305
1305
if (PCLZIP_ERROR_EXTERNAL == 1 ) {
1306
1306
return (PclErrorString ());
1307
- } else {
1308
- if ($ p_full ) {
1309
- return ($ this ->errorName (true ) . " : " . $ this ->error_string );
1310
- } else {
1311
- return ($ this ->error_string . " [code " . $ this ->error_code . "] " );
1312
- }
1313
1307
}
1308
+
1309
+ if ($ p_full ) {
1310
+ return ($ this ->errorName (true ) . " : " . $ this ->error_string );
1311
+ }
1312
+
1313
+ return ($ this ->error_string . " [code " . $ this ->error_code . "] " );
1314
1314
}
1315
1315
// --------------------------------------------------------------------------------
1316
1316
You can’t perform that action at this time.
0 commit comments