grpc 1.60.2 → 1.61.0.pre2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (279) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +208 -165
  3. data/include/grpc/event_engine/event_engine.h +59 -12
  4. data/include/grpc/event_engine/internal/memory_allocator_impl.h +6 -0
  5. data/include/grpc/event_engine/internal/slice_cast.h +12 -0
  6. data/include/grpc/event_engine/memory_allocator.h +3 -1
  7. data/include/grpc/event_engine/slice.h +5 -0
  8. data/include/grpc/grpc_security.h +22 -1
  9. data/include/grpc/impl/call.h +29 -0
  10. data/include/grpc/impl/channel_arg_names.h +12 -1
  11. data/include/grpc/impl/slice_type.h +1 -1
  12. data/include/grpc/module.modulemap +1 -0
  13. data/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +54 -7
  14. data/src/core/ext/filters/backend_metrics/backend_metric_filter.h +20 -6
  15. data/src/core/ext/filters/channel_idle/channel_idle_filter.cc +10 -13
  16. data/src/core/ext/filters/channel_idle/channel_idle_filter.h +18 -10
  17. data/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +326 -0
  18. data/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +143 -0
  19. data/src/core/ext/filters/client_channel/backend_metric.cc +2 -2
  20. data/src/core/ext/filters/client_channel/client_channel.cc +32 -6
  21. data/src/core/ext/filters/client_channel/client_channel_internal.h +2 -0
  22. data/src/core/ext/filters/client_channel/global_subchannel_pool.cc +1 -1
  23. data/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc +54 -21
  24. data/src/core/ext/filters/client_channel/lb_policy/address_filtering.h +3 -2
  25. data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +2 -1
  26. data/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc +12 -15
  27. data/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h +8 -5
  28. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +139 -92
  29. data/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc +9 -4
  30. data/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc +9 -4
  31. data/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc +10 -11
  32. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +94 -93
  33. data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +5 -3
  34. data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +12 -15
  35. data/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +38 -16
  36. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +25 -28
  37. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +10 -10
  38. data/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc +37 -35
  39. data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +11 -9
  40. data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +504 -461
  41. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +232 -122
  42. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +8 -6
  43. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc +642 -251
  44. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.h +2 -6
  45. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc +7 -8
  46. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +2 -1
  47. data/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +3 -1
  48. data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +2 -2
  49. data/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +2 -2
  50. data/src/core/ext/filters/client_channel/resolver/polling_resolver.cc +6 -8
  51. data/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.cc +1031 -0
  52. data/src/core/ext/filters/client_channel/resolver/xds/xds_dependency_manager.h +277 -0
  53. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +128 -270
  54. data/src/core/ext/filters/client_channel/resolver/xds/{xds_resolver.h → xds_resolver_attributes.h} +5 -4
  55. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.cc +25 -0
  56. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver_trace.h +30 -0
  57. data/src/core/ext/filters/client_channel/retry_filter.cc +1 -0
  58. data/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc +35 -17
  59. data/src/core/ext/filters/deadline/deadline_filter.cc +12 -0
  60. data/src/core/ext/filters/fault_injection/fault_injection_filter.cc +17 -13
  61. data/src/core/ext/filters/fault_injection/fault_injection_filter.h +13 -4
  62. data/src/core/ext/filters/http/client/http_client_filter.cc +23 -32
  63. data/src/core/ext/filters/http/client/http_client_filter.h +10 -5
  64. data/src/core/ext/filters/http/client_authority_filter.cc +14 -14
  65. data/src/core/ext/filters/http/client_authority_filter.h +12 -4
  66. data/src/core/ext/filters/http/http_filters_plugin.cc +42 -20
  67. data/src/core/ext/filters/http/message_compress/compression_filter.cc +55 -80
  68. data/src/core/ext/filters/http/message_compress/compression_filter.h +54 -12
  69. data/src/core/ext/filters/http/message_compress/legacy_compression_filter.cc +325 -0
  70. data/src/core/ext/filters/http/message_compress/legacy_compression_filter.h +139 -0
  71. data/src/core/ext/filters/http/server/http_server_filter.cc +41 -41
  72. data/src/core/ext/filters/http/server/http_server_filter.h +11 -4
  73. data/src/core/ext/filters/message_size/message_size_filter.cc +56 -76
  74. data/src/core/ext/filters/message_size/message_size_filter.h +35 -23
  75. data/src/core/ext/filters/rbac/rbac_filter.cc +15 -11
  76. data/src/core/ext/filters/rbac/rbac_filter.h +11 -4
  77. data/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc +25 -13
  78. data/src/core/ext/filters/stateful_session/stateful_session_filter.cc +47 -50
  79. data/src/core/ext/filters/stateful_session/stateful_session_filter.h +21 -4
  80. data/src/core/ext/transport/chttp2/alpn/alpn.cc +1 -1
  81. data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +2 -2
  82. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +11 -2
  83. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +68 -145
  84. data/src/core/ext/transport/chttp2/transport/chttp2_transport.h +3 -3
  85. data/src/core/ext/transport/chttp2/transport/flow_control.cc +21 -82
  86. data/src/core/ext/transport/chttp2/transport/flow_control.h +1 -8
  87. data/src/core/ext/transport/chttp2/transport/frame.cc +506 -0
  88. data/src/core/ext/transport/chttp2/transport/frame.h +214 -0
  89. data/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +1 -1
  90. data/src/core/ext/transport/chttp2/transport/frame_settings.cc +33 -79
  91. data/src/core/ext/transport/chttp2/transport/frame_settings.h +4 -7
  92. data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +27 -36
  93. data/src/core/ext/transport/chttp2/transport/hpack_parser.h +0 -2
  94. data/src/core/ext/transport/chttp2/transport/http2_settings.cc +122 -32
  95. data/src/core/ext/transport/chttp2/transport/http2_settings.h +142 -37
  96. data/src/core/ext/transport/chttp2/transport/internal.h +1 -22
  97. data/src/core/ext/transport/chttp2/transport/parsing.cc +23 -37
  98. data/src/core/ext/transport/chttp2/transport/writing.cc +26 -58
  99. data/src/core/ext/transport/inproc/inproc_transport.cc +172 -13
  100. data/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h +712 -0
  101. data/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c +151 -0
  102. data/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h +33 -0
  103. data/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.c +133 -0
  104. data/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h +50 -0
  105. data/src/core/ext/xds/certificate_provider_store.cc +2 -1
  106. data/src/core/ext/xds/certificate_provider_store.h +0 -5
  107. data/src/core/ext/xds/xds_api.cc +31 -18
  108. data/src/core/ext/xds/xds_api.h +2 -2
  109. data/src/core/ext/xds/xds_bootstrap.h +3 -0
  110. data/src/core/ext/xds/xds_certificate_provider.cc +88 -287
  111. data/src/core/ext/xds/xds_certificate_provider.h +44 -111
  112. data/src/core/ext/xds/xds_client.cc +420 -414
  113. data/src/core/ext/xds/xds_client.h +31 -22
  114. data/src/core/ext/xds/xds_client_grpc.cc +3 -1
  115. data/src/core/ext/xds/xds_cluster.cc +104 -11
  116. data/src/core/ext/xds/xds_cluster.h +9 -1
  117. data/src/core/ext/xds/xds_cluster_specifier_plugin.cc +9 -5
  118. data/src/core/ext/xds/xds_common_types.cc +14 -10
  119. data/src/core/ext/xds/xds_endpoint.cc +9 -4
  120. data/src/core/ext/xds/xds_endpoint.h +5 -1
  121. data/src/core/ext/xds/xds_health_status.cc +12 -2
  122. data/src/core/ext/xds/xds_health_status.h +4 -2
  123. data/src/core/ext/xds/xds_http_rbac_filter.cc +5 -3
  124. data/src/core/ext/xds/xds_listener.cc +14 -8
  125. data/src/core/ext/xds/xds_resource_type_impl.h +6 -4
  126. data/src/core/ext/xds/xds_route_config.cc +34 -22
  127. data/src/core/ext/xds/xds_route_config.h +1 -0
  128. data/src/core/ext/xds/xds_server_config_fetcher.cc +61 -57
  129. data/src/core/ext/xds/xds_transport.h +3 -0
  130. data/src/core/ext/xds/xds_transport_grpc.cc +47 -50
  131. data/src/core/ext/xds/xds_transport_grpc.h +4 -0
  132. data/src/core/lib/channel/call_tracer.cc +12 -0
  133. data/src/core/lib/channel/call_tracer.h +17 -3
  134. data/src/core/lib/channel/channel_args.cc +24 -14
  135. data/src/core/lib/channel/channel_args.h +74 -13
  136. data/src/core/lib/channel/channel_stack.cc +27 -0
  137. data/src/core/lib/channel/channel_stack.h +10 -10
  138. data/src/core/lib/channel/connected_channel.cc +64 -18
  139. data/src/core/lib/channel/promise_based_filter.h +1041 -1
  140. data/src/core/lib/channel/server_call_tracer_filter.cc +43 -35
  141. data/src/core/lib/compression/compression_internal.cc +0 -3
  142. data/src/core/lib/event_engine/ares_resolver.cc +35 -14
  143. data/src/core/lib/event_engine/ares_resolver.h +9 -10
  144. data/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc +8 -1
  145. data/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc +132 -0
  146. data/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h +61 -0
  147. data/src/core/lib/event_engine/posix_engine/posix_engine.cc +52 -36
  148. data/src/core/lib/event_engine/posix_engine/posix_engine.h +4 -9
  149. data/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc +11 -3
  150. data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +9 -2
  151. data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +7 -0
  152. data/src/core/lib/event_engine/posix_engine/timer_manager.cc +17 -27
  153. data/src/core/lib/event_engine/posix_engine/timer_manager.h +0 -3
  154. data/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h +55 -0
  155. data/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc +114 -0
  156. data/src/core/lib/event_engine/windows/native_windows_dns_resolver.h +51 -0
  157. data/src/core/lib/event_engine/windows/windows_engine.cc +7 -7
  158. data/src/core/lib/experiments/config.cc +13 -0
  159. data/src/core/lib/experiments/config.h +3 -0
  160. data/src/core/lib/experiments/experiments.cc +245 -366
  161. data/src/core/lib/experiments/experiments.h +50 -156
  162. data/src/core/lib/gprpp/debug_location.h +13 -0
  163. data/src/core/lib/gprpp/dual_ref_counted.h +36 -7
  164. data/src/core/lib/gprpp/orphanable.h +27 -0
  165. data/src/core/lib/gprpp/ref_counted.h +63 -22
  166. data/src/core/lib/gprpp/ref_counted_ptr.h +70 -27
  167. data/src/core/lib/gprpp/ref_counted_string.h +13 -0
  168. data/src/core/lib/gprpp/status_helper.cc +1 -2
  169. data/src/core/lib/iomgr/combiner.cc +15 -51
  170. data/src/core/lib/iomgr/event_engine_shims/endpoint.cc +31 -0
  171. data/src/core/lib/iomgr/event_engine_shims/endpoint.h +16 -0
  172. data/src/core/lib/iomgr/tcp_client_posix.cc +4 -3
  173. data/src/core/lib/load_balancing/lb_policy.h +1 -1
  174. data/src/core/lib/promise/activity.cc +17 -2
  175. data/src/core/lib/promise/activity.h +5 -4
  176. data/src/core/lib/promise/all_ok.h +80 -0
  177. data/src/core/lib/promise/detail/join_state.h +2077 -0
  178. data/src/core/lib/promise/detail/promise_factory.h +1 -0
  179. data/src/core/lib/promise/detail/promise_like.h +8 -1
  180. data/src/core/lib/promise/detail/seq_state.h +3458 -150
  181. data/src/core/lib/promise/detail/status.h +42 -5
  182. data/src/core/lib/promise/for_each.h +13 -1
  183. data/src/core/lib/promise/if.h +4 -0
  184. data/src/core/lib/promise/latch.h +6 -3
  185. data/src/core/lib/promise/party.cc +33 -31
  186. data/src/core/lib/promise/party.h +142 -6
  187. data/src/core/lib/promise/poll.h +39 -13
  188. data/src/core/lib/promise/promise.h +4 -0
  189. data/src/core/lib/promise/seq.h +107 -7
  190. data/src/core/lib/promise/status_flag.h +196 -0
  191. data/src/core/lib/promise/try_join.h +132 -0
  192. data/src/core/lib/promise/try_seq.h +132 -10
  193. data/src/core/lib/resolver/endpoint_addresses.cc +0 -1
  194. data/src/core/lib/resolver/endpoint_addresses.h +48 -0
  195. data/src/core/lib/resource_quota/arena.h +2 -2
  196. data/src/core/lib/resource_quota/memory_quota.cc +57 -8
  197. data/src/core/lib/resource_quota/memory_quota.h +6 -0
  198. data/src/core/lib/security/authorization/grpc_server_authz_filter.cc +14 -11
  199. data/src/core/lib/security/authorization/grpc_server_authz_filter.h +14 -5
  200. data/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +4 -0
  201. data/src/core/lib/security/credentials/external/aws_external_account_credentials.h +4 -0
  202. data/src/core/lib/security/credentials/external/external_account_credentials.cc +28 -20
  203. data/src/core/lib/security/credentials/external/external_account_credentials.h +4 -0
  204. data/src/core/lib/security/credentials/external/file_external_account_credentials.cc +4 -0
  205. data/src/core/lib/security/credentials/external/file_external_account_credentials.h +4 -0
  206. data/src/core/lib/security/credentials/external/url_external_account_credentials.cc +4 -0
  207. data/src/core/lib/security/credentials/external/url_external_account_credentials.h +4 -0
  208. data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +2 -1
  209. data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +0 -3
  210. data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +12 -0
  211. data/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc +22 -5
  212. data/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h +1 -5
  213. data/src/core/lib/security/credentials/tls/tls_credentials.cc +16 -0
  214. data/src/core/lib/security/credentials/xds/xds_credentials.cc +21 -28
  215. data/src/core/lib/security/credentials/xds/xds_credentials.h +2 -4
  216. data/src/core/lib/security/security_connector/tls/tls_security_connector.cc +4 -3
  217. data/src/core/lib/security/transport/auth_filters.h +71 -4
  218. data/src/core/lib/security/transport/client_auth_filter.cc +2 -4
  219. data/src/core/lib/security/transport/legacy_server_auth_filter.cc +244 -0
  220. data/src/core/lib/security/transport/server_auth_filter.cc +70 -90
  221. data/src/core/lib/slice/slice_buffer.h +3 -0
  222. data/src/core/lib/surface/builtins.cc +1 -1
  223. data/src/core/lib/surface/call.cc +683 -196
  224. data/src/core/lib/surface/call.h +26 -13
  225. data/src/core/lib/surface/call_trace.cc +42 -1
  226. data/src/core/lib/surface/channel.cc +0 -1
  227. data/src/core/lib/surface/channel.h +0 -6
  228. data/src/core/lib/surface/channel_init.h +26 -0
  229. data/src/core/lib/surface/init.cc +14 -8
  230. data/src/core/lib/surface/server.cc +256 -237
  231. data/src/core/lib/surface/server.h +26 -54
  232. data/src/core/lib/surface/version.cc +2 -2
  233. data/src/core/lib/surface/wait_for_cq_end_op.h +94 -0
  234. data/src/core/lib/transport/call_final_info.cc +38 -0
  235. data/src/core/lib/transport/call_final_info.h +54 -0
  236. data/src/core/lib/transport/connectivity_state.cc +3 -2
  237. data/src/core/lib/transport/connectivity_state.h +4 -0
  238. data/src/core/lib/transport/metadata_batch.h +4 -4
  239. data/src/core/lib/transport/transport.cc +70 -19
  240. data/src/core/lib/transport/transport.h +395 -25
  241. data/src/core/plugin_registry/grpc_plugin_registry.cc +3 -0
  242. data/src/core/plugin_registry/grpc_plugin_registry_extra.cc +0 -3
  243. data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +1 -1
  244. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +1 -1
  245. data/src/core/tsi/alts/handshaker/transport_security_common_api.cc +1 -1
  246. data/src/core/tsi/ssl_transport_security.cc +65 -43
  247. data/src/ruby/ext/grpc/rb_channel_args.c +3 -1
  248. data/src/ruby/ext/grpc/rb_grpc.c +0 -1
  249. data/src/ruby/ext/grpc/rb_grpc.h +0 -2
  250. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -0
  251. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +6 -0
  252. data/src/ruby/lib/grpc/version.rb +1 -1
  253. data/third_party/upb/upb/reflection/def_pool.h +2 -2
  254. data/third_party/zlib/adler32.c +5 -27
  255. data/third_party/zlib/compress.c +5 -16
  256. data/third_party/zlib/crc32.c +86 -162
  257. data/third_party/zlib/deflate.c +233 -336
  258. data/third_party/zlib/deflate.h +8 -8
  259. data/third_party/zlib/gzguts.h +11 -12
  260. data/third_party/zlib/infback.c +7 -23
  261. data/third_party/zlib/inffast.c +1 -4
  262. data/third_party/zlib/inffast.h +1 -1
  263. data/third_party/zlib/inflate.c +30 -99
  264. data/third_party/zlib/inftrees.c +6 -11
  265. data/third_party/zlib/inftrees.h +3 -3
  266. data/third_party/zlib/trees.c +224 -302
  267. data/third_party/zlib/uncompr.c +4 -12
  268. data/third_party/zlib/zconf.h +6 -2
  269. data/third_party/zlib/zlib.h +191 -188
  270. data/third_party/zlib/zutil.c +16 -44
  271. data/third_party/zlib/zutil.h +10 -10
  272. metadata +35 -13
  273. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +0 -1173
  274. data/src/core/lib/event_engine/memory_allocator.cc +0 -74
  275. data/src/core/lib/transport/pid_controller.cc +0 -51
  276. data/src/core/lib/transport/pid_controller.h +0 -116
  277. data/third_party/upb/upb/collections/array.h +0 -17
  278. data/third_party/upb/upb/collections/map.h +0 -17
  279. data/third_party/upb/upb/upb.hpp +0 -18
