Fix accidental short-circuiting when comparing fds (& warnings)

diff --git a/phpdbg.c b/phpdbg.c
index ab2f8256ee59fd08f413f361b6396cfeec091555..0c4e2f11bfe7db360707e76bf86e85324281e557 100644 (file)
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -534,7 +534,7 @@ static size_t phpdbg_stdiop_write(php_stream *stream, const char *buf, size_t co
        while (data->fd >= 0) {
                struct stat stat[3];
                memset(stat, 0, sizeof(stat));
-               if ((fstat(fileno(stderr), &stat[2]) < 0 && fstat(fileno(stdout), &stat[0]) < 0) || fstat(data->fd, &stat[1]) < 0) {
+               if (((fstat(fileno(stderr), &stat[2]) < 0) & (fstat(fileno(stdout), &stat[0]) < 0)) | (fstat(data->fd, &stat[1]) < 0)) {
                        break;
                }
 

diff --git a/phpdbg_set.c b/phpdbg_set.c
index e5d8d6d1dba3e094e6b094665357577beaa76ced..da850719416b27a64b4b315c66c3abe24ccfd6c7 100644 (file)
--- a/phpdbg_set.c
+++ b/phpdbg_set.c
@@ -69,9 +69,9 @@ PHPDBG_SET(break) /* {{{ */
                        } else {
                                phpdbg_breakbase_t *brake = phpdbg_find_breakbase(param->num TSRMLS_CC);
                                if (brake) {
-                                       phpdbg_writeln("setbreak", "id=\"%d\" active=\"%s\"", "Breakpoint #%d %s", param->num, brake->disabled ? "off" : "on");
+                                       phpdbg_writeln("setbreak", "id=\"%ld\" active=\"%s\"", "Breakpoint #%ld %s", param->num, brake->disabled ? "off" : "on");
                                } else {
-                                       phpdbg_error("setbreak", "type=\"nobreak\" id=\"%d\"", "Failed to find breakpoint #%ld", param->num);
+                                       phpdbg_error("setbreak", "type=\"nobreak\" id=\"%ld\"", "Failed to find breakpoint #%ld", param->num);
                                }
                        }
                } break;