From 4ee6275918cf15c1c380e0adc46e2516433d76fa Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 18 Feb 2010 18:48:38 -0800 Subject: http: cleanup globals and ABI namespace * init_globals() is a static function, avoid conflicting with any potential libraries out there... * mUnicorn and cHttpParser do not need to be static globals they're not used outside of Init_unicorn_http(). --- ext/unicorn_http/global_variables.h | 4 +--- ext/unicorn_http/unicorn_http.rl | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/unicorn_http/global_variables.h b/ext/unicorn_http/global_variables.h index e593cf6..7319bcd 100644 --- a/ext/unicorn_http/global_variables.h +++ b/ext/unicorn_http/global_variables.h @@ -1,7 +1,5 @@ #ifndef global_variables_h #define global_variables_h -static VALUE mUnicorn; -static VALUE cHttpParser; static VALUE eHttpParserError; static VALUE g_rack_url_scheme; @@ -61,7 +59,7 @@ DEF_MAX_LENGTH(REQUEST_PATH, 1024); DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10)); DEF_MAX_LENGTH(HEADER, (1024 * (80 + 32))); -void init_globals(void) +static void init_globals(void) { DEF_GLOBAL(rack_url_scheme, "rack.url_scheme"); DEF_GLOBAL(request_method, "REQUEST_METHOD"); diff --git a/ext/unicorn_http/unicorn_http.rl b/ext/unicorn_http/unicorn_http.rl index eeef5e1..0c58473 100644 --- a/ext/unicorn_http/unicorn_http.rl +++ b/ext/unicorn_http/unicorn_http.rl @@ -674,10 +674,13 @@ static VALUE HttpParser_filter_body(VALUE self, VALUE buf, VALUE data) void Init_unicorn_http(void) { + VALUE mUnicorn, cHttpParser; + mUnicorn = rb_define_module("Unicorn"); + cHttpParser = rb_define_class_under(mUnicorn, "HttpParser", rb_cObject); eHttpParserError = rb_define_class_under(mUnicorn, "HttpParserError", rb_eIOError); - cHttpParser = rb_define_class_under(mUnicorn, "HttpParser", rb_cObject); + init_globals(); rb_define_alloc_func(cHttpParser, HttpParser_alloc); rb_define_method(cHttpParser, "initialize", HttpParser_init,0); -- cgit v1.2.3-24-ge0c7