Browse Source

src: more lint after cpplint tightening

Commit 847c6d9 adds a 'project headers before system headers' check
to cpplint. Update the files in src/ to make the linter pass again.
v0.11.5-release
Ben Noordhuis 12 years ago
parent
commit
02cab97490
  1. 10
      src/cares_wrap.cc
  2. 2
      src/handle_wrap.cc
  3. 3
      src/handle_wrap.h
  4. 82
      src/node.cc
  5. 16
      src/node.h
  6. 17
      src/node_counters.h
  7. 20
      src/node_crypto.cc
  8. 10
      src/node_crypto.h
  9. 16
      src/node_http_parser.cc
  10. 4
      src/node_internals.h
  11. 2
      src/node_javascript.cc
  12. 2
      src/node_win32_etw_provider.h
  13. 6
      src/node_win32_perfctr_provider.cc
  14. 12
      src/node_zlib.cc
  15. 6
      src/pipe_wrap.cc
  16. 3
      src/smalloc.cc
  17. 6
      src/stream_wrap.cc
  18. 8
      src/string_bytes.cc
  19. 6
      src/tcp_wrap.cc
  20. 6
      src/tty_wrap.cc
  21. 4
      src/udp_wrap.cc
  22. 2
      src/uv.cc

10
src/cares_wrap.cc

@ -19,11 +19,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#define CARES_STATICLIB #define CARES_STATICLIB
#include "ares.h" #include "ares.h"
#include "node.h" #include "node.h"
@ -31,6 +26,11 @@
#include "tree.h" #include "tree.h"
#include "uv.h" #include "uv.h"
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#if defined(__ANDROID__) || \ #if defined(__ANDROID__) || \
defined(__MINGW32__) || \ defined(__MINGW32__) || \
defined(__OpenBSD__) || \ defined(__OpenBSD__) || \

2
src/handle_wrap.cc

