]> granicus.if.org Git - php/commitdiff
Remove superfluous semicolons
authorTom Van Looy <tom@ctors.net>
Sun, 25 Jun 2017 21:24:23 +0000 (23:24 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Sun, 25 Jun 2017 22:23:25 +0000 (00:23 +0200)
52 files changed:
Zend/tests/bug35470.phpt
Zend/tests/bug49893.phpt
Zend/zend_alloc.c
Zend/zend_execute_API.c
ext/com_dotnet/com_handlers.c
ext/curl/interface.c
ext/exif/exif.c
ext/imap/tests/imap_alerts_error.phpt
ext/intl/tests/rbbiter_getBinaryRules_basic.phpt
ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
ext/mysqli/mysqli_exception.c
ext/mysqli/tests/065.phpt
ext/mysqli/tests/mysqli_debug.phpt
ext/mysqli/tests/mysqli_debug_append.phpt
ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
ext/oci8/tests/coll_019.phpt
ext/oci8/tests/lob_040.phpt
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_debug.h
ext/opcache/zend_shared_alloc.c
ext/pcre/tests/split2.phpt
ext/pdo/pdo_stmt.c
ext/phar/tests/011.phpt
ext/phar/tests/pharfileinfo_getcrc32.phpt
ext/posix/tests/posix_getuid_error.phpt
ext/posix/tests/posix_times_error.phpt
ext/posix/tests/posix_uname_error.phpt
ext/readline/readline.c
ext/reflection/php_reflection.c
ext/soap/tests/bugs/bug29844.phpt
ext/standard/array.c
ext/standard/scanf.c
ext/standard/tests/array/sizeof_error.phpt
ext/standard/tests/class_object/get_declared_classes_error_001.phpt
ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt
ext/standard/tests/class_object/get_declared_traits_error_001.phpt
ext/standard/tests/file/userstreams_003.phpt
ext/standard/tests/filters/bug22538.phpt
ext/standard/tests/network/closelog_error.phpt
ext/zip/tests/bug38944.phpt
ext/zip/tests/bug40228-mb.phpt
ext/zip/tests/bug40228.phpt
ext/zlib/tests/gztell_basic2.phpt
ext/zlib/tests/inflate_get_read_len.phpt
ext/zlib/tests/inflate_get_status.phpt
main/streams/plain_wrapper.c
sapi/fpm/fpm/fpm_conf.c
tests/output/ob_clean_error_001.phpt
tests/output/ob_end_flush_error_001.phpt
tests/output/ob_flush_error_001.phpt
tests/output/ob_get_level_error_001.phpt

index 5a854552bb12e2f2fafbd894567552dbbf17cc97..01d045744a02bdede9b2c88548ab098299b3f3cc 100644 (file)
@@ -5,7 +5,7 @@ Bug #35470 (Assigning global using variable name from array doesn't function)
 $x = array("test", "55");
 global ${$x[0]};
 ${$x[0]} = $x[1];
-echo "Test: $test\n";;
+echo "Test: $test\n";
 ?>
 --EXPECT--
 Test: 55
index b340f7bdfdfa85210e0553106d503374dd14fef2..addf4470736ea93349f71391bed62a85ed67e230 100644 (file)
@@ -20,7 +20,7 @@ class B {
 try {
        $b = new B();
 } catch(Exception $e) {
-       echo $e->getMessage() . "\n";;
+       echo $e->getMessage() . "\n";
 }
 ?>
 --EXPECT--
index 678c852e8b406489858e7d7ec28735d7b73d2c16..70613b2b9634db056b0c75d0e09d2b5f04f154a5 100644 (file)
@@ -1880,7 +1880,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap)
                        if (free_counter == bin_elements[i]) {
                                has_free_pages = 1;
                        }
-                       chunk->map[page_num] = ZEND_MM_SRUN_EX(i, free_counter);;
+                       chunk->map[page_num] = ZEND_MM_SRUN_EX(i, free_counter);
                        p = p->next_free_slot;
                }
 
