Skip to content

Commit 90f1200

Browse files
addaleaxtargos
authored andcommittedSep 25, 2018
src: define zlib constants in node_zlib.cc
This is in order to avoid having two separate definitions for `node_zlib_mode`. PR-URL: #23019 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gus Caplan <[email protected]>
1 parent d72867e commit 90f1200

File tree

3 files changed

+55
-63
lines changed

3 files changed

+55
-63
lines changed
 

‎src/node_constants.cc

-63
Original file line numberDiff line numberDiff line change
@@ -1241,69 +1241,6 @@ void DefineCryptoConstants(Local<Object> target) {
12411241
NODE_DEFINE_CONSTANT(target, INT_MAX);
12421242
}
12431243

1244-
void DefineZlibConstants(Local<Object> target) {
1245-
NODE_DEFINE_CONSTANT(target, Z_NO_FLUSH);
1246-
NODE_DEFINE_CONSTANT(target, Z_PARTIAL_FLUSH);
1247-
NODE_DEFINE_CONSTANT(target, Z_SYNC_FLUSH);
1248-
NODE_DEFINE_CONSTANT(target, Z_FULL_FLUSH);
1249-
NODE_DEFINE_CONSTANT(target, Z_FINISH);
1250-
NODE_DEFINE_CONSTANT(target, Z_BLOCK);
1251-
1252-
// return/error codes
1253-
NODE_DEFINE_CONSTANT(target, Z_OK);
1254-
NODE_DEFINE_CONSTANT(target, Z_STREAM_END);
1255-
NODE_DEFINE_CONSTANT(target, Z_NEED_DICT);
1256-
NODE_DEFINE_CONSTANT(target, Z_ERRNO);
1257-
NODE_DEFINE_CONSTANT(target, Z_STREAM_ERROR);
1258-
NODE_DEFINE_CONSTANT(target, Z_DATA_ERROR);
1259-
NODE_DEFINE_CONSTANT(target, Z_MEM_ERROR);
1260-
NODE_DEFINE_CONSTANT(target, Z_BUF_ERROR);
1261-
NODE_DEFINE_CONSTANT(target, Z_VERSION_ERROR);
1262-
1263-
NODE_DEFINE_CONSTANT(target, Z_NO_COMPRESSION);
1264-
NODE_DEFINE_CONSTANT(target, Z_BEST_SPEED);
1265-
NODE_DEFINE_CONSTANT(target, Z_BEST_COMPRESSION);
1266-
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_COMPRESSION);
1267-
NODE_DEFINE_CONSTANT(target, Z_FILTERED);
1268-
NODE_DEFINE_CONSTANT(target, Z_HUFFMAN_ONLY);
1269-
NODE_DEFINE_CONSTANT(target, Z_RLE);
1270-
NODE_DEFINE_CONSTANT(target, Z_FIXED);
1271-
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_STRATEGY);
1272-
NODE_DEFINE_CONSTANT(target, ZLIB_VERNUM);
1273-
1274-
enum node_zlib_mode {
1275-
NONE,
1276-
DEFLATE,
1277-
INFLATE,
1278-
GZIP,
1279-
GUNZIP,
1280-
DEFLATERAW,
1281-
INFLATERAW,
1282-
UNZIP
1283-
};
1284-
1285-
NODE_DEFINE_CONSTANT(target, DEFLATE);
1286-
NODE_DEFINE_CONSTANT(target, INFLATE);
1287-
NODE_DEFINE_CONSTANT(target, GZIP);
1288-
NODE_DEFINE_CONSTANT(target, GUNZIP);
1289-
NODE_DEFINE_CONSTANT(target, DEFLATERAW);
1290-
NODE_DEFINE_CONSTANT(target, INFLATERAW);
1291-
NODE_DEFINE_CONSTANT(target, UNZIP);
1292-
1293-
NODE_DEFINE_CONSTANT(target, Z_MIN_WINDOWBITS);
1294-
NODE_DEFINE_CONSTANT(target, Z_MAX_WINDOWBITS);
1295-
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_WINDOWBITS);
1296-
NODE_DEFINE_CONSTANT(target, Z_MIN_CHUNK);
1297-
NODE_DEFINE_CONSTANT(target, Z_MAX_CHUNK);
1298-
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_CHUNK);
1299-
NODE_DEFINE_CONSTANT(target, Z_MIN_MEMLEVEL);
1300-
NODE_DEFINE_CONSTANT(target, Z_MAX_MEMLEVEL);
1301-
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_MEMLEVEL);
1302-
NODE_DEFINE_CONSTANT(target, Z_MIN_LEVEL);
1303-
NODE_DEFINE_CONSTANT(target, Z_MAX_LEVEL);
1304-
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_LEVEL);
1305-
}
1306-
13071244
void DefineDLOpenConstants(Local<Object> target) {
13081245
#ifdef RTLD_LAZY
13091246
NODE_DEFINE_CONSTANT(target, RTLD_LAZY);

‎src/node_internals.h

+2
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,8 @@ void GetEGid(const v8::FunctionCallbackInfo<v8::Value>& args);
936936
void GetGroups(const v8::FunctionCallbackInfo<v8::Value>& args);
937937
#endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__)
938938

939+
void DefineZlibConstants(v8::Local<v8::Object> target);
940+
939941
} // namespace node
940942

