diff options
| author | cjihrig <cjihrig@gmail.com> | 2019-02-10 12:17:53 -0500 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2019-02-13 08:19:41 -0500 |
| commit | 8ecf313324e619d7211adaee76c6b7bb1882e12b (patch) | |
| tree | 9e42767303e0d43629cdb98e0428812910962d73 /src/node_report.cc | |
| parent | 0109e121d3a2f87c4bad75ac05436b56c9fd3407 (diff) | |
| download | android-node-v8-8ecf313324e619d7211adaee76c6b7bb1882e12b.tar.gz android-node-v8-8ecf313324e619d7211adaee76c6b7bb1882e12b.tar.bz2 android-node-v8-8ecf313324e619d7211adaee76c6b7bb1882e12b.zip | |
os,report: use UV_MAXHOSTNAMESIZE
UV_MAXHOSTNAMESIZE was introduced in libuv 1.26.0. Use this
instead of including multiple header files, adding fallback
ifdef logic, and remembering to add one to the buffer size
for the terminating nul character with MAXHOSTNAMELEN.
PR-URL: https://github.com/nodejs/node/pull/26038
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/node_report.cc')
| -rw-r--r-- | src/node_report.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/node_report.cc b/src/node_report.cc index 1a459a2d1c..8f882b9887 100644 --- a/src/node_report.cc +++ b/src/node_report.cc @@ -47,15 +47,6 @@ extern char** environ; #endif -#ifdef __POSIX__ -# include <netdb.h> // MAXHOSTNAMELEN on Solaris. -# include <sys/param.h> // MAXHOSTNAMELEN on Linux and the BSDs. -#endif // __POSIX__ - -#ifndef MAXHOSTNAMELEN -# define MAXHOSTNAMELEN 256 -#endif // MAXHOSTNAMELEN - namespace report { using node::arraysize; using node::Environment; @@ -377,7 +368,7 @@ static void PrintVersionInformation(JSONWriter* writer) { writer->json_keyvalue("osMachine", os_info.machine); } - char host[MAXHOSTNAMELEN + 1]; + char host[UV_MAXHOSTNAMESIZE]; size_t host_size = sizeof(host); if (uv_os_gethostname(host, &host_size) == 0) |