@@ -291,14 +291,14 @@ typedef struct internal_state {
291
291
  memory checker errors from longest match routines */
292
292
 
293
293
  /* in trees.c */
294
- void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
295
- int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
296
- void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
297
- ulg stored_len, int last));
298
- void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
299
- void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
300
- void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
301
- ulg stored_len, int last));
294
+ void ZLIB_INTERNAL _tr_init(deflate_state *s);
295
+ int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc);
296
+ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
297
+ ulg stored_len, int last);
298
+ void ZLIB_INTERNAL _tr_flush_bits(deflate_state *s);
299
+ void ZLIB_INTERNAL _tr_align(deflate_state *s);
300
+ void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
301
+ ulg stored_len, int last);
302
302
 
303
303
  #define d_code(dist) \
304
304
  ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -7,9 +7,8 @@
7
7
  # ifndef _LARGEFILE_SOURCE
8
8
  # define _LARGEFILE_SOURCE 1
9
9
  # endif
10
- # ifdef _FILE_OFFSET_BITS
11
- # undef _FILE_OFFSET_BITS
12
- # endif
10
+ # undef _FILE_OFFSET_BITS
11
+ # undef _TIME_BITS
13
12
  #endif
14
13
 
15
14
  #ifdef HAVE_HIDDEN
@@ -119,8 +118,8 @@
119
118
 