941943
void napi_module_register_by_symbol(v8::Local<v8::Object> exports,

‎src/node_zlib.cc

+53
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,59 @@ void Initialize(Local<Object> target,
773773
}
774774

775775
} // anonymous namespace
776+
777+
void DefineZlibConstants(Local<Object> target) {
778+
NODE_DEFINE_CONSTANT(target, Z_NO_FLUSH);
779+
NODE_DEFINE_CONSTANT(target, Z_PARTIAL_FLUSH);
780+
NODE_DEFINE_CONSTANT(target, Z_SYNC_FLUSH);
781+
NODE_DEFINE_CONSTANT(target, Z_FULL_FLUSH);
782+
NODE_DEFINE_CONSTANT(target, Z_FINISH);
783+
NODE_DEFINE_CONSTANT(target, Z_BLOCK);
784+
785+
// return/error codes
786+
NODE_DEFINE_CONSTANT(target, Z_OK);
787+
NODE_DEFINE_CONSTANT(target, Z_STREAM_END);
788+
NODE_DEFINE_CONSTANT(target, Z_NEED_DICT);
789+
NODE_DEFINE_CONSTANT(target, Z_ERRNO);
790+
NODE_DEFINE_CONSTANT(target, Z_STREAM_ERROR);
791+
NODE_DEFINE_CONSTANT(target, Z_DATA_ERROR);
792+
NODE_DEFINE_CONSTANT(target, Z_MEM_ERROR);
793+
NODE_DEFINE_CONSTANT(target, Z_BUF_ERROR);
794+
NODE_DEFINE_CONSTANT(target, Z_VERSION_ERROR);
795+
796+
NODE_DEFINE_CONSTANT(target, Z_NO_COMPRESSION);
797+
NODE_DEFINE_CONSTANT(target, Z_BEST_SPEED);
798+
NODE_DEFINE_CONSTANT(target, Z_BEST_COMPRESSION);
799+
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_COMPRESSION);
800+
NODE_DEFINE_CONSTANT(target, Z_FILTERED);
801+
NODE_DEFINE_CONSTANT(target, Z_HUFFMAN_ONLY);
802+
NODE_DEFINE_CONSTANT(target, Z_RLE);
803+
NODE_DEFINE_CONSTANT(target, Z_FIXED);
804+
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_STRATEGY);
805+
NODE_DEFINE_CONSTANT(target, ZLIB_VERNUM);
806+
807+
NODE_DEFINE_CONSTANT(target, DEFLATE);
808+
NODE_DEFINE_CONSTANT(target, INFLATE);
809+
NODE_DEFINE_CONSTANT(target, GZIP);
810+
NODE_DEFINE_CONSTANT(target, GUNZIP);
811+
NODE_DEFINE_CONSTANT(target, DEFLATERAW);
812+
NODE_DEFINE_CONSTANT(target, INFLATERAW);
813+
NODE_DEFINE_CONSTANT(target, UNZIP);
814+
815+
NODE_DEFINE_CONSTANT(target, Z_MIN_WINDOWBITS);
816+
NODE_DEFINE_CONSTANT(target, Z_MAX_WINDOWBITS);
817+
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_WINDOWBITS);
818+
NODE_DEFINE_CONSTANT(target, Z_MIN_CHUNK);
819+
NODE_DEFINE_CONSTANT(target, Z_MAX_CHUNK);
820+
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_CHUNK);
821+
NODE_DEFINE_CONSTANT(target, Z_MIN_MEMLEVEL);
822+
NODE_DEFINE_CONSTANT(target, Z_MAX_MEMLEVEL);
823+
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_MEMLEVEL);
824+
NODE_DEFINE_CONSTANT(target, Z_MIN_LEVEL);
825+
NODE_DEFINE_CONSTANT(target, Z_MAX_LEVEL);
826+
NODE_DEFINE_CONSTANT(target, Z_DEFAULT_LEVEL);
827+
}
828+
776829
} // namespace node
777830

778831
NODE_BUILTIN_MODULE_CONTEXT_AWARE(zlib, node::Initialize)

0 commit comments

Comments
 (0)
Please sign in to comment.