@@ -1907,7 +1907,7 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap)
                        ZEND_ASSERT(ZEND_MM_SRUN_BIN_NUM(info) == i);
                        if (ZEND_MM_SRUN_FREE_COUNTER(info) == bin_elements[i]) {
                                /* remove from cache */
-                               p = p->next_free_slot;;
+                               p = p->next_free_slot;
                                *q = p;
                        } else {
                                q = &p->next_free_slot;
index ae0dd8f972ea2f6b8bc52b932996a57bf5d0e2c7..302a7828ebc53ce057c8a9e6d4060bb62ebb8fdf 100644 (file)
@@ -1667,7 +1667,7 @@ ZEND_API int zend_set_local_var(zend_string *name, zval *value, int force) /* {{
                        if (force) {
                                zend_array *symbol_table = zend_rebuild_symbol_table();
                                if (symbol_table) {
-                                       return zend_hash_update(symbol_table, name, value) ? SUCCESS : FAILURE;;
+                                       return zend_hash_update(symbol_table, name, value) ? SUCCESS : FAILURE;
                                }
                        }
                } else {
@@ -1709,7 +1709,7 @@ ZEND_API int zend_set_local_var_str(const char *name, size_t len, zval *value, i
                        if (force) {
                                zend_array *symbol_table = zend_rebuild_symbol_table();
                                if (symbol_table) {
-                                       return zend_hash_str_update(symbol_table, name, len, value) ? SUCCESS : FAILURE;;
+                                       return zend_hash_str_update(symbol_table, name, len, value) ? SUCCESS : FAILURE;
                                }
                        }
                } else {
index 3eebad0ef1b71737d737dd96b019693afd667316..d28398315d893f8f33d0458f77330aef50c60f30 100644 (file)
@@ -302,7 +302,7 @@ static union _zend_function *com_method_get(zend_object **object_ptr, zend_strin
                                                        f.arg_info = ecalloc(bindptr.lpfuncdesc->cParams, sizeof(zend_arg_info));
 
                                                        for (i = 0; i < bindptr.lpfuncdesc->cParams; i++) {
-                                                               f.arg_info[i].type = ZEND_TYPE_ENCODE(0,1);;
+                                                               f.arg_info[i].type = ZEND_TYPE_ENCODE(0,1);
                                                                if (bindptr.lpfuncdesc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FOUT) {
                                                                        f.arg_info[i].pass_by_reference = ZEND_SEND_BY_REF;
                                                                }
index 3684222f9339cc0de3181bfdfde3a45b571122d5..0d1152b987cb5e7c76c7dcd94258881fa7ea30bd 100644 (file)
@@ -2508,7 +2508,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
                                                zval_ptr_dtor(&ch->handlers->write_header->stream);
                                                ch->handlers->write_header->fp = fp;
                                                ch->handlers->write_header->method = PHP_CURL_FILE;
-                                               ZVAL_COPY(&ch->handlers->write_header->stream, zvalue);;
+                                               ZVAL_COPY(&ch->handlers->write_header->stream, zvalue);
                                        } else {
                                                php_error_docref(NULL, E_WARNING, "the provided file handle is not writable");
                                                return FAILURE;
index 1e981ffcd2593a00fb6ae2b0202d7e36272d3a25..ab920223405b475cd4738e7c99bf406eb54fbf20 100644 (file)
@@ -3009,7 +3009,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 {
        int   a;
        char  *decode;
-       size_t len;;
+       size_t len;
 
        *pszEncoding = NULL;
        /* Copy the comment */
index ab13ec4632492f41e16d350c30ef9bacc0d06429..ee13b135034caa3bb9814c425f216f9e42545289 100644 (file)
@@ -16,7 +16,7 @@ echo "*** Testing imap_alerts() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing imap_alerts() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( imap_alerts($extra_arg) );
 
 ?>
index dce0714d4dd4f985ef5dab8aaf71a14a01896c14..7d770571230070eaf1078274662a7d6aeec10187 100644 (file)
@@ -22,7 +22,7 @@ $rules = <<<RULES
 !!safe_reverse;
 RULES;
 $rbbi = new IntlRuleBasedBreakIterator($rules);
-$rbbi->setText('sdfkjsdf88á.... ,;');;
+$rbbi->setText('sdfkjsdf88á.... ,;');
 
 $br = $rbbi->getBinaryRules();
 
index a56f6bc48867b09460e71c42af7825188c2c22f9..4a654508cc13ea654c0adf18ab3a9c920ff6d9f2 100644 (file)
@@ -25,7 +25,7 @@ $rules = <<<RULES
 !!safe_reverse;
 RULES;
 $rbbi = new IntlRuleBasedBreakIterator($rules);
-$rbbi->setText('sdfkjsdf88á.... ,;');;
+$rbbi->setText('sdfkjsdf88á.... ,;');
 
 do {
        var_dump($rbbi->current(), $rbbi->getRuleStatusVec());
@@ -56,4 +56,4 @@ array(1) {
   [0]=>
   int(4)
 }
-==DONE==
\ No newline at end of file
+==DONE==
index 8663057fd2cb279672feb1a6b2cc9c1565f9c618..e31bc1981738b94c0b1de9e62f1a68dd87e3e734 100644 (file)
@@ -44,7 +44,7 @@ void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, .
 
        va_start(arg, format);
        vspprintf(&message, 0, format, arg);
-       va_end(arg);;
+       va_end(arg);
 
        if (!(MyG(report_mode) & MYSQLI_REPORT_STRICT)) {
                php_error_docref(NULL, E_WARNING, "(%s/%d): %s", sqlstate, errorno, message);
index 59754bc278075e4ce55fb071e3f053b32828dafa..75c4b02a2942ce115c4ba318367e300e3e860895 100644 (file)
@@ -41,7 +41,7 @@ if (!function_exists('mysqli_set_charset')) {
                                        printf("[005] Expecting 2/int got %s/%s\n", gettype($tmp), $tmp);
 
                        if ('gbk' !== ($tmp = $mysql->character_set_name()))
-                                       printf("[005] Expecting gbk/string got %s/%s\n", gettype($tmp), $tmp);;
+                                       printf("[005] Expecting gbk/string got %s/%s\n", gettype($tmp), $tmp);
                }
        }
        $mysql->close();
index 2b754eac36b319ee74bd500542030b965a080811..aa455d7f6ec37a8d19a0ae79663afc26a50a0e17 100644 (file)
@@ -17,7 +17,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
 ?>
 --FILE--
 <?php
-       require_once('connect.inc');;
+       require_once('connect.inc');
 
        if (NULL !== ($tmp = @mysqli_debug()))
                printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
index fbb0d0a84e6bb7b2964e2a37cdc7acc7e6e71317..68e600772b62055cae098324b0d077205f276c4d 100644 (file)
@@ -20,7 +20,7 @@ if (!$IS_MYSQLND)
 ?>
 --FILE--
 <?php
-       require_once('connect.inc');;
+       require_once('connect.inc');
 
        if (true !== ($tmp = mysqli_debug(sprintf('d:t:O,%s/mysqli_debug_phpt.trace', sys_get_temp_dir()))))
                printf("[001] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
index 1de2eebb2ef0a801ca896aa0f760b22bfa43fa62..b5ba9a5a05d66f403f20c04c7854aca5a1e84be3 100644 (file)
@@ -20,7 +20,7 @@ if (!$IS_MYSQLND)
 ?>
 --FILE--
 <?php
-       require_once('connect.inc');;
+       require_once('connect.inc');
        require_once('table.inc');
 
        function try_control_string($link, $control_string, $trace_file, $offset) {
index 257926bae997669ba9423be579d615e736723290..2886694440759950feefa1a0c9c65b297da11b13 100644 (file)
@@ -21,7 +21,7 @@ if (!$IS_MYSQLND)
 ?>
 --FILE--
 <?php
-       require_once('connect.inc');;
+       require_once('connect.inc');
        require_once('table.inc');
 
        function try_control_string($link, $control_string, $trace_file, $offset) {
@@ -125,4 +125,4 @@ if (!$IS_MYSQLND)
        require_once("clean_table.inc");
 ?>
 --EXPECTF--
-done!
\ No newline at end of file
+done!
index 371c802ede8c416939a7ce2dd981cd352b6a77bb..e0c896dce199d4d892de661d8bdf8b3856e12059 100644 (file)
@@ -13,7 +13,7 @@ require(dirname(__FILE__).'/skipif.inc');
 
 require dirname(__FILE__)."/connect.inc";
 
-$ora_sql = "DROP TYPE ".$type_name;;
+$ora_sql = "DROP TYPE ".$type_name;
 $statement = oci_parse($c,$ora_sql);
 @oci_execute($statement);
 
index 0a29dc1b9e53b860a0f5726ed0de0e2023adfc5d..0d60054b22e11138dbb3f2335f7ffc52da8583c8 100644 (file)
@@ -29,9 +29,9 @@ for ($i = 0; $i < NUMLOBS; $i++) {
 }
 
 for ($i = 0; $i < NUMLOBS; $i++) {
-       echo "Row $i Size:  " . $row[$i][0]->size() . "\n";;
+       echo "Row $i Size:  " . $row[$i][0]->size() . "\n";
        echo "Pos 1: " . $row[$i][0]->tell() . "\n";
-       echo "Data:  " . $row[$i][0]->read(5) . "\n";;
+       echo "Data:  " . $row[$i][0]->read(5) . "\n";
        echo "Pos 2: " . $row[$i][0]->tell() . "\n";
        echo "Data:  " . $row[$i][0]->read(12) . "\n";
 }
index 7e375e8289565eb3b7b7a3a49a9e7c6029081221..32db2ca9e9405bfaf750c7eb786e76ce7a219aa3 100644 (file)
@@ -596,7 +596,7 @@ static void accel_copy_permanent_strings(zend_new_interned_string_func_t new_int
        ZEND_HASH_FOREACH_BUCKET(CG(auto_globals), p) {
                zend_auto_global *auto_global;
 
-               auto_global = (zend_auto_global*)Z_PTR(p->val);;
+               auto_global = (zend_auto_global*)Z_PTR(p->val);
 
                zend_string_addref(auto_global->name);
                auto_global->name = new_interned_string(auto_global->name);
index 6445254232f69c9e2b5d697d24b270f877a79e4d..01598deefd370c3af0a9c6544684722bbe84a2ce 100644 (file)
@@ -28,6 +28,6 @@
 #define ACCEL_LOG_INFO                                 3
 #define ACCEL_LOG_DEBUG                                        4
 
-void zend_accel_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);;
+void zend_accel_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
 
 #endif /* _ZEND_ACCELERATOR_DEBUG_H */
index 738c6285d261a3a9baa58eb007b517a0a6ef33b2..4f00574965cb470db301e4933046ee32a959205c 100644 (file)
@@ -228,14 +228,14 @@ int zend_shared_alloc_startup(size_t requested_size)
        p_tmp_shared_globals = (zend_smm_shared_globals *) zend_shared_alloc(sizeof(zend_smm_shared_globals));
        if (!p_tmp_shared_globals) {
                zend_accel_error(ACCEL_LOG_FATAL, "Insufficient shared memory!");
-               return ALLOC_FAILURE;;
+               return ALLOC_FAILURE;
        }
        memset(p_tmp_shared_globals, 0, sizeof(zend_smm_shared_globals));
 
        tmp_shared_segments = zend_shared_alloc(shared_segments_array_size + ZSMMG(shared_segments_count) * sizeof(void *));
        if (!tmp_shared_segments) {
                zend_accel_error(ACCEL_LOG_FATAL, "Insufficient shared memory!");
-               return ALLOC_FAILURE;;
+               return ALLOC_FAILURE;
        }
 
        copy_shared_segments(tmp_shared_segments, ZSMMG(shared_segments)[0], ZSMMG(shared_segments_count), S_H(segment_type_size)());
@@ -249,7 +249,7 @@ int zend_shared_alloc_startup(size_t requested_size)
        ZSMMG(shared_memory_state).positions = (int *)zend_shared_alloc(sizeof(int) * ZSMMG(shared_segments_count));
        if (!ZSMMG(shared_memory_state).positions) {
                zend_accel_error(ACCEL_LOG_FATAL, "Insufficient shared memory!");
-               return ALLOC_FAILURE;;
+               return ALLOC_FAILURE;
        }
 
        ZCG(locked) = 0;
index ccbb7242fd9b18026d23b6c8eb9521dfa253c426..b0411e6df2dc1781d81878035a6abd96679042ea 100644 (file)
@@ -8,7 +8,7 @@ pcre.jit=0
 var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_DELIM_CAPTURE));
 var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_OFFSET_CAPTURE));
 var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE));
