From 32f2eeea477ad3be1f3efd858c5a7d6fff54e27c Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Mon, 21 Apr 2008 16:46:01 +0000 Subject: [PATCH] minor re-factoring reduces code lines for an error (and evilly increases code coverage at gcov ;) --- ext/phar/phar.c | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 7d1025a56c..bcb3f65333 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -2402,34 +2402,19 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert, phar->alias_len = restore_alias_len; phar_set_32(manifest, main_metadata_str.len); - if (main_metadata_str.len) { - if (4 != php_stream_write(newfile, manifest, 4) || - main_metadata_str.len != php_stream_write(newfile, main_metadata_str.c, main_metadata_str.len)) { - smart_str_free(&main_metadata_str); - if (closeoldfile) { - php_stream_close(oldfile); - } - php_stream_close(newfile); - phar->alias_len = restore_alias_len; - if (error) { - spprintf(error, 0, "unable to write manifest meta-data of new phar \"%s\"", phar->fname); - } - return EOF; - } - } else { - if (4 != php_stream_write(newfile, manifest, 4)) { - smart_str_free(&main_metadata_str); - if (closeoldfile) { - php_stream_close(oldfile); - } - php_stream_close(newfile); - phar->alias_len = restore_alias_len; - if (error) { - spprintf(error, 0, "unable to write manifest header of new phar \"%s\"", phar->fname); - } - return EOF; + if (4 != php_stream_write(newfile, manifest, 4) || (main_metadata_str.len + && main_metadata_str.len != php_stream_write(newfile, main_metadata_str.c, main_metadata_str.len))) { + smart_str_free(&main_metadata_str); + if (closeoldfile) { + php_stream_close(oldfile); } - } + php_stream_close(newfile); + phar->alias_len = restore_alias_len; + if (error) { + spprintf(error, 0, "unable to write manifest meta-data of new phar \"%s\"", phar->fname); + } + return EOF; + } smart_str_free(&main_metadata_str); /* re-calculate the manifest location to simplify later code */ -- 2.50.1