# HG changeset patch # User Franz Glasner # Date 1665570058 -7200 # Node ID 95bff42b7ed8dccb20b71b9583eb63363c51ad50 # Parent f58fde6084850c420993373caa3f2a612f915529 Remove spurious whitespace changes in the patch file of pypy_plugin.c diff -r f58fde608485 -r 95bff42b7ed8 uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c --- a/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Wed Oct 05 09:27:37 2022 +0200 +++ b/uwsginl-plugin-lang-pypy3/files/extra/patch-plugins_pypy_pypy__plugin.c Wed Oct 12 12:20:58 2022 +0200 @@ -63,67 +63,7 @@ #endif } } -@@ -125,9 +126,9 @@ static int uwsgi_pypy_init() { - } - - u_pypy_init_threads = dlsym(upypy.handler, "pypy_init_threads"); -- if (!u_pypy_init_threads) { -- uwsgi_log("!!! WARNING your libpypy-c does not export pypy_init_threads, multithreading will not work !!!\n"); -- } -+ if (!u_pypy_init_threads) { -+ uwsgi_log("!!! WARNING your libpypy-c does not export pypy_init_threads, multithreading will not work !!!\n"); -+ } - - u_rpython_startup_code(); - -@@ -148,9 +149,9 @@ static int uwsgi_pypy_init() { - goto ready; - } - } -- uwsgi_log("unable to set pypy home to \"%s\"\n", upypy.home); -+ uwsgi_log("unable to set pypy home to \"%s\"\n", upypy.home); - exit(1); -- } -+ } - - ready: - u_pypy_execute_source = dlsym(upypy.handler, "pypy_execute_source"); -@@ -160,9 +161,9 @@ ready: - } - - u_pypy_thread_attach = dlsym(upypy.handler, "pypy_thread_attach"); -- if (!u_pypy_thread_attach) { -- uwsgi_log("!!! WARNING your libpypy-c does not export pypy_thread_attach, multithreading will not work !!!\n"); -- } -+ if (!u_pypy_thread_attach) { -+ uwsgi_log("!!! WARNING your libpypy-c does not export pypy_thread_attach, multithreading will not work !!!\n"); -+ } - - if (upypy.setup) { - buffer = uwsgi_open_and_read(upypy.setup, &rlen, 1, NULL); -@@ -233,14 +234,14 @@ static void uwsgi_pypy_preinit_apps() { - - static int uwsgi_pypy_request(struct wsgi_request *wsgi_req) { - /* Standard WSGI request */ -- if (!wsgi_req->len) { -- uwsgi_log( "Empty pypy request. skip.\n"); -- return -1; -- } -+ if (!wsgi_req->len) { -+ uwsgi_log( "Empty pypy request. skip.\n"); -+ return -1; -+ } - -- if (uwsgi_parse_vars(wsgi_req)) { -- return -1; -- } -+ if (uwsgi_parse_vars(wsgi_req)) { -+ return -1; -+ } - - if (uwsgi_pypy_hook_request) { - uwsgi_pypy_hook_request(wsgi_req, wsgi_req->async_id); -@@ -266,16 +267,20 @@ static void uwsgi_pypy_init_apps() { +@@ -266,13 +267,17 @@ static void uwsgi_pypy_init_apps() { } } @@ -143,55 +83,9 @@ + static void uwsgi_opt_pypy_ini_paste(char *opt, char *value, void *foobar) { -- uwsgi_opt_load_ini(opt, value, NULL); -- upypy.paste = value; -+ uwsgi_opt_load_ini(opt, value, NULL); -+ upypy.paste = value; - } - - -@@ -332,14 +337,14 @@ static void uwsgi_pypy_post_fork() { - pthread_mutex_init(&upypy.attach_thread_lock, NULL); - struct uwsgi_string_list *usl = NULL; - uwsgi_foreach(usl, upypy.eval_post_fork) { -- uwsgi_pypy_hook_execute_source(usl->value); -- } -+ uwsgi_pypy_hook_execute_source(usl->value); -+ } - uwsgi_foreach(usl, upypy.exec_post_fork) { -- size_t rlen = 0; -- char *buffer = uwsgi_open_and_read(usl->value, &rlen, 1, NULL); -- uwsgi_pypy_hook_execute_source(buffer); -- free(buffer); -- } -+ size_t rlen = 0; -+ char *buffer = uwsgi_open_and_read(usl->value, &rlen, 1, NULL); -+ uwsgi_pypy_hook_execute_source(buffer); -+ free(buffer); -+ } - - if (uwsgi_pypy_post_fork_hook) { - uwsgi_pypy_post_fork_hook(); -@@ -360,20 +365,20 @@ static int uwsgi_pypy_mule(char *opt) { - exit(1); - } - -- if (uwsgi_endswith(opt, ".py")) { -- size_t rlen = 0; -- char *buffer = uwsgi_open_and_read(opt, &rlen, 1, NULL); -- uwsgi_pypy_hook_execute_source(buffer); -+ if (uwsgi_endswith(opt, ".py")) { -+ size_t rlen = 0; -+ char *buffer = uwsgi_open_and_read(opt, &rlen, 1, NULL); -+ uwsgi_pypy_hook_execute_source(buffer); - free(buffer); -- return 1; -- } -- return 0; -+ return 1; -+ } -+ return 0; - + uwsgi_opt_load_ini(opt, value, NULL); + upypy.paste = value; +@@ -372,8 +377,8 @@ static int uwsgi_pypy_mule(char *opt) { }