-var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE));;
+var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE));
 var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE));
 var_dump(preg_split('/(\d*)/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE));
 
index c238ea0fb01eb0bc56cd77630a3e211af5517ab6..a826240c76d550dc03dc45acec7388e056474ea5 100644 (file)
@@ -858,7 +858,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_
                        case PDO_FETCH_NAMED:
                                if (!return_all) {
                                        ZVAL_NEW_ARR(return_value);
-                                       zend_hash_init(Z_ARRVAL_P(return_value), stmt->column_count, NULL, ZVAL_PTR_DTOR, 0);;
+                                       zend_hash_init(Z_ARRVAL_P(return_value), stmt->column_count, NULL, ZVAL_PTR_DTOR, 0);
                                } else {
                                        array_init(return_value);
                                }
index 4a1f0dd42cb47a2012fa3cf608fab1d1b2130703..83bae148e00e9e1ba04cec61ddc445b2d08e2755 100644 (file)
@@ -15,7 +15,7 @@ __HALT_COMPILER(); ?>";
 // compressed file length does not match incompressed lentgh for an uncompressed file
 
 $files = array();
-$files['a'] = array('cont'=>'a','ulen'=>1,'clen'=>2);;
+$files['a'] = array('cont'=>'a','ulen'=>1,'clen'=>2);
 include 'files/phar_test.inc';
 try {
 include $fname;
index dfa12f4ca4d046fca7efe37a16f834b3fedc50eb..436ac7c5900da5029d8c669ff3e9fca75bb9b4ee 100644 (file)
@@ -16,7 +16,7 @@ __HALT_COMPILER(); ?>";
 // compressed file length does not match incompressed lentgh for an uncompressed file
 
 $files = array();
-$files['a/subdir/here'] = array('cont'=>'a','ulen'=>1,'clen'=>1);;
+$files['a/subdir/here'] = array('cont'=>'a','ulen'=>1,'clen'=>1);
 include 'files/phar_test.inc';
 
 $b = new PharFileInfo($pname . '/a/subdir');
@@ -46,4 +46,4 @@ echo $e->getMessage() . "\n";
 Phar entry is a directory, does not have a CRC
 Phar entry was not CRC checked
 int(%s)
-===DONE===
\ No newline at end of file
+===DONE===
index e759e68bf58fba92ba0f19d6e825eb6c20914f96..42a35512a0b99f97e6d7f0c655dfb1fbaa0874aa 100644 (file)
@@ -16,7 +16,7 @@ echo "*** Testing posix_getuid() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing posix_getuid() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( posix_getuid($extra_arg) );
 
 echo "Done";
index 2766bc9483fbf9f215e7cd8d138e1a40933b4c0c..b7050473585c87d75716b0e73cfda8c3e6afc18c 100644 (file)
@@ -16,7 +16,7 @@ echo "*** Testing posix_times() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing posix_times() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( posix_times($extra_arg) );
 
 echo "Done";
index 4c753feae415ec8f8c692706ed4411ce204c6a8a..b44f4ae8ca6f0a80694dc1c1b40e95fa297e9c9c 100644 (file)
@@ -16,7 +16,7 @@ echo "*** Testing posix_uname() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing posix_uname() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( posix_uname($extra_arg) );
 
 echo "Done";
index 3f0d9223180654429299134508ab132fe8804461..b30ace1a7c1ed5f9da956c6af5cb66b2772b6a7d 100644 (file)
@@ -326,7 +326,7 @@ PHP_FUNCTION(readline_info)
                        if (value) {
                                /* XXX if (rl_readline_name) free(rl_readline_name); */
                                convert_to_string_ex(value);
-                               rl_readline_name = strdup(Z_STRVAL_P(value));;
+                               rl_readline_name = strdup(Z_STRVAL_P(value));
                        }
                        RETVAL_STRING(SAFE_STRING(oldstr));
                } else if (!strcasecmp(what, "attempted_completion_over")) {
index badbf8eb889c3df8e83ee6a031f1845cdd1492cf..c9243d6bcc9993be5b8517ffc4c2a3172611b986 100644 (file)
@@ -4753,7 +4753,7 @@ ZEND_METHOD(reflection_class, newInstance)
 
                fcc.initialized = 1;
                fcc.function_handler = constructor;
-               fcc.calling_scope = zend_get_executed_scope();;
+               fcc.calling_scope = zend_get_executed_scope();
                fcc.called_scope = Z_OBJCE_P(return_value);
                fcc.object = Z_OBJ_P(return_value);
 
index efaccbc31a7e48bd885732c8ae3383d6a3a933a1..a3006639b1ab025918d7beafb52d80ff6ca99609 100644 (file)
@@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient {
   function __construct($wsdl, $options) {
     parent::__construct($wsdl, $options);
     $this->server = new SoapServer($wsdl, $options);
-    $this->server->setClass('hello_world');;
+    $this->server->setClass('hello_world');
   }
 
   function __doRequest($request, $location, $action, $version, $one_way = 0) {
index 7055b2c86bfcf9355f7f13255eadb37c61f5c4f4..ab34ac4a282e970c0ee2ba5cc4b567cedf1c1c55 100644 (file)
@@ -4549,7 +4549,7 @@ static int zval_user_compare(zval *a, zval *b) /* {{{ */
        if (zend_call_function(&BG(user_compare_fci), &BG(user_compare_fci_cache)) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
                zend_long ret = zval_get_long(&retval);
                zval_ptr_dtor(&retval);
-               return ret < 0 ? -1 : ret > 0 ? 1 : 0;;
+               return ret < 0 ? -1 : ret > 0 ? 1 : 0;
        } else {
                return 0;
        }
index d6776aaf96270e77a39c555b5b3e3b1c4409b08c..cff0f9c4c24c9d2a781cc402442a740d0411c256 100644 (file)
@@ -921,7 +921,7 @@ literal:
                                        if (numVars) {
                                                char __buf[2];
                                                __buf[0] = sch;
-                                               __buf[1] = '\0';;
+                                               __buf[1] = '\0';
                                                current = args[objIndex++];
                                                zval_dtor(*current);
                                                ZVAL_STRINGL( *current, __buf, 1);
index 79a75f3153bb45abb2e98d6b516c8acdfefbfb14..c6274830cfb7881daa8c93579cf96c0185ca88f7 100644 (file)
@@ -17,7 +17,7 @@ echo "-- Testing sizeof() with zero arguments --\n";
 var_dump( sizeof() );
 echo "-- Testing sizeof() function with more than two arguments under COUNT_NORMAL mode --\n";
 $var = 100;
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( sizeof($var, COUNT_NORMAL, $extra_arg) );
 echo "-- Testing sizeof() function with more than two arguments under COUNT_RECURSIVE mode --\n";
 var_dump( sizeof($var, COUNT_RECURSIVE, $extra_arg) );
index d5b40beee862fb939ea97c574322468ae2c36ad5..ff01feb360b17b961419069565810528c5ad6583 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing get_declared_classes() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing get_declared_classes() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( get_declared_classes($extra_arg) );
 
 echo "Done";
index 2a7f308a340c056f30ffb9cfe2b3e58ed7c47409..63b02b85c35178379b65a63773cfe2c5ec8e1265 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing get_declared_interfaces() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing get_declared_interfaces() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( get_declared_interfaces($extra_arg) );
 
 echo "Done";
index f7a00da0dd6f1adcc973d7d4659f4fc8b60ba994..0d35fa6d1364276679982d6cfeacaf26481ed3d7 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing get_declared_traits() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing get_declared_traits() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( get_declared_traits($extra_arg) );
 
 echo "Done";
index 01a8efbf5c941bea149a9615382aed89af16a7cc..9ee71f2666ab28d2bd4accdb0fc608a69fa39a0b 100644 (file)
@@ -19,9 +19,9 @@ class test_wrapper extends test_wrapper_base {
                var_dump($value);
                echo "ptrparam:\n";
                var_dump($ptrparam);
-               echo "\$option === $option === " . $this->expected_option . ":\n";;
+               echo "\$option === $option === " . $this->expected_option . ":\n";
                var_dump($option === $this->expected_option);
-               echo "\$value === $value === " . $this->expected_value. ":\n";;
+               echo "\$value === $value === " . $this->expected_value. ":\n";
                var_dump($value === $this->expected_value);
                return $this->return_value;
        }
index 438b5be31f8dc175f4b0d71fe407da6fe4505ee4..0f007e47bb66eee2f74896a27a1e4e3e38600dd4 100644 (file)
@@ -24,8 +24,8 @@ while (($cnt -= $str_len) > 0) {
 }
 $cnt = $size - ($str_len + $cnt);
 fclose($fp);
-$fin = fopen($path1, "r") or die("Can not open $path1\n");;
-$fout = fopen($path2, "w") or die("Can not open $path2\n");;
+$fin = fopen($path1, "r") or die("Can not open $path1\n");
+$fout = fopen($path2, "w") or die("Can not open $path2\n");
 stream_filter_append($fout, "string.rot13");
 my_stream_copy_to_stream($fin, $fout);
 fclose($fout);
index ad3fdf557d8f93f5e75a9c3a3867db967f1b88a3..442f9a62491542aa30b4c7225cd4356b006841f4 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing closelog() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing closelog() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( closelog($extra_arg) );
 
 ?>
index 7cff60c98451b7d5e4fc00560475ab16944e1cd6..ede6b67e777939ca64c5032e8e52e2cc0a6486b2 100644 (file)
@@ -7,7 +7,7 @@ Bug #38944 (newly created ZipArchive segfaults when accessing comment property)
 
 $arc_name = dirname(__FILE__)."/bug38944.zip";
 $foo = new ZipArchive;
-$foo->open($arc_name, ZIPARCHIVE::CREATE);;
+$foo->open($arc_name, ZIPARCHIVE::CREATE);
 
 var_dump($foo->status);
 var_dump($foo->statusSys);
index 109172d2d58b007f002362508446520650e74b5f..db9e2e90d57ebe7b2e2cce8577e08a41c5ad6a4a 100644 (file)
@@ -7,7 +7,7 @@ Bug #40228 (extractTo does not create recursive empty path)
 $dest = dirname(__FILE__);
 $arc_name = $dest . "/bug40228私はガラスを食べられます.zip";
 $zip = new ZipArchive;
-$zip->open($arc_name, ZIPARCHIVE::CREATE);;
+$zip->open($arc_name, ZIPARCHIVE::CREATE);
 $zip->extractTo($dest);
 if (is_dir($dest . '/test/empty')) {
        echo "Ok\n";
index fec29636396d451caeb2fc079dba9f69caa4bbd3..2691b3b22fa81b781a6208a6fd2937a7e81cfc2d 100644 (file)
@@ -7,7 +7,7 @@ Bug #40228 (extractTo does not create recursive empty path)
 $dest = dirname(__FILE__);
 $arc_name = $dest . "/bug40228.zip";
 $zip = new ZipArchive;
-$zip->open($arc_name, ZIPARCHIVE::CREATE);;
+$zip->open($arc_name, ZIPARCHIVE::CREATE);
 $zip->extractTo($dest);
 if (is_dir($dest . '/test/empty')) {
        echo "Ok\n";
index d7a55895ef2434a4762c5bcc8da4b5d128abad60..ded3fbee7c4da334472b4b2c34d07586cb8186b2 100644 (file)
@@ -15,7 +15,7 @@ $sizes = array(7, 22, 54, 17, 27, 15, 1000);
 
 var_dump(gztell($h));
 foreach ($sizes as $size) { 
-   echo "bytes written=".gzwrite($h, str_repeat('1', $size))."\n";;
+   echo "bytes written=".gzwrite($h, str_repeat('1', $size))."\n";
    echo "tell=".gztell($h)."\n";
 }
 
@@ -39,4 +39,4 @@ bytes written=15
 tell=142
 bytes written=1000
 tell=1142
-===DONE===
\ No newline at end of file
+===DONE===
index 37c977789f541e6415fefd296485b2bc9431e70a..54555fa7ba4df3cd99b132973940cf59c5238f6b 100644 (file)
@@ -6,7 +6,7 @@ inflate_get_read_len()
 <?php
 
 $uncompressed = "Hello world.";
-$random_junk = str_repeat("qebsouesl", 128);;
+$random_junk = str_repeat("qebsouesl", 128);
 
 $compressed = zlib_encode($uncompressed, ZLIB_ENCODING_DEFLATE);
 $compressed_len = strlen($compressed);
index d042840515f4107c763d48db96dc70a272e7a5c4..01387b8122cf5ba5fd4cc7aaf72de3076a89098c 100644 (file)
@@ -6,7 +6,7 @@ inflate_get_status()
 <?php
 
 $uncompressed = "Hello world.";
-$random_junk = str_repeat("qebsouesl", 128);;
+$random_junk = str_repeat("qebsouesl", 128);
 
 $compressed = zlib_encode($uncompressed, ZLIB_ENCODING_DEFLATE);
 $compressed_len = strlen($compressed);
index 4cd6cca854735946cc730bae0d1fd2a4fa670832..537021abd63aecfd4dbe48d4966c9f0580608cbb 100644 (file)
@@ -1007,7 +1007,7 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, zen
                                /* fall through */
 
                        case PHP_STREAM_PERSISTENT_FAILURE:
-                               efree(persistent_id);;
+                               efree(persistent_id);
                                return ret;
                }
        }
index c9a946155ae28722737f4fce89153dadef2c1687..8ab120a4b6e02211c023793a9ba23548523b0d1e 100644 (file)
@@ -1275,7 +1275,7 @@ static void fpm_conf_cleanup(int which, void *arg) /* {{{ */
 static void fpm_conf_ini_parser_include(char *inc, void *arg) /* {{{ */
 {
        char *filename;
-       int *error = (int *)arg;;
+       int *error = (int *)arg;
 #ifdef HAVE_GLOB
        glob_t g;
 #endif
@@ -1490,17 +1490,17 @@ static void fpm_conf_ini_parser(zval *arg1, zval *arg2, zval *arg3, int callback
        switch(callback_type) {
                case ZEND_INI_PARSER_ENTRY:
                        fpm_conf_ini_parser_entry(arg1, arg2, error);
-                       break;;
+                       break;
                case ZEND_INI_PARSER_SECTION:
                        fpm_conf_ini_parser_section(arg1, error);
-                       break;;
+                       break;
                case ZEND_INI_PARSER_POP_ENTRY:
                        fpm_conf_ini_parser_array(arg1, arg3, arg2, error);
-                       break;;
+                       break;
                default:
                        zlog(ZLOG_ERROR, "[%s:%d] Unknown INI syntax", ini_filename, ini_lineno);
                        *error = 1;
-                       break;;
+                       break;
        }
 }
 /* }}} */
index a1b9886f3eb0310dce807681a81dab92e10a1e64..8060c2be8b55099f54b402048ffa735aed2750c5 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing ob_clean() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing ob_clean() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( ob_clean($extra_arg) );
 
 echo "Done";
index 7675f009e0b00528c96e529e4e3e40a003e668e2..2cd9a64e0d63d6dff9bd5d231068a57fe75e2f2e 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing ob_end_flush() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing ob_end_flush() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( ob_end_flush($extra_arg) );
 
 echo "Done";
index f98504006a07e33614ed1e982e3f6a0039eab0c4..f24a19b8cec01ea2a83be04b47cca92c410e54cc 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing ob_flush() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing ob_flush() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( ob_flush($extra_arg) );
 
 echo "Done";
index 4719bdd72e34ee17542f6430dc8119bf03f9bfa0..9694da54a0037592909437e8a1679d9a33150d67 100644 (file)
@@ -12,7 +12,7 @@ echo "*** Testing ob_get_level() : error conditions ***\n";
 
 // One argument
 echo "\n-- Testing ob_get_level() function with one argument --\n";
-$extra_arg = 10;;
+$extra_arg = 10;
 var_dump( ob_get_level($extra_arg) );
 
 echo "Done";