src: node_dtrace line continuations clean up

PR-URL: https://github.com/nodejs/node/pull/15777
Reviewed-By: Lance Ball <lball@redhat.com>
This commit is contained in:
Daniel Bevenius 2017-10-05 13:45:26 +02:00
parent 7205e0a0fe
commit 134d7d78a3

View File

@ -59,76 +59,76 @@ using v8::Object;
using v8::String; using v8::String;
using v8::Value; using v8::Value;
#define SLURP_STRING(obj, member, valp) \ #define SLURP_STRING(obj, member, valp) \
if (!(obj)->IsObject()) { \ if (!(obj)->IsObject()) { \
return env->ThrowError( \ return env->ThrowError( \
"expected object for " #obj " to contain string member " #member); \ "expected object for " #obj " to contain string member " #member); \
} \ } \
node::Utf8Value _##member(env->isolate(), \ node::Utf8Value _##member(env->isolate(), \
obj->Get(OneByteString(env->isolate(), #member))); \ obj->Get(OneByteString(env->isolate(), #member))); \
if ((*(const char **)valp = *_##member) == nullptr) \ if ((*(const char **)valp = *_##member) == nullptr) \
*(const char **)valp = "<unknown>"; *(const char **)valp = "<unknown>";
#define SLURP_INT(obj, member, valp) \ #define SLURP_INT(obj, member, valp) \
if (!(obj)->IsObject()) { \ if (!(obj)->IsObject()) { \
return env->ThrowError( \ return env->ThrowError( \
"expected object for " #obj " to contain integer member " #member); \ "expected object for " #obj " to contain integer member " #member); \
} \ } \
*valp = obj->Get(OneByteString(env->isolate(), #member)) \ *valp = obj->Get(OneByteString(env->isolate(), #member)) \
->Int32Value(); ->Int32Value();
#define SLURP_OBJECT(obj, member, valp) \ #define SLURP_OBJECT(obj, member, valp) \
if (!(obj)->IsObject()) { \ if (!(obj)->IsObject()) { \
return env->ThrowError( \ return env->ThrowError( \
"expected object for " #obj " to contain object member " #member); \ "expected object for " #obj " to contain object member " #member); \
} \ } \
*valp = Local<Object>::Cast(obj->Get(OneByteString(env->isolate(), #member))); *valp = Local<Object>::Cast(obj->Get(OneByteString(env->isolate(), #member)));
#define SLURP_CONNECTION(arg, conn) \ #define SLURP_CONNECTION(arg, conn) \
if (!(arg)->IsObject()) { \ if (!(arg)->IsObject()) { \
return env->ThrowError( \ return env->ThrowError( \
"expected argument " #arg " to be a connection object"); \ "expected argument " #arg " to be a connection object"); \
} \ } \
node_dtrace_connection_t conn; \ node_dtrace_connection_t conn; \
Local<Object> _##conn = Local<Object>::Cast(arg); \ Local<Object> _##conn = Local<Object>::Cast(arg); \
Local<Value> _handle = \ Local<Value> _handle = \
(_##conn)->Get(FIXED_ONE_BYTE_STRING(env->isolate(), "_handle")); \ (_##conn)->Get(FIXED_ONE_BYTE_STRING(env->isolate(), "_handle")); \
if (_handle->IsObject()) { \ if (_handle->IsObject()) { \
SLURP_INT(_handle.As<Object>(), fd, &conn.fd); \ SLURP_INT(_handle.As<Object>(), fd, &conn.fd); \
} else { \ } else { \
conn.fd = -1; \ conn.fd = -1; \
} \ } \
SLURP_STRING(_##conn, remoteAddress, &conn.remote); \ SLURP_STRING(_##conn, remoteAddress, &conn.remote); \
SLURP_INT(_##conn, remotePort, &conn.port); \ SLURP_INT(_##conn, remotePort, &conn.port); \
SLURP_INT(_##conn, bufferSize, &conn.buffered); SLURP_INT(_##conn, bufferSize, &conn.buffered);
#define SLURP_CONNECTION_HTTP_CLIENT(arg, conn) \ #define SLURP_CONNECTION_HTTP_CLIENT(arg, conn) \
if (!(arg)->IsObject()) { \ if (!(arg)->IsObject()) { \
return env->ThrowError( \ return env->ThrowError( \
"expected argument " #arg " to be a connection object"); \ "expected argument " #arg " to be a connection object"); \
} \ } \
node_dtrace_connection_t conn; \ node_dtrace_connection_t conn; \
Local<Object> _##conn = Local<Object>::Cast(arg); \ Local<Object> _##conn = Local<Object>::Cast(arg); \
SLURP_INT(_##conn, fd, &conn.fd); \ SLURP_INT(_##conn, fd, &conn.fd); \
SLURP_STRING(_##conn, host, &conn.remote); \ SLURP_STRING(_##conn, host, &conn.remote); \
SLURP_INT(_##conn, port, &conn.port); \ SLURP_INT(_##conn, port, &conn.port); \
SLURP_INT(_##conn, bufferSize, &conn.buffered); SLURP_INT(_##conn, bufferSize, &conn.buffered);
#define SLURP_CONNECTION_HTTP_CLIENT_RESPONSE(arg0, arg1, conn) \ #define SLURP_CONNECTION_HTTP_CLIENT_RESPONSE(arg0, arg1, conn) \
if (!(arg0)->IsObject()) { \ if (!(arg0)->IsObject()) { \
return env->ThrowError( \ return env->ThrowError( \
"expected argument " #arg0 " to be a connection object"); \ "expected argument " #arg0 " to be a connection object"); \
} \ } \
if (!(arg1)->IsObject()) { \ if (!(arg1)->IsObject()) { \
return env->ThrowError( \ return env->ThrowError( \
"expected argument " #arg1 " to be a connection object"); \ "expected argument " #arg1 " to be a connection object"); \
} \ } \
node_dtrace_connection_t conn; \ node_dtrace_connection_t conn; \
Local<Object> _##conn = Local<Object>::Cast(arg0); \ Local<Object> _##conn = Local<Object>::Cast(arg0); \
SLURP_INT(_##conn, fd, &conn.fd); \ SLURP_INT(_##conn, fd, &conn.fd); \
SLURP_INT(_##conn, bufferSize, &conn.buffered); \ SLURP_INT(_##conn, bufferSize, &conn.buffered); \
_##conn = Local<Object>::Cast(arg1); \ _##conn = Local<Object>::Cast(arg1); \
SLURP_STRING(_##conn, host, &conn.remote); \ SLURP_STRING(_##conn, host, &conn.remote); \
SLURP_INT(_##conn, port, &conn.port); SLURP_INT(_##conn, port, &conn.port);