@ -19,9 +19,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "handle_wrap.h"
#include "node.h" #include "node.h"
#include "queue.h" #include "queue.h"
#include "handle_wrap.h"
namespace node { namespace node {

3
src/handle_wrap.h

@ -22,7 +22,10 @@
#ifndef SRC_HANDLE_WRAP_H_ #ifndef SRC_HANDLE_WRAP_H_
#define SRC_HANDLE_WRAP_H_ #define SRC_HANDLE_WRAP_H_
#include "node.h"
#include "queue.h" #include "queue.h"
#include "uv.h"
#include "v8.h"
namespace node { namespace node {

82
src/node.cc

@ -20,69 +20,69 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "node.h" #include "node.h"
#include "req_wrap.h" #include "node_buffer.h"
#include "handle_wrap.h" #include "node_constants.h"
#include "string_bytes.h" #include "node_file.h"
#include "node_http_parser.h"
#include "node_javascript.h"
#include "node_script.h"
#include "node_version.h"
#include "ares.h" #if defined HAVE_PERFCTR
#include "uv.h" #include "node_counters.h"
#endif
#if HAVE_OPENSSL
#include "node_crypto.h"
#endif
#include "v8-debug.h"
#if defined HAVE_DTRACE || defined HAVE_ETW || defined HAVE_SYSTEMTAP #if defined HAVE_DTRACE || defined HAVE_ETW || defined HAVE_SYSTEMTAP
# include "node_dtrace.h" #include "node_dtrace.h"
#endif #endif
#if defined HAVE_PERFCTR
# include "node_counters.h" #if HAVE_SYSTEMTAP
#include "node_provider.h"
#endif #endif
#include "ares.h"
#include "handle_wrap.h"
#include "req_wrap.h"
#include "string_bytes.h"
#include "uv.h"
#include "v8-debug.h"
#include "zlib.h"
#include <assert.h>
#include <errno.h>
#include <limits.h> // PATH_MAX
#include <locale.h> #include <locale.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if !defined(_MSC_VER) #include <sys/types.h>
#include <strings.h>
#else #if defined(_MSC_VER)
#define strcasecmp _stricmp
#endif
#include <limits.h> /* PATH_MAX */
#include <assert.h>
#if !defined(_MSC_VER)
#include <unistd.h> /* setuid, getuid */
#else
#include <direct.h> #include <direct.h>
#include <io.h>
#include <process.h> #include <process.h>
#include <strings.h>
#define strcasecmp _stricmp
#define getpid _getpid #define getpid _getpid
#include <io.h>
#define umask _umask #define umask _umask
typedef int mode_t; typedef int mode_t;
#else
#include <unistd.h> // setuid, getuid
#endif #endif
#include <errno.h>
#include <sys/types.h>
#include "zlib.h"
#if defined(__POSIX__) && !defined(__ANDROID__) #if defined(__POSIX__) && !defined(__ANDROID__)
# include <pwd.h> /* getpwnam() */ #include <pwd.h> // getpwnam()
# include <grp.h> /* getgrnam() */ #include <grp.h> // getgrnam()
#endif #endif
#include "node_buffer.h"
#include "node_file.h"
#include "node_http_parser.h"
#include "node_constants.h"
#include "node_javascript.h"
#include "node_version.h"
#if HAVE_OPENSSL
# include "node_crypto.h"
#endif
#if HAVE_SYSTEMTAP
#include "node_provider.h"
#endif
#include "node_script.h"
#ifdef __APPLE__ #ifdef __APPLE__
# include <crt_externs.h> #include <crt_externs.h>
# define environ (*_NSGetEnviron()) #define environ (*_NSGetEnviron())
#elif !defined(_MSC_VER) #elif !defined(_MSC_VER)
extern char **environ; extern char **environ;
#endif #endif

16
src/node.h

@ -58,14 +58,7 @@
# define SIGKILL 9 # define SIGKILL 9
#endif #endif
#include "node_version.h" /* NODE_MODULE_VERSION */ #include "node_version.h" // NODE_MODULE_VERSION
#include "uv.h"
#include "v8.h"
#include <sys/types.h> /* struct stat */
#include <sys/stat.h>
#include <assert.h>
#include "node_object_wrap.h" #include "node_object_wrap.h"
// Forward-declare these functions now to stop MSVS from becoming // Forward-declare these functions now to stop MSVS from becoming
@ -99,9 +92,14 @@ NODE_EXTERN v8::Handle<v8::Value> MakeCallback(
} // namespace node } // namespace node
#if NODE_WANT_INTERNALS #if NODE_WANT_INTERNALS
# include "node_internals.h" #include "node_internals.h"
#endif #endif
#include "uv.h"
#include "v8.h"
#include <assert.h>
#ifndef NODE_STRINGIFY #ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)
#define NODE_STRINGIFY_HELPER(n) #n #define NODE_STRINGIFY_HELPER(n) #n

17
src/node_counters.h

@ -23,14 +23,6 @@
#define SRC_NODE_COUNTERS_H_ #define SRC_NODE_COUNTERS_H_
#include "node.h" #include "node.h"
#include "v8.h"
namespace node {
void InitPerfCounters(v8::Handle<v8::Object> target);
void TermPerfCounters(v8::Handle<v8::Object> target);
} // namespace node
#ifdef HAVE_PERFCTR #ifdef HAVE_PERFCTR
#include "node_win32_perfctr_provider.h" #include "node_win32_perfctr_provider.h"
@ -50,4 +42,13 @@ void TermPerfCounters(v8::Handle<v8::Object> target);
#define NODE_COUNT_PIPE_BYTES_RECV(bytes) #define NODE_COUNT_PIPE_BYTES_RECV(bytes)
#endif #endif
#include "v8.h"
namespace node {
void InitPerfCounters(v8::Handle<v8::Object> target);
void TermPerfCounters(v8::Handle<v8::Object> target);
} // namespace node
#endif // SRC_NODE_COUNTERS_H_ #endif // SRC_NODE_COUNTERS_H_

20
src/node_crypto.cc

@ -19,28 +19,28 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "node.h"
#include "node_buffer.h"
#include "node_crypto.h" #include "node_crypto.h"
#include "node_crypto_bio.h" #include "node_crypto_bio.h"
#include "node_crypto_groups.h" #include "node_crypto_groups.h"
#include "v8.h" #include "node_root_certs.h"
#include "node.h"
#include "node_buffer.h"
#include "string_bytes.h" #include "string_bytes.h"
#include "node_root_certs.h" #include "v8.h"
#include <errno.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef _MSC_VER
#if defined(_MSC_VER)
#define strcasecmp _stricmp #define strcasecmp _stricmp
#endif #endif
#include <stdlib.h>
#include <errno.h>
#if OPENSSL_VERSION_NUMBER >= 0x10000000L #if OPENSSL_VERSION_NUMBER >= 0x10000000L
# define OPENSSL_CONST const #define OPENSSL_CONST const
#else #else
# define OPENSSL_CONST #define OPENSSL_CONST
#endif #endif
#define ASSERT_IS_STRING_OR_BUFFER(val) do { \ #define ASSERT_IS_STRING_OR_BUFFER(val) do { \

10
src/node_crypto.h

@ -23,8 +23,12 @@
#define SRC_NODE_CRYPTO_H_ #define SRC_NODE_CRYPTO_H_
#include "node.h" #include "node.h"
#include "node_object_wrap.h" #include "node_object_wrap.h"
#ifdef OPENSSL_NPN_NEGOTIATED
#include "node_buffer.h"
#endif
#include "v8.h" #include "v8.h"
#include <openssl/ssl.h> #include <openssl/ssl.h>
@ -37,10 +41,6 @@
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/pkcs12.h> #include <openssl/pkcs12.h>
#ifdef OPENSSL_NPN_NEGOTIATED
#include "node_buffer.h"
#endif
#define EVP_F_EVP_DECRYPTFINAL 101 #define EVP_F_EVP_DECRYPTFINAL 101

16
src/node_http_parser.cc

@ -19,19 +19,19 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "node_http_parser.h"
#include "v8.h"
#include "node.h" #include "node.h"
#include "node_buffer.h" #include "node_buffer.h"
#include "node_http_parser.h"
#include "v8.h"
#include <string.h> /* strdup() */ #include <stdlib.h> // free()
#if !defined(_MSC_VER) #include <string.h> // strdup()
#include <strings.h> /* strcasecmp() */
#else #if defined(_MSC_VER)
#define strcasecmp _stricmp #define strcasecmp _stricmp
#else
#include <strings.h> // strcasecmp()
#endif #endif
#include <stdlib.h> /* free() */
// This is a binding to http_parser (https://github.com/joyent/http-parser) // This is a binding to http_parser (https://github.com/joyent/http-parser)
// The goal is to decouple sockets from parsing for more javascript-level // The goal is to decouple sockets from parsing for more javascript-level

4
src/node_internals.h

@ -22,11 +22,11 @@
#ifndef SRC_NODE_INTERNALS_H_ #ifndef SRC_NODE_INTERNALS_H_
#define SRC_NODE_INTERNALS_H_ #define SRC_NODE_INTERNALS_H_
#include "v8.h"
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include "v8.h"
struct sockaddr; struct sockaddr;
namespace node { namespace node {

2
src/node_javascript.cc

@ -19,9 +19,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "v8.h"
#include "node.h" #include "node.h"
#include "node_natives.h" #include "node_natives.h"
#include "v8.h"
#include <string.h> #include <string.h>
#if !defined(_MSC_VER) #if !defined(_MSC_VER)

2
src/node_win32_etw_provider.h

@ -22,8 +22,8 @@
#ifndef SRC_NODE_WIN32_ETW_PROVIDER_H_ #ifndef SRC_NODE_WIN32_ETW_PROVIDER_H_
#define SRC_NODE_WIN32_ETW_PROVIDER_H_ #define SRC_NODE_WIN32_ETW_PROVIDER_H_
#include <evntprov.h>
#include "node_dtrace.h" #include "node_dtrace.h"
#include <evntprov.h>
namespace node { namespace node {

6
src/node_win32_perfctr_provider.cc

@ -19,12 +19,12 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#define __INIT_node_perfctr_provider_IMP
#include "node_counters.h" #include "node_counters.h"
#include <perflib.h> #include "node_perfctr_provider.h"
#include "node_win32_perfctr_provider.h" #include "node_win32_perfctr_provider.h"
#define __INIT_node_perfctr_provider_IMP #include <perflib.h>
#include <node_perfctr_provider.h>
typedef ULONG (WINAPI *PerfStartProviderExFunc)( typedef ULONG (WINAPI *PerfStartProviderExFunc)(
__in LPGUID ProviderGuid, __in LPGUID ProviderGuid,

12
src/node_zlib.cc

@ -19,18 +19,16 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "node.h"
#include "node_buffer.h"
#include "v8.h" #include "v8.h"
#include "zlib.h"
#include <errno.h> #include <errno.h>
#include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include "zlib.h"
#include "node.h"
#include "node_buffer.h"
namespace node { namespace node {
using v8::FunctionCallbackInfo; using v8::FunctionCallbackInfo;

6
src/pipe_wrap.cc

@ -19,13 +19,13 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "pipe_wrap.h"
#include "node.h" #include "node.h"
#include "node_buffer.h" #include "node_buffer.h"
#include "req_wrap.h"
#include "handle_wrap.h" #include "handle_wrap.h"
#include "stream_wrap.h"
#include "pipe_wrap.h"
#include "node_wrap.h" #include "node_wrap.h"
#include "req_wrap.h"
#include "stream_wrap.h"
namespace node { namespace node {

3
src/smalloc.cc

@ -19,10 +19,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "smalloc.h"
#include "node.h" #include "node.h"
#include "node_internals.h" #include "node_internals.h"
#include "smalloc.h"
#include "v8.h" #include "v8.h"
#include "v8-profiler.h" #include "v8-profiler.h"

6
src/stream_wrap.cc

@ -19,15 +19,15 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "stream_wrap.h"
#include "node.h" #include "node.h"
#include "node_buffer.h" #include "node_buffer.h"
#include "node_counters.h"
#include "handle_wrap.h" #include "handle_wrap.h"
#include "stream_wrap.h"
#include "pipe_wrap.h" #include "pipe_wrap.h"
#include "tcp_wrap.h"
#include "req_wrap.h" #include "req_wrap.h"
#include "tcp_wrap.h"
#include "udp_wrap.h" #include "udp_wrap.h"
#include "node_counters.h"
#include <stdlib.h> // abort() #include <stdlib.h> // abort()
#include <limits.h> // INT_MAX #include <limits.h> // INT_MAX

8
src/string_bytes.cc

@ -21,14 +21,14 @@
#include "string_bytes.h" #include "string_bytes.h"
#include <assert.h>
#include <string.h> // memcpy
#include <limits.h>
#include "node.h" #include "node.h"
#include "node_buffer.h" #include "node_buffer.h"
#include "v8.h" #include "v8.h"
#include <assert.h>
#include <limits.h>
#include <string.h> // memcpy
// When creating strings >= this length v8's gc spins up and consumes // When creating strings >= this length v8's gc spins up and consumes
// most of the execution time. For these cases it's more performant to // most of the execution time. For these cases it's more performant to
// use external string resources. // use external string resources.

6
src/tcp_wrap.cc

@ -19,13 +19,13 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tcp_wrap.h"
#include "node.h" #include "node.h"
#include "node_buffer.h" #include "node_buffer.h"
#include "req_wrap.h" #include "node_wrap.h"
#include "handle_wrap.h" #include "handle_wrap.h"
#include "req_wrap.h"
#include "stream_wrap.h" #include "stream_wrap.h"
#include "tcp_wrap.h"
#include "node_wrap.h"
#include <stdlib.h> #include <stdlib.h>

6
src/tty_wrap.cc

@ -19,13 +19,13 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tty_wrap.h"
#include "node.h" #include "node.h"
#include "node_buffer.h" #include "node_buffer.h"
#include "req_wrap.h"
#include "handle_wrap.h" #include "handle_wrap.h"
#include "stream_wrap.h"
#include "tty_wrap.h"
#include "node_wrap.h" #include "node_wrap.h"
#include "req_wrap.h"
#include "stream_wrap.h"
namespace node { namespace node {

4
src/udp_wrap.cc

@ -19,11 +19,11 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "udp_wrap.h"
#include "node.h" #include "node.h"
#include "node_buffer.h" #include "node_buffer.h"
#include "req_wrap.h"
#include "handle_wrap.h" #include "handle_wrap.h"
#include "udp_wrap.h" #include "req_wrap.h"
#include <stdlib.h> #include <stdlib.h>

2
src/uv.cc

@ -19,8 +19,8 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE. // USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "node.h"
#include "uv.h" #include "uv.h"
#include "node.h"
namespace node { namespace node {
namespace uv { namespace uv {

Loading…
Cancel
Save