From 4f9b76b6f2acc4030ce9ef164322514c5d0e761b Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Sun, 20 Nov 2022 07:14:38 +0000 Subject: Remove trailing whitespaces in *.c. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1905414 13f79535-47bb-0310-9956-ffa450edef68 --- dso/aix/dso.c | 14 +++++++------- dso/beos/dso.c | 6 +++--- dso/netware/dso.c | 14 +++++++------- dso/os2/dso.c | 6 +++--- dso/os390/dso.c | 14 +++++++------- dso/unix/dso.c | 14 +++++++------- dso/win32/dso.c | 10 +++++----- 7 files changed, 39 insertions(+), 39 deletions(-) (limited to 'dso') diff --git a/dso/aix/dso.c b/dso/aix/dso.c index 25f6262af..6fa5f6968 100644 --- a/dso/aix/dso.c +++ b/dso/aix/dso.c @@ -33,10 +33,10 @@ * as such, and this notice is not modified. * * Changes marked with `--jwe' were made on April 7 1996 by - * John W. Eaton to support g++ + * John W. Eaton to support g++ * - * Bundled, stripped and adjusted on April 1998 as one single source file - * for inclusion into the Apache HTTP server by + * Bundled, stripped and adjusted on April 1998 as one single source file + * for inclusion into the Apache HTTP server by * Ralf S. Engelschall * * Added to APR by David Reid April 2000 @@ -125,7 +125,7 @@ static apr_status_t dso_cleanup(void *thedso) return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, +APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *ctx) { void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL); @@ -133,7 +133,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, *res_handle = apr_pcalloc(ctx, sizeof(*res_handle)); if(os_handle == NULL) { - (*res_handle)->errormsg = dlerror(); + (*res_handle)->errormsg = dlerror(); return APR_EDSOOPEN; } @@ -151,8 +151,8 @@ APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle) return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup); } -APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, - apr_dso_handle_t *handle, +APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, + apr_dso_handle_t *handle, const char *symname) { void *retval = dlsym(handle->handle, symname); diff --git a/dso/beos/dso.c b/dso/beos/dso.c index 91dd1b4e8..d7a4d485c 100644 --- a/dso/beos/dso.c +++ b/dso/beos/dso.c @@ -30,7 +30,7 @@ static apr_status_t dso_cleanup(void *thedso) return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, +APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *pool) { image_id newid = -1; @@ -41,7 +41,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, (*res_handle)->errormsg = strerror(newid); return APR_EDSOOPEN; } - + (*res_handle)->pool = pool; (*res_handle)->handle = newid; @@ -63,7 +63,7 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, apr_dso_hand if (symname == NULL) return APR_ESYMNOTFOUND; - err = get_image_symbol(handle->handle, symname, B_SYMBOL_TYPE_ANY, + err = get_image_symbol(handle->handle, symname, B_SYMBOL_TYPE_ANY, ressym); if(err != B_OK) diff --git a/dso/netware/dso.c b/dso/netware/dso.c index 4cd2ad611..4fdf527a4 100644 --- a/dso/netware/dso.c +++ b/dso/netware/dso.c @@ -65,7 +65,7 @@ static apr_status_t dso_cleanup(void *thedso) return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, +APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *pool) { @@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, char *fullpath = NULL; apr_status_t rv; - if ((rv = apr_filepath_merge(&fullpath, NULL, path, + if ((rv = apr_filepath_merge(&fullpath, NULL, path, APR_FILEPATH_NATIVE, pool)) != APR_SUCCESS) { return rv; } @@ -97,14 +97,14 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, return APR_SUCCESS; } - + APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle) { return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup); } -APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, - apr_dso_handle_t *handle, +APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, + apr_dso_handle_t *handle, const char *symname) { sym_list *symbol = NULL; @@ -121,11 +121,11 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, symbol->symbol = apr_pstrdup(handle->pool, symname); *ressym = retval; - + return APR_SUCCESS; } -APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, +APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen) { if (dso->errormsg) { diff --git a/dso/os2/dso.c b/dso/os2/dso.c index 1a7f7de83..0bf30e79a 100644 --- a/dso/os2/dso.c +++ b/dso/os2/dso.c @@ -29,7 +29,7 @@ static apr_status_t dso_cleanup(void *thedso) if (dso->handle == 0) return APR_SUCCESS; - + rc = DosFreeModule(dso->handle); if (rc == 0) @@ -70,8 +70,8 @@ APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle) -APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, - apr_dso_handle_t *handle, +APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, + apr_dso_handle_t *handle, const char *symname) { PFN func; diff --git a/dso/os390/dso.c b/dso/os390/dso.c index 9344c71a1..235e0092f 100644 --- a/dso/os390/dso.c +++ b/dso/os390/dso.c @@ -25,7 +25,7 @@ APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso, apr_os_dso_handle_t osdso, apr_pool_t *pool) -{ +{ *aprdso = apr_pcalloc(pool, sizeof **aprdso); (*aprdso)->handle = osdso; (*aprdso)->pool = pool; @@ -46,7 +46,7 @@ static apr_status_t dso_cleanup(void *thedso) if (dso->handle == 0) return APR_SUCCESS; - + rc = dllfree(dso->handle); if (rc == 0) { @@ -57,7 +57,7 @@ static apr_status_t dso_cleanup(void *thedso) return errno; } -APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, +APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *ctx) { dllhandle *handle; @@ -80,12 +80,12 @@ APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle) return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup); } -APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, - apr_dso_handle_t *handle, +APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, + apr_dso_handle_t *handle, const char *symname) { void *func_ptr; - void *var_ptr; + void *var_ptr; if ((var_ptr = dllqueryvar(handle->handle, symname)) != NULL) { *ressym = var_ptr; @@ -99,7 +99,7 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, return APR_ESYMNOTFOUND; } -APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *handle, char *buffer, +APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *handle, char *buffer, apr_size_t buflen) { apr_cpystrn(buffer, strerror(handle->failing_errno), buflen); diff --git a/dso/unix/dso.c b/dso/unix/dso.c index fdd56f1d3..a96c7691c 100644 --- a/dso/unix/dso.c +++ b/dso/unix/dso.c @@ -77,7 +77,7 @@ static apr_status_t dso_cleanup(void *thedso) return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, +APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *pool) { #if defined(DSO_USE_SHL) @@ -137,7 +137,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, } #endif os_handle = dlopen(path, flags); -#endif +#endif #endif /* DSO_USE_x */ *res_handle = apr_pcalloc(pool, sizeof(**res_handle)); @@ -163,14 +163,14 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, return APR_SUCCESS; } - + APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle) { return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup); } -APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, - apr_dso_handle_t *handle, +APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, + apr_dso_handle_t *handle, const char *symname) { #if defined(DSO_USE_SHL) @@ -233,12 +233,12 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, } *ressym = retval; - + return APR_SUCCESS; #endif /* DSO_USE_x */ } -APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, +APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen) { if (dso->errormsg) { diff --git a/dso/win32/dso.c b/dso/win32/dso.c index 5193c8553..f0a737082 100644 --- a/dso/win32/dso.c +++ b/dso/win32/dso.c @@ -51,7 +51,7 @@ static apr_status_t dso_cleanup(void *thedso) return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle, +APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle, const char *path, apr_pool_t *ctx) { HINSTANCE os_handle; @@ -59,7 +59,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle, DWORD em; apr_wchar_t wpath[APR_PATH_MAX]; - if ((rv = utf8_to_unicode_path(wpath, sizeof(wpath) + if ((rv = utf8_to_unicode_path(wpath, sizeof(wpath) / sizeof(apr_wchar_t), path)) != APR_SUCCESS) { *res_handle = apr_pcalloc(ctx, sizeof(**res_handle)); @@ -97,14 +97,14 @@ APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle, return APR_SUCCESS; } - + APR_DECLARE(apr_status_t) apr_dso_unload(struct apr_dso_handle_t *handle) { return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup); } -APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, - struct apr_dso_handle_t *handle, +APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, + struct apr_dso_handle_t *handle, const char *symname) { *ressym = (apr_dso_handle_sym_t)GetProcAddress(handle->handle, symname); -- cgit v1.2.1