120
119
  /* gz* functions always use library allocation functions */
121
120
  #ifndef STDC
122
- extern voidp malloc OF((uInt size));
123
- extern void free OF((voidpf ptr));
121
+ extern voidp malloc(uInt size);
122
+ extern void free(voidpf ptr);
124
123
  #endif
125
124
 
126
125
  /* get errno and strerror definition */
@@ -138,10 +137,10 @@
138
137
 
139
138
  /* provide prototypes for these when building zlib without LFS */
140
139
  #if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
141
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
142
- ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
143
- ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
144
- ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
140
+ ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);
141
+ ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int);
142
+ ZEXTERN z_off64_t ZEXPORT gztell64(gzFile);
143
+ ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile);
145
144
  #endif
146
145
 
147
146
  /* default memLevel */
@@ -203,9 +202,9 @@ typedef struct {
203
202
  typedef gz_state FAR *gz_statep;
204
203
 
205
204
  /* shared functions */
206
- void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
205
+ void ZLIB_INTERNAL gz_error(gz_statep, int, const char *);
207
206
  #if defined UNDER_CE
208
- char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
207
+ char ZLIB_INTERNAL *gz_strwinerror(DWORD error);
209
208
  #endif
210
209
 
211
210
  /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
@@ -214,6 +213,6 @@ char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
214
213
  #ifdef INT_MAX
215
214
  # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
216
215
  #else
217
- unsigned ZLIB_INTERNAL gz_intmax OF((void));
216
+ unsigned ZLIB_INTERNAL gz_intmax(void);
218
217
  # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
219
218
  #endif
@@ -15,9 +15,6 @@
15
15
  #include "inflate.h"
16
16
  #include "inffast.h"
17
17
 
18
- /* function prototypes */
19
- local void fixedtables OF((struct inflate_state FAR *state));
20
-
21
18
  /*
22
19
  strm provides memory allocation functions in zalloc and zfree, or
23
20
  Z_NULL to use the library memory allocation functions.
@@ -25,13 +22,9 @@ local void fixedtables OF((struct inflate_state FAR *state));
25
22
  windowBits is in the range 8..15, and window is a user-supplied
26
23
  window and output buffer that is 2**windowBits bytes.
27
24
  */
28
- int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
29
- z_streamp strm;
30
- int windowBits;
31
- unsigned char FAR *window;
32
- const char *version;
33
- int stream_size;
34
- {
25
+ int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
26
+ unsigned char FAR *window, const char *version,
27
+ int stream_size) {
35
28
  struct inflate_state FAR *state;
36
29
 
37
30
  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
@@ -80,9 +73,7 @@ int stream_size;
80
73
  used for threaded applications, since the rewriting of the tables and virgin
81
74
  may not be thread-safe.
82
75
  */
83
- local void fixedtables(state)
84
- struct inflate_state FAR *state;
85
- {
76
+ local void fixedtables(struct inflate_state FAR *state) {
86
77
  #ifdef BUILDFIXED
87
78
  static int virgin = 1;
88
79
  static code *lenfix, *distfix;
@@ -248,13 +239,8 @@ struct inflate_state FAR *state;
248
239
  inflateBack() can also return Z_STREAM_ERROR if the input parameters
249
240
  are not correct, i.e. strm is Z_NULL or the state was not initialized.
250
241
  */
251
- int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
252
- z_streamp strm;
253
- in_func in;
254
- void FAR *in_desc;
255
- out_func out;
256
- void FAR *out_desc;
257
- {
242
+ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
243
+ out_func out, void FAR *out_desc) {
258
244
  struct inflate_state FAR *state;
259
245
  z_const unsigned char FAR *next; /* next input */
260
246
  unsigned char FAR *put; /* next output */
@@ -632,9 +618,7 @@ void FAR *out_desc;
632
618
  return ret;
633
619
  }
634
620
 
635
- int ZEXPORT inflateBackEnd(strm)
636
- z_streamp strm;
637
- {
621
+ int ZEXPORT inflateBackEnd(z_streamp strm) {
638
622
  if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
639
623
  return Z_STREAM_ERROR;
640
624
  ZFREE(strm, strm->state);
@@ -47,10 +47,7 @@
47
47
  requires strm->avail_out >= 258 for each loop to avoid checking for
48
48
  output space.
49
49
  */
50
- void ZLIB_INTERNAL inflate_fast(strm, start)
51
- z_streamp strm;
52
- unsigned start; /* inflate()'s starting value for strm->avail_out */
53
- {
50
+ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
54
51
  struct inflate_state FAR *state;
55
52
  z_const unsigned char FAR *in; /* local strm->next_in */
56
53
  z_const unsigned char FAR *last; /* have enough input while in < last */
@@ -8,4 +8,4 @@
8
8
  subject to change. Applications should only use zlib.h.
9
9
  */
10
10
 
11
- void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
11
+ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start);
@@ -91,20 +91,7 @@
91
91
  # endif
92
92
  #endif
93
93
 
94
- /* function prototypes */
95
- local int inflateStateCheck OF((z_streamp strm));
96
- local void fixedtables OF((struct inflate_state FAR *state));
97
- local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
98
- unsigned copy));
99
- #ifdef BUILDFIXED
100
- void makefixed OF((void));
101
- #endif
102
- local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
103
- unsigned len));
104
-
105
- local int inflateStateCheck(strm)
106
- z_streamp strm;
107
- {
94
+ local int inflateStateCheck(z_streamp strm) {
108
95
  struct inflate_state FAR *state;
109
96
  if (strm == Z_NULL ||
110
97
  strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
@@ -116,9 +103,7 @@ z_streamp strm;
116
103
  return 0;
117
104
  }
118
105
 
119
- int ZEXPORT inflateResetKeep(strm)
120
- z_streamp strm;
121
- {
106
+ int ZEXPORT inflateResetKeep(z_streamp strm) {
122
107
  struct inflate_state FAR *state;
123
108
 
124
109
  if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -142,9 +127,7 @@ z_streamp strm;
142
127
  return Z_OK;
143
128
  }
144
129
 
145
- int ZEXPORT inflateReset(strm)
146
- z_streamp strm;
147
- {
130
+ int ZEXPORT inflateReset(z_streamp strm) {
148
131
  struct inflate_state FAR *state;
149
132
 
150
133
  if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -155,10 +138,7 @@ z_streamp strm;
155
138
  return inflateResetKeep(strm);
156
139
  }
157
140
 
158
- int ZEXPORT inflateReset2(strm, windowBits)
159
- z_streamp strm;
160
- int windowBits;
161
- {
141
+ int ZEXPORT inflateReset2(z_streamp strm, int windowBits) {
162
142
  int wrap;
163
143
  struct inflate_state FAR *state;
164
144
 
@@ -195,12 +175,8 @@ int windowBits;
195
175
  return inflateReset(strm);
196
176
  }
197
177
 
198
- int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
199
- z_streamp strm;
200
- int windowBits;
201
- const char *version;
202
- int stream_size;
203
- {
178
+ int ZEXPORT inflateInit2_(z_streamp strm, int windowBits,
179
+ const char *version, int stream_size) {
204
180
  int ret;
205
181
  struct inflate_state FAR *state;
206
182
 
@@ -239,22 +215,17 @@ int stream_size;
239
215
  return ret;
240
216
  }
241
217
 
242
- int ZEXPORT inflateInit_(strm, version, stream_size)
243
- z_streamp strm;
244
- const char *version;
245
- int stream_size;
246
- {
218
+ int ZEXPORT inflateInit_(z_streamp strm, const char *version,
219
+ int stream_size) {
247
220
  return inflateInit2_(strm, DEF_WBITS, version, stream_size);
248
221
  }
249
222
 
250
- int ZEXPORT inflatePrime(strm, bits, value)
251
- z_streamp strm;
252
- int bits;
253
- int value;
254
- {
223
+ int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {
255
224
  struct inflate_state FAR *state;
256
225
 
257
226
  if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
227
+ if (bits == 0)
228
+ return Z_OK;
258
229
  state = (struct inflate_state FAR *)strm->state;
259
230
  if (bits < 0) {
260
231
  state->hold = 0;
@@ -278,9 +249,7 @@ int value;
278
249
  used for threaded applications, since the rewriting of the tables and virgin
279
250
  may not be thread-safe.
280
251
  */
281
- local void fixedtables(state)
282
- struct inflate_state FAR *state;
283
- {
252
+ local void fixedtables(struct inflate_state FAR *state) {
284
253
  #ifdef BUILDFIXED
285
254
  static int virgin = 1;
286
255
  static code *lenfix, *distfix;
@@ -342,7 +311,7 @@ struct inflate_state FAR *state;
342
311
 
343
312
  a.out > inffixed.h
344
313
  */
345
- void makefixed()
314
+ void makefixed(void)
346
315
  {
347
316
  unsigned low, size;
348
317
  struct inflate_state state;
@@ -396,11 +365,7 @@ void makefixed()
396
365
  output will fall in the output data, making match copies simpler and faster.
397
366
  The advantage may be dependent on the size of the processor's data caches.
398
367
  */
399
- local int updatewindow(strm, end, copy)
400
- z_streamp strm;
401
- const Bytef *end;
402
- unsigned copy;
403
- {
368
+ local int updatewindow(z_streamp strm, const Bytef *end, unsigned copy) {
404
369
  struct inflate_state FAR *state;
405
370
  unsigned dist;
406
371
 
@@ -622,10 +587,7 @@ unsigned copy;
622
587
  will return Z_BUF_ERROR if it has not reached the end of the stream.
623
588
  */
624
589
 
625
- int ZEXPORT inflate(strm, flush)
626
- z_streamp strm;
627
- int flush;
628
- {
590
+ int ZEXPORT inflate(z_streamp strm, int flush) {
629
591
  struct inflate_state FAR *state;
630
592
  z_const unsigned char FAR *next; /* next input */
631
593
  unsigned char FAR *put; /* next output */
@@ -1301,9 +1263,7 @@ int flush;
1301
1263
  return ret;
1302
1264
  }
1303
1265
 
1304
- int ZEXPORT inflateEnd(strm)
1305
- z_streamp strm;
1306
- {
1266
+ int ZEXPORT inflateEnd(z_streamp strm) {
1307
1267
  struct inflate_state FAR *state;
1308
1268
  if (inflateStateCheck(strm))
1309
1269
  return Z_STREAM_ERROR;
@@ -1315,11 +1275,8 @@ z_streamp strm;
1315
1275
  return Z_OK;
1316
1276
  }
1317
1277
 
1318
- int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
1319
- z_streamp strm;
1320
- Bytef *dictionary;
1321
- uInt *dictLength;
1322
- {
1278
+ int ZEXPORT inflateGetDictionary(z_streamp strm, Bytef *dictionary,
1279
+ uInt *dictLength) {
1323
1280
  struct inflate_state FAR *state;
1324
1281
 
1325
1282
  /* check state */
@@ -1338,11 +1295,8 @@ uInt *dictLength;
1338
1295
  return Z_OK;
1339
1296
  }
1340
1297
 
1341
- int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
1342
- z_streamp strm;
1343
- const Bytef *dictionary;
1344
- uInt dictLength;
1345
- {
1298
+ int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary,
1299
+ uInt dictLength) {
1346
1300
  struct inflate_state FAR *state;
1347
1301
  unsigned long dictid;
1348
1302
  int ret;
@@ -1373,10 +1327,7 @@ uInt dictLength;
1373
1327
  return Z_OK;
1374
1328
  }
1375
1329
 
1376
- int ZEXPORT inflateGetHeader(strm, head)
1377
- z_streamp strm;
1378
- gz_headerp head;
1379
- {
1330
+ int ZEXPORT inflateGetHeader(z_streamp strm, gz_headerp head) {
1380
1331
  struct inflate_state FAR *state;
1381
1332
 
1382
1333
  /* check state */
@@ -1401,11 +1352,8 @@ gz_headerp head;
1401
1352
  called again with more data and the *have state. *have is initialized to
1402
1353
  zero for the first call.
1403
1354
  */
1404
- local unsigned syncsearch(have, buf, len)
1405
- unsigned FAR *have;
1406
- const unsigned char FAR *buf;
1407
- unsigned len;
1408
- {
1355
+ local unsigned syncsearch(unsigned FAR *have, const unsigned char FAR *buf,
1356
+ unsigned len) {
1409
1357
  unsigned got;
1410
1358
  unsigned next;
1411
1359
 
@@ -1424,9 +1372,7 @@ unsigned len;
1424
1372
  return next;
1425
1373
  }
1426
1374
 
1427
- int ZEXPORT inflateSync(strm)
1428
- z_streamp strm;
1429
- {
1375
+ int ZEXPORT inflateSync(z_streamp strm) {
1430
1376
  unsigned len; /* number of bytes to look at or looked at */
1431
1377
  int flags; /* temporary to save header status */
1432
1378
  unsigned long in, out; /* temporary to save total_in and total_out */
@@ -1482,9 +1428,7 @@ z_streamp strm;
1482
1428
  block. When decompressing, PPP checks that at the end of input packet,
1483
1429
  inflate is waiting for these length bytes.
1484
1430
  */
1485
- int ZEXPORT inflateSyncPoint(strm)
1486
- z_streamp strm;
1487
- {
1431
+ int ZEXPORT inflateSyncPoint(z_streamp strm) {
1488
1432
  struct inflate_state FAR *state;
1489
1433
 
1490
1434
  if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1492,10 +1436,7 @@ z_streamp strm;
1492
1436
  return state->mode == STORED && state->bits == 0;
1493
1437
  }
1494
1438
 
1495
- int ZEXPORT inflateCopy(dest, source)
1496
- z_streamp dest;
1497
- z_streamp source;
1498
- {
1439
+ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
1499
1440
  struct inflate_state FAR *state;
1500
1441
  struct inflate_state FAR *copy;
1501
1442
  unsigned char FAR *window;
@@ -1539,10 +1480,7 @@ z_streamp source;
1539
1480
  return Z_OK;
1540
1481
  }
1541
1482
 
1542
- int ZEXPORT inflateUndermine(strm, subvert)
1543
- z_streamp strm;
1544
- int subvert;
1545
- {
1483
+ int ZEXPORT inflateUndermine(z_streamp strm, int subvert) {
1546
1484
  struct inflate_state FAR *state;
1547
1485
 
1548
1486
  if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1557,10 +1495,7 @@ int subvert;
1557
1495
  #endif
1558
1496
  }
1559
1497
 
1560
- int ZEXPORT inflateValidate(strm, check)
1561
- z_streamp strm;
1562
- int check;
1563
- {
1498
+ int ZEXPORT inflateValidate(z_streamp strm, int check) {
1564
1499
  struct inflate_state FAR *state;
1565
1500
 
1566
1501
  if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
@@ -1572,9 +1507,7 @@ int check;
1572
1507
  return Z_OK;
1573
1508
  }
1574
1509
 
1575
- long ZEXPORT inflateMark(strm)
1576
- z_streamp strm;
1577
- {
1510
+ long ZEXPORT inflateMark(z_streamp strm) {
1578
1511
  struct inflate_state FAR *state;
1579
1512
 
1580
1513
  if (inflateStateCheck(strm))
@@ -1585,9 +1518,7 @@ z_streamp strm;
1585
1518
  (state->mode == MATCH ? state->was - state->length : 0));
1586
1519
  }
1587
1520
 
1588
- unsigned long ZEXPORT inflateCodesUsed(strm)
1589
- z_streamp strm;
1590
- {
1521
+ unsigned long ZEXPORT inflateCodesUsed(z_streamp strm) {
1591
1522
  struct inflate_state FAR *state;
1592
1523
  if (inflateStateCheck(strm)) return (unsigned long)-1;
1593
1524
  state = (struct inflate_state FAR *)strm->state;
@@ -1,5 +1,5 @@
1
1
  /* inftrees.c -- generate Huffman trees for efficient decoding
2
- * Copyright (C) 1995-2022 Mark Adler
2
+ * Copyright (C) 1995-2023 Mark Adler
3
3
  * For conditions of distribution and use, see copyright notice in zlib.h
4
4
  */
5
5
 
@@ -9,7 +9,7 @@
9
9
  #define MAXBITS 15
10
10
 
11
11
  const char inflate_copyright[] =
12
- " inflate 1.2.13 Copyright 1995-2022 Mark Adler ";
12
+ " inflate 1.3 Copyright 1995-2023 Mark Adler ";
13
13
  /*
14
14
  If you use the zlib library in a product, an acknowledgment is welcome
15
15
  in the documentation of your product. If for some reason you cannot
@@ -29,14 +29,9 @@ const char inflate_copyright[] =
29
29
  table index bits. It will differ if the request is greater than the
30
30
  longest code or if it is less than the shortest code.
31
31
  */
32
- int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
33
- codetype type;
34
- unsigned short FAR *lens;
35
- unsigned codes;
36
- code FAR * FAR *table;
37
- unsigned FAR *bits;
38
- unsigned short FAR *work;
39
- {
32
+ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
33
+ unsigned codes, code FAR * FAR *table,
34
+ unsigned FAR *bits, unsigned short FAR *work) {
40
35
  unsigned len; /* a code's length in bits */
41
36
  unsigned sym; /* index of code symbols */
42
37
  unsigned min, max; /* minimum and maximum code lengths */
@@ -62,7 +57,7 @@ unsigned short FAR *work;
62
57
  35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63
58
  static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64
59
  16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
65
- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 194, 65};
60
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 198, 203};
66
61
  static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67
62
  1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68
63
  257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -57,6 +57,6 @@ typedef enum {
57
57
  DISTS
58
58
  } codetype;
59
59
 
60
- int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
61
- unsigned codes, code FAR * FAR *table,
62
- unsigned FAR *bits, unsigned short FAR *work));
60
+ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
61
+ unsigned codes, code FAR * FAR *table,
62
+ unsigned FAR *bits, unsigned short FAR *work);