summaryrefslogtreecommitdiff
path: root/main/streams/xp_socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/streams/xp_socket.c')
-rw-r--r--main/streams/xp_socket.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 46b23b63ad..f3370e89f7 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -1,7 +1,5 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 7 |
- +----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
@@ -25,7 +23,7 @@
# undef AF_UNIX
#endif
-#if defined(AF_UNIX)
+#ifdef AF_UNIX
#include <sys/un.h>
#endif
@@ -106,7 +104,7 @@ retry:
}
estr = php_socket_strerror(err, NULL, 0);
- php_error_docref(NULL, E_NOTICE, "send of " ZEND_LONG_FMT " bytes failed with errno=%d %s",
+ php_error_docref(NULL, E_NOTICE, "Send of " ZEND_LONG_FMT " bytes failed with errno=%d %s",
(zend_long)count, err, estr);
efree(estr);
}
@@ -239,7 +237,7 @@ static int php_sockop_flush(php_stream *stream)
static int php_sockop_stat(php_stream *stream, php_stream_statbuf *ssb)
{
-#if ZEND_WIN32
+#ifdef ZEND_WIN32
return 0;
#else
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
@@ -451,12 +449,11 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
#endif
default:
- return PHP_STREAM_OPTION_RETURN_NOTIMPL;
+ break;
}
-
- default:
- return PHP_STREAM_OPTION_RETURN_NOTIMPL;
}
+
+ return PHP_STREAM_OPTION_RETURN_NOTIMPL;
}
static int php_sockop_cast(php_stream *stream, int castas, void **ret)