diff options
90 files changed, 609 insertions, 609 deletions
diff --git a/dso/aix/dso.c b/dso/aix/dso.c index 83e47664e..0b99a29ab 100644 --- a/dso/aix/dso.c +++ b/dso/aix/dso.c @@ -134,7 +134,7 @@ ap_status_t ap_dso_init(void){ return APR_SUCCESS; } -ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, +ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_context_t *ctx) { void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL); @@ -148,7 +148,7 @@ ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, return APR_SUCCESS; } -ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle) +ap_status_t ap_dso_unload(ap_dso_handle_t *handle) { if (dlclose(handle->handle) != 0) return APR_EINIT; @@ -157,7 +157,7 @@ ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle) } ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, - struct ap_dso_handle_t *handle, + ap_dso_handle_t *handle, const char *symname) { void *retval = dlsym(handle->handle, symname); diff --git a/dso/unix/dso.c b/dso/unix/dso.c index c9a2d34a8..48f440d3d 100644 --- a/dso/unix/dso.c +++ b/dso/unix/dso.c @@ -70,7 +70,7 @@ ap_status_t ap_dso_init(void){ * arg 2) Path to the DSO library * arg 3) Context to use. */ -ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, +ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_context_t *ctx) { #if defined(HPUX) || defined(HPUX10) || defined(HPUX11) @@ -96,7 +96,7 @@ ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, * Close a DSO library. * arg 1) handle to close. */ -ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle) +ap_status_t ap_dso_unload(ap_dso_handle_t *handle) { #if defined(HPUX) || defined(HPUX10) || defined(HPUX11) shl_unload((shl_t)handle->handle); @@ -117,7 +117,7 @@ ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle) * arg 3) Name of the symbol to load. */ ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, - struct ap_dso_handle_t *handle, + ap_dso_handle_t *handle, const char *symname) { #if defined(HPUX) || defined(HPUX10) || defined(HPUX11) diff --git a/file_io/beos/readwrite.c b/file_io/beos/readwrite.c index abd7527ea..c76618e55 100644 --- a/file_io/beos/readwrite.c +++ b/file_io/beos/readwrite.c @@ -54,7 +54,7 @@ #include "../unix/fileio.h" -ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { ap_ssize_t rv; @@ -81,7 +81,7 @@ ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) return APR_SUCCESS; } -ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_write(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { ap_size_t rv; @@ -105,7 +105,7 @@ ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) return APR_SUCCESS; } -ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec, +ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes) { int bytes; @@ -246,7 +246,7 @@ static int printf_flush(ap_vformatter_buff_t *vbuff) } #endif -API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...) +API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c index 601db8d22..d4e03da59 100644 --- a/file_io/os2/dir.c +++ b/file_io/os2/dir.c @@ -62,15 +62,15 @@ static ap_status_t dir_cleanup(void *thedir) { - struct ap_dir_t *dir = thedir; + ap_dir_t *dir = thedir; return ap_closedir(dir); } -ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t *cntxt) +ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cntxt) { - struct ap_dir_t *thedir = (struct ap_dir_t *)ap_palloc(cntxt, sizeof(struct ap_dir_t)); + ap_dir_t *thedir = (ap_dir_t *)ap_palloc(cntxt, sizeof(ap_dir_t)); if (thedir == NULL) return APR_ENOMEM; @@ -90,7 +90,7 @@ ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t -ap_status_t ap_closedir(struct ap_dir_t *thedir) +ap_status_t ap_closedir(ap_dir_t *thedir) { int rv = 0; @@ -107,7 +107,7 @@ ap_status_t ap_closedir(struct ap_dir_t *thedir) -ap_status_t ap_readdir(struct ap_dir_t *thedir) +ap_status_t ap_readdir(ap_dir_t *thedir) { int rv; ULONG entries = 1; @@ -136,7 +136,7 @@ ap_status_t ap_readdir(struct ap_dir_t *thedir) -ap_status_t ap_rewinddir(struct ap_dir_t *thedir) +ap_status_t ap_rewinddir(ap_dir_t *thedir) { return ap_closedir(thedir); } @@ -157,7 +157,7 @@ ap_status_t ap_remove_dir(const char *path, ap_context_t *cont) -ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir) { if (thedir->validentry) { *size = thedir->entry.cbFile; @@ -169,7 +169,7 @@ ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir) -ap_status_t ap_dir_entry_mtime(ap_time_t *time, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_mtime(ap_time_t *time, ap_dir_t *thedir) { if (thedir->validentry) { ap_os2_time_to_ap_time(time, thedir->entry.fdateLastWrite, thedir->entry.ftimeLastWrite); @@ -181,7 +181,7 @@ ap_status_t ap_dir_entry_mtime(ap_time_t *time, struct ap_dir_t *thedir) -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir) { int rc; HFILE hFile; @@ -216,7 +216,7 @@ ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir) -ap_status_t ap_get_dir_filename(char **new, struct ap_dir_t *thedir) +ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir) { if (thedir->validentry) { *new = thedir->entry.achName; diff --git a/file_io/os2/fileacc.c b/file_io/os2/fileacc.c index 505518661..0dfee57f0 100644 --- a/file_io/os2/fileacc.c +++ b/file_io/os2/fileacc.c @@ -60,9 +60,9 @@ #include <string.h> #include <sys/types.h> -/* A file to put ALL of the accessor functions for struct ap_file_t types. */ +/* A file to put ALL of the accessor functions for ap_file_t types. */ -ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile) +ap_status_t ap_get_filename(char **new, ap_file_t *thefile) { if (thefile != NULL) { *new = ap_pstrdup(thefile->cntxt, thefile->fname); @@ -75,7 +75,7 @@ ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile) -ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file) +ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file) { if (file != NULL) { return ap_get_userdata(data, key, file->cntxt); @@ -88,7 +88,7 @@ ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file) -ap_status_t ap_set_filedata(struct ap_file_t *file, void *data, char *key, +ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (file != NULL) { diff --git a/file_io/os2/filedup.c b/file_io/os2/filedup.c index 52f707cbb..246a02958 100644 --- a/file_io/os2/filedup.c +++ b/file_io/os2/filedup.c @@ -60,13 +60,13 @@ #define INCL_DOS #include <os2.h> -ap_status_t ap_dupfile(struct ap_file_t **new_file, struct ap_file_t *old_file) +ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file) { int rv; - struct ap_file_t *dup_file; + ap_file_t *dup_file; if (*new_file == NULL) { - dup_file = (struct ap_file_t *)ap_palloc(old_file->cntxt, sizeof(struct ap_file_t)); + dup_file = (ap_file_t *)ap_palloc(old_file->cntxt, sizeof(ap_file_t)); if (dup_file == NULL) { return APR_ENOMEM; diff --git a/file_io/os2/filestat.c b/file_io/os2/filestat.c index 151951f2e..c4f206cc1 100644 --- a/file_io/os2/filestat.c +++ b/file_io/os2/filestat.c @@ -109,7 +109,7 @@ static ap_status_t handle_type(ap_filetype_e *ftype, HFILE file) -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct ap_file_t *thefile) +ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile) { ULONG rc; FILESTATUS3 fstatus; diff --git a/file_io/os2/open.c b/file_io/os2/open.c index 2914903ad..c991270da 100644 --- a/file_io/os2/open.c +++ b/file_io/os2/open.c @@ -63,19 +63,19 @@ ap_status_t apr_file_cleanup(void *thefile) { - struct ap_file_t *file = thefile; + ap_file_t *file = thefile; return ap_close(file); } -ap_status_t ap_open(struct ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cntxt) +ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cntxt) { int oflags = 0; int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE; int rv; ULONG action; - ap_file_t *dafile = (struct ap_file_t *)ap_palloc(cntxt, sizeof(struct ap_file_t)); + ap_file_t *dafile = (ap_file_t *)ap_palloc(cntxt, sizeof(ap_file_t)); *new = dafile; dafile->cntxt = cntxt; @@ -179,7 +179,7 @@ ap_status_t ap_remove_file(char *path, ap_context_t *cntxt) -ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file) +ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file) { if (file == NULL) { return APR_ENOFILE; @@ -191,11 +191,11 @@ ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file) -ap_status_t ap_put_os_file(struct ap_file_t **file, ap_os_file_t *thefile, ap_context_t *cont) +ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_context_t *cont) { ap_os_file_t *dafile = thefile; if ((*file) == NULL) { - (*file) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*file) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); (*file)->cntxt = cont; } (*file)->filedes = *dafile; @@ -218,9 +218,9 @@ ap_status_t ap_eof(ap_file_t *fptr) -ap_status_t ap_open_stderr(struct ap_file_t **thefile, ap_context_t *cont) +ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont) { - (*thefile) = ap_palloc(cont, sizeof(struct ap_file_t)); + (*thefile) = ap_palloc(cont, sizeof(ap_file_t)); if ((*thefile) == NULL) { return APR_ENOMEM; } diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c index 2bf002e1c..a10f16aa1 100644 --- a/file_io/os2/pipe.c +++ b/file_io/os2/pipe.c @@ -58,7 +58,7 @@ #include "apr_lib.h" #include <string.h> -ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_context_t *cont) +ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont) { ULONG filedes[2]; ULONG rc; @@ -69,7 +69,7 @@ ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_con return os2errno(rc); } - (*in) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*in) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); (*in)->cntxt = cont; (*in)->filedes = filedes[0]; (*in)->fname = ap_pstrdup(cont, "PIPE"); @@ -78,7 +78,7 @@ ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_con (*in)->flags = 0; ap_register_cleanup(cont, *in, apr_file_cleanup, ap_null_cleanup); - (*out) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*out) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); (*out)->cntxt = cont; (*out)->filedes = filedes[1]; (*out)->fname = ap_pstrdup(cont, "PIPE"); @@ -100,7 +100,7 @@ ap_status_t ap_create_namedpipe(char *filename, ap_fileperms_t perm, ap_context_ -ap_status_t ap_set_pipe_timeout(struct ap_file_t *thepipe, ap_int32_t timeout) +ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_int32_t timeout) { return APR_ENOTIMPL; } diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c index e5dcdd91a..8d45e1b80 100644 --- a/file_io/os2/readwrite.c +++ b/file_io/os2/readwrite.c @@ -60,7 +60,7 @@ #include <os2.h> #include <malloc.h> -ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { ULONG rc = 0; ULONG bytesread; @@ -126,7 +126,7 @@ ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) -ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_write(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { ULONG rc = 0; ULONG byteswritten; @@ -182,7 +182,7 @@ ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) #ifdef HAVE_WRITEV -ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes) +ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes) { int bytes; if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) { @@ -313,7 +313,7 @@ ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile) -API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...) +API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/file_io/os2/seek.c b/file_io/os2/seek.c index bc8863345..fdef6610b 100644 --- a/file_io/os2/seek.c +++ b/file_io/os2/seek.c @@ -65,7 +65,7 @@ int os2errno( ULONG oserror ); -static ap_status_t setptr(struct ap_file_t *thefile, unsigned long pos ) +static ap_status_t setptr(ap_file_t *thefile, unsigned long pos ) { long newbufpos; ULONG rc; @@ -91,7 +91,7 @@ static ap_status_t setptr(struct ap_file_t *thefile, unsigned long pos ) -ap_status_t ap_seek(struct ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset) +ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset) { if (!thefile->isopen) { return APR_EBADF; diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c index c1e7231b4..ec2caf863 100644 --- a/file_io/unix/dir.c +++ b/file_io/unix/dir.c @@ -57,7 +57,7 @@ static ap_status_t dir_cleanup(void *thedir) { - struct ap_dir_t *dir = thedir; + ap_dir_t *dir = thedir; if (closedir(dir->dirstruct) == 0) { return APR_SUCCESS; } @@ -73,14 +73,14 @@ static ap_status_t dir_cleanup(void *thedir) * arg 2) The full path to the directory (use / on all systems) * arg 3) The context to use. */ -ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t *cont) +ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cont) { if (new == NULL) return APR_EBADARG; if (cont == NULL) return APR_ENOCONT; - (*new) = (struct ap_dir_t *)ap_palloc(cont, sizeof(struct ap_dir_t)); + (*new) = (ap_dir_t *)ap_palloc(cont, sizeof(ap_dir_t)); (*new)->cntxt = cont; (*new)->dirname = ap_pstrdup(cont, dirname); @@ -102,7 +102,7 @@ ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t * close the specified directory. * arg 1) the directory descriptor to close. */ -ap_status_t ap_closedir(struct ap_dir_t *thedir) +ap_status_t ap_closedir(ap_dir_t *thedir) { ap_status_t rv; @@ -122,7 +122,7 @@ ap_status_t ap_closedir(struct ap_dir_t *thedir) * arg 1) the directory descriptor to read from, and fill out. * NOTE: All systems return . and .. as the first two files. */ -ap_status_t ap_readdir(struct ap_dir_t *thedir) +ap_status_t ap_readdir(ap_dir_t *thedir) { #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \ && !defined(READDIR_IS_THREAD_SAFE) @@ -159,7 +159,7 @@ ap_status_t ap_readdir(struct ap_dir_t *thedir) * Rewind the directory to the first entry. * arg 1) the directory descriptor to rewind. */ -ap_status_t ap_rewinddir(struct ap_dir_t *thedir) +ap_status_t ap_rewinddir(ap_dir_t *thedir) { if (thedir == NULL) return APR_EBADARG; @@ -216,7 +216,7 @@ ap_status_t ap_remove_dir(const char *path, ap_context_t *cont) * arg 1) the size of the directory entry. * arg 2) the currently open directory. */ -ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir) { struct stat filestat; char *fname = NULL; @@ -245,7 +245,7 @@ ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir) * arg 1) the last modified time of the directory entry. * arg 2) the currently open directory. */ -ap_status_t ap_dir_entry_mtime(ap_time_t *mtime, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_mtime(ap_time_t *mtime, ap_dir_t *thedir) { struct stat filestat; char *fname = NULL; @@ -275,7 +275,7 @@ ap_status_t ap_dir_entry_mtime(ap_time_t *mtime, struct ap_dir_t *thedir) * arg 1) the file type of the directory entry. * arg 2) the currently open directory. */ -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir) { struct stat filestat; char *fname = NULL; @@ -320,7 +320,7 @@ ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir) * arg 1) the file name of the directory entry. * arg 2) the currently open directory. */ -ap_status_t ap_get_dir_filename(char **new, struct ap_dir_t *thedir) +ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir) { if (new == NULL) return APR_EBADARG; @@ -340,7 +340,7 @@ ap_status_t ap_get_dir_filename(char **new, struct ap_dir_t *thedir) * arg 1) The os specific dir we are converting to * arg 2) The apr dir to convert. */ -ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct ap_dir_t *dir) +ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir) { if (dir == NULL) { return APR_ENODIR; @@ -357,14 +357,14 @@ ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct ap_dir_t *dir) * arg 2) The os specific dir to convert * arg 3) The context to use when creating to apr directory. */ -ap_status_t ap_put_os_dir(struct ap_dir_t **dir, ap_os_dir_t *thedir, +ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*dir) == NULL) { - (*dir) = (struct ap_dir_t *)ap_palloc(cont, sizeof(struct ap_dir_t)); + (*dir) = (ap_dir_t *)ap_palloc(cont, sizeof(ap_dir_t)); (*dir)->cntxt = cont; } (*dir)->dirstruct = thedir; diff --git a/file_io/unix/fileacc.c b/file_io/unix/fileacc.c index 247edfb7e..0411166fd 100644 --- a/file_io/unix/fileacc.c +++ b/file_io/unix/fileacc.c @@ -54,7 +54,7 @@ #include "fileio.h" -/* A file to put ALL of the accessor functions for struct ap_file_t types. */ +/* A file to put ALL of the accessor functions for ap_file_t types. */ /* ***APRDOC******************************************************** * ap_status_t ap_get_filename(char **new, ap_file_t *thefile) @@ -62,7 +62,7 @@ * arg 1) The path of the file. * arg 2) The currently open file. */ -ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile) +ap_status_t ap_get_filename(char **new, ap_file_t *thefile) { if(new == NULL) return APR_EBADARG; @@ -112,7 +112,7 @@ mode_t get_fileperms(ap_fileperms_t mode) * arg 2) The key to use for retreiving data associated with this file. * arg 3) The currently open file. */ -ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file) +ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file) { if(data == NULL || key == NULL) return APR_EBADARG; @@ -135,7 +135,7 @@ ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file) * arg 3) The key to use for assocaiteing data with the file. * arg 4) The cleanup routine to use when the file is destroyed. */ -ap_status_t ap_set_filedata(struct ap_file_t *file, void *data, char *key, +ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key, ap_status_t (*cleanup) (void *)) { if(data == NULL || key == NULL) diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c index f1c267a2f..3d0bd90f7 100644 --- a/file_io/unix/filedup.c +++ b/file_io/unix/filedup.c @@ -61,7 +61,7 @@ * arg 2) The file to duplicate. * NOTE: *arg1 must point to a valid ap_file_t, or point to NULL */ -ap_status_t ap_dupfile(struct ap_file_t **new_file, struct ap_file_t *old_file) +ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file) { char *buf_oflags; int have_file = 0; @@ -70,8 +70,8 @@ ap_status_t ap_dupfile(struct ap_file_t **new_file, struct ap_file_t *old_file) return APR_EBADARG; if ((*new_file) == NULL) { - (*new_file) = (struct ap_file_t *)ap_pcalloc(old_file->cntxt, - sizeof(struct ap_file_t)); + (*new_file) = (ap_file_t *)ap_pcalloc(old_file->cntxt, + sizeof(ap_file_t)); if ((*new_file) == NULL) { return APR_ENOMEM; } diff --git a/file_io/unix/filestat.c b/file_io/unix/filestat.c index 76bcd9b95..a7d7e594a 100644 --- a/file_io/unix/filestat.c +++ b/file_io/unix/filestat.c @@ -86,7 +86,7 @@ static ap_filetype_e filetype_from_mode(int mode) * arg 1) Where to store the information about the file. * arg 2) The file to get information about. */ -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct ap_file_t *thefile) +ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile) { struct stat info; int rv; diff --git a/file_io/unix/open.c b/file_io/unix/open.c index 1b3e85224..5aad79bba 100644 --- a/file_io/unix/open.c +++ b/file_io/unix/open.c @@ -57,7 +57,7 @@ ap_status_t file_cleanup(void *thefile) { - struct ap_file_t *file = thefile; + ap_file_t *file = thefile; int rv; if (file->buffered) { @@ -100,7 +100,7 @@ ap_status_t file_cleanup(void *thefile) * called without any mode parameters. *arg1 must point to a valid * file_t, or NULL (in which case it will be allocated) */ -ap_status_t ap_open(struct ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont) +ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont) { int oflags = 0; char *buf_oflags; @@ -112,7 +112,7 @@ ap_status_t ap_open(struct ap_file_t **new, const char *fname, ap_int32_t flag, return APR_ENOCONT; if ((*new) == NULL) { - (*new) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*new) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); } (*new)->cntxt = cont; @@ -196,7 +196,7 @@ ap_status_t ap_open(struct ap_file_t **new, const char *fname, ap_int32_t flag, * Close the specified file. * arg 1) The file descriptor to close. */ -ap_status_t ap_close(struct ap_file_t *file) +ap_status_t ap_close(ap_file_t *file) { ap_status_t rv; @@ -239,7 +239,7 @@ ap_status_t ap_remove_file(char *path, ap_context_t *cont) * NOTE: On Unix, it is only possible to get a file descriptor from * an apr file type. */ -ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file) +ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file) { if (thefile == NULL) return APR_EBADARG; @@ -267,7 +267,7 @@ ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file) * NOTE: On Unix, it is only possible to put a file descriptor into * an apr file type. */ -ap_status_t ap_put_os_file(struct ap_file_t **file, ap_os_file_t *thefile, +ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_context_t *cont) { int *dafile = thefile; @@ -279,7 +279,7 @@ ap_status_t ap_put_os_file(struct ap_file_t **file, ap_os_file_t *thefile, return APR_ENOCONT; if ((*file) == NULL) { - (*file) = ap_pcalloc(cont, sizeof(struct ap_file_t)); + (*file) = ap_pcalloc(cont, sizeof(ap_file_t)); (*file)->cntxt = cont; } /* if we are putting in a new file descriptor, then we don't really @@ -340,7 +340,7 @@ ap_status_t ap_ferror(ap_file_t *fptr) * arg 1) The apr file to use as stderr. * arg 2) The context to allocate the file out of. */ -ap_status_t ap_open_stderr(struct ap_file_t **thefile, ap_context_t *cont) +ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont) { if (thefile == NULL) return APR_EBADARG; @@ -348,7 +348,7 @@ ap_status_t ap_open_stderr(struct ap_file_t **thefile, ap_context_t *cont) if (cont == NULL) return APR_ENOCONT; - (*thefile) = ap_pcalloc(cont, sizeof(struct ap_file_t)); + (*thefile) = ap_pcalloc(cont, sizeof(ap_file_t)); if ((*thefile) == NULL) { return APR_ENOMEM; } diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c index 118d05699..fc3ef721b 100644 --- a/file_io/unix/pipe.c +++ b/file_io/unix/pipe.c @@ -54,7 +54,7 @@ #include "fileio.h" -static ap_status_t pipenonblock(struct ap_file_t *thefile) +static ap_status_t pipenonblock(ap_file_t *thefile) { #ifndef BEOS /* this code won't work on BeOS */ int fd_flags = fcntl(thefile->filedes, F_GETFL, 0); @@ -84,7 +84,7 @@ static ap_status_t pipenonblock(struct ap_file_t *thefile) * arg 3) The timeout value in seconds. Values < 0 mean wait forever, 0 * means do not wait at all. */ -ap_status_t ap_set_pipe_timeout(struct ap_file_t *thepipe, ap_int32_t timeout) +ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_int32_t timeout) { if(thepipe == NULL) return APR_EBADARG; @@ -104,7 +104,7 @@ ap_status_t ap_set_pipe_timeout(struct ap_file_t *thepipe, ap_int32_t timeout) * arg 2) The file descriptor to use as output from the pipe. * arg 3) The context to operate on. */ -ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_context_t *cont) +ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont) { int filedes[2]; @@ -118,7 +118,7 @@ ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_con return errno; } - (*in) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*in) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); (*in)->cntxt = cont; (*in)->filedes = filedes[0]; (*in)->buffered = 0; @@ -126,7 +126,7 @@ ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_con (*in)->fname = ap_pstrdup(cont, "PIPE"); (*in)->timeout = -1; - (*out) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*out) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); (*out)->cntxt = cont; (*out)->filedes = filedes[1]; (*out)->buffered = 0; diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c index 5a8f4e15b..cce590881 100644 --- a/file_io/unix/readwrite.c +++ b/file_io/unix/readwrite.c @@ -65,7 +65,7 @@ * the available data is read. The third argument is modified to reflect the * number of bytes read. */ -ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { ap_ssize_t rv; @@ -147,7 +147,7 @@ ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) * can. The third argument is modified to reflect the * number of bytes * written. */ -ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_write(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { ap_size_t rv; @@ -223,7 +223,7 @@ ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) * arg 4) The number of bytes written. */ #ifdef HAVE_WRITEV -ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec, +ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes) { int bytes; @@ -423,7 +423,7 @@ static int printf_flush(ap_vformatter_buff_t *vbuff) } #endif -API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...) +API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/file_io/unix/seek.c b/file_io/unix/seek.c index 49b5b30cd..b3b246ada 100644 --- a/file_io/unix/seek.c +++ b/file_io/unix/seek.c @@ -67,7 +67,7 @@ * NOTE: The third argument is modified to be the offset the pointer * was actually moved to. */ -ap_status_t ap_seek(struct ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset) +ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset) { ap_off_t rv; if (thefile->buffered) { diff --git a/file_io/win32/dir.c b/file_io/win32/dir.c index b410a9a3c..9fc909496 100644 --- a/file_io/win32/dir.c +++ b/file_io/win32/dir.c @@ -71,17 +71,17 @@ ap_status_t dir_cleanup(void *thedir) { - struct ap_dir_t *dir = thedir; + ap_dir_t *dir = thedir; if (!CloseHandle(dir->dirhand)) { return GetLastError(); } return APR_SUCCESS; } -ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t *cont) +ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cont) { char * temp; - (*new) = ap_palloc(cont, sizeof(struct ap_dir_t)); + (*new) = ap_palloc(cont, sizeof(ap_dir_t)); (*new)->cntxt = cont; (*new)->entry = NULL; temp = canonical_filename((*new)->cntxt, dirname); @@ -97,7 +97,7 @@ ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t return APR_SUCCESS; } -ap_status_t ap_closedir(struct ap_dir_t *thedir) +ap_status_t ap_closedir(ap_dir_t *thedir) { if (!FindClose(thedir->dirhand)) { return GetLastError(); @@ -106,7 +106,7 @@ ap_status_t ap_closedir(struct ap_dir_t *thedir) return APR_SUCCESS; } -ap_status_t ap_readdir(struct ap_dir_t *thedir) +ap_status_t ap_readdir(ap_dir_t *thedir) { if (thedir->dirhand == INVALID_HANDLE_VALUE) { thedir->entry = ap_palloc(thedir->cntxt, sizeof(WIN32_FIND_DATA)); @@ -122,7 +122,7 @@ ap_status_t ap_readdir(struct ap_dir_t *thedir) return APR_SUCCESS; } -ap_status_t ap_rewinddir(struct ap_dir_t *thedir) +ap_status_t ap_rewinddir(ap_dir_t *thedir) { ap_status_t stat; ap_context_t *cont = thedir->cntxt; @@ -157,7 +157,7 @@ ap_status_t ap_remove_dir(const char *path, ap_context_t *cont) return APR_SUCCESS; } -ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir) { if (thedir == NULL || thedir->entry == NULL) { return APR_ENODIR; @@ -167,7 +167,7 @@ ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir) return APR_SUCCESS; } -ap_status_t ap_dir_entry_mtime(time_t *time, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_mtime(time_t *time, ap_dir_t *thedir) { if (thedir == NULL || thedir->entry == NULL) { return APR_ENODIR; @@ -176,7 +176,7 @@ ap_status_t ap_dir_entry_mtime(time_t *time, struct ap_dir_t *thedir) return APR_SUCCESS; } -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir) +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir) { switch(thedir->entry->dwFileAttributes) { case FILE_ATTRIBUTE_DIRECTORY: { @@ -194,13 +194,13 @@ ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir) } } -ap_status_t ap_get_dir_filename(char **new, struct ap_dir_t *thedir) +ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir) { (*new) = ap_pstrdup(thedir->cntxt, thedir->entry->cFileName); return APR_SUCCESS; } -ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct ap_dir_t *dir) +ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir) { if (dir == NULL) { return APR_ENODIR; @@ -209,13 +209,13 @@ ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct ap_dir_t *dir) return APR_SUCCESS; } -ap_status_t ap_put_os_dir(struct ap_dir_t **dir, ap_os_dir_t *thedir, ap_context_t *cont) +ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*dir) == NULL) { - (*dir) = (struct ap_dir_t *)ap_palloc(cont, sizeof(struct ap_dir_t)); + (*dir) = (ap_dir_t *)ap_palloc(cont, sizeof(ap_dir_t)); (*dir)->cntxt = cont; } (*dir)->dirhand = thedir; diff --git a/file_io/win32/fileacc.c b/file_io/win32/fileacc.c index c19d6ceee..7edb8e3ed 100644 --- a/file_io/win32/fileacc.c +++ b/file_io/win32/fileacc.c @@ -60,9 +60,9 @@ #include <string.h> #include <sys/types.h> -/* A file to put ALL of the accessor functions for struct ap_file_t types. */ +/* A file to put ALL of the accessor functions for ap_file_t types. */ -ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile) +ap_status_t ap_get_filename(char **new, ap_file_t *thefile) { if (thefile != NULL) { *new = ap_pstrdup(thefile->cntxt, thefile->fname); @@ -104,7 +104,7 @@ ap_status_t ap_get_filename(char **new, struct ap_file_t *thefile) /* -ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct ap_file_t *file) +ap_status_t ap_get_fileperms(ap_fileperms_t *perm, ap_file_t *file) { if (file != NULL) { *perm = file->protection; @@ -117,7 +117,7 @@ ap_status_t ap_get_fileperms(ap_fileperms_t *perm, struct ap_file_t *file) } */ -ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file) +ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file) { if (file != NULL) { return ap_get_userdata(data, key, file->cntxt); @@ -128,7 +128,7 @@ ap_status_t ap_get_filedata(void **data, char *key, struct ap_file_t *file) } } -ap_status_t ap_set_filedata(struct ap_file_t *file, void *data, char *key, +ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (file != NULL) { diff --git a/file_io/win32/filedup.c b/file_io/win32/filedup.c index fb4b760c2..3b5c48a4a 100644 --- a/file_io/win32/filedup.c +++ b/file_io/win32/filedup.c @@ -58,13 +58,13 @@ #include "apr_lib.h" #include <string.h> -ap_status_t ap_dupfile(struct ap_file_t **new_file, struct ap_file_t *old_file) +ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file) { HANDLE hCurrentProcess = GetCurrentProcess(); if ((*new_file) == NULL) { - (*new_file) = (struct ap_file_t *) ap_pcalloc(old_file->cntxt, - sizeof(struct ap_file_t)); + (*new_file) = (ap_file_t *) ap_pcalloc(old_file->cntxt, + sizeof(ap_file_t)); if ((*new_file) == NULL) { return APR_ENOMEM; } diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c index 3f00d9f75..a157f85e1 100644 --- a/file_io/win32/filestat.c +++ b/file_io/win32/filestat.c @@ -99,7 +99,7 @@ BOOLEAN is_exe(const char* fname, ap_context_t *cont) { return FALSE; } -ap_status_t ap_getfileinfo(ap_finfo_t *finfo, struct ap_file_t *thefile) +ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile) { /* TODO: * Windows should call GetFileInformationByHandle(), which is similar diff --git a/file_io/win32/open.c b/file_io/win32/open.c index e64b39e74..2aff9fe66 100644 --- a/file_io/win32/open.c +++ b/file_io/win32/open.c @@ -65,7 +65,7 @@ ap_status_t file_cleanup(void *thefile) { - struct ap_file_t *file = thefile; + ap_file_t *file = thefile; if (!CloseHandle(file->filehand)) { return GetLastError(); } @@ -73,7 +73,7 @@ ap_status_t file_cleanup(void *thefile) return APR_SUCCESS; } -ap_status_t ap_open(struct ap_file_t **dafile, const char *fname, +ap_status_t ap_open(ap_file_t **dafile, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont) { DWORD oflags = 0; @@ -82,7 +82,7 @@ ap_status_t ap_open(struct ap_file_t **dafile, const char *fname, DWORD sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE; ap_oslevel_e level; - (*dafile) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*dafile) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); (*dafile)->cntxt = cont; @@ -168,7 +168,7 @@ ap_status_t ap_open(struct ap_file_t **dafile, const char *fname, return APR_SUCCESS; } -ap_status_t ap_close(struct ap_file_t *file) +ap_status_t ap_close(ap_file_t *file) { ap_status_t stat; if ((stat = file_cleanup(file)) == APR_SUCCESS) { @@ -190,7 +190,7 @@ ap_status_t ap_remove_file(char *path, ap_context_t *cont) } } -ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file) +ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file) { if (file == NULL) { return APR_ENOFILE; @@ -199,14 +199,14 @@ ap_status_t ap_get_os_file(ap_os_file_t *thefile, struct ap_file_t *file) return APR_SUCCESS; } -ap_status_t ap_put_os_file(struct ap_file_t **file, ap_os_file_t *thefile, +ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, ap_context_t *cont) { if ((*file) == NULL) { if (cont == NULL) { return APR_ENOCONT; } - (*file) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); + (*file) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); (*file)->cntxt = cont; } (*file)->filehand = *thefile; @@ -221,9 +221,9 @@ ap_status_t ap_eof(ap_file_t *fptr) return APR_SUCCESS; } -ap_status_t ap_open_stderr(struct ap_file_t **thefile, ap_context_t *cont) +ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont) { - (*thefile) = ap_pcalloc(cont, sizeof(struct ap_file_t)); + (*thefile) = ap_pcalloc(cont, sizeof(ap_file_t)); if ((*thefile) == NULL) { return APR_ENOMEM; } diff --git a/file_io/win32/pipe.c b/file_io/win32/pipe.c index ec6bcd508..9eaa8492e 100644 --- a/file_io/win32/pipe.c +++ b/file_io/win32/pipe.c @@ -62,11 +62,11 @@ #include <sys/types.h> #include <sys/stat.h> -ap_status_t ap_set_pipe_timeout(struct ap_file_t *thepipe, ap_int32_t timeout) +ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_int32_t timeout) { return APR_ENOTIMPL; } -ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_context_t *cont) +ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont) { SECURITY_ATTRIBUTES sa; @@ -74,13 +74,13 @@ ap_status_t ap_create_pipe(struct ap_file_t **in, struct ap_file_t **out, ap_con sa.bInheritHandle = TRUE; sa.lpSecurityDescriptor = NULL; - (*in) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); - memset(*in, '\0', sizeof(struct ap_file_t)); + (*in) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); + memset(*in, '\0', sizeof(ap_file_t)); (*in)->cntxt = cont; (*in)->fname = ap_pstrdup(cont, "PIPE"); - (*out) = (struct ap_file_t *)ap_palloc(cont, sizeof(struct ap_file_t)); - memset(*out, '\0', sizeof(struct ap_file_t)); + (*out) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t)); + memset(*out, '\0', sizeof(ap_file_t)); (*out)->cntxt = cont; (*out)->fname = ap_pstrdup(cont, "PIPE"); diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c index 3850b9c01..ded3a6493 100644 --- a/file_io/win32/readwrite.c +++ b/file_io/win32/readwrite.c @@ -62,7 +62,7 @@ #define GetFilePointer(hfile) SetFilePointer(hfile,0,NULL, FILE_CURRENT) -ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { DWORD bread; int lasterror; @@ -88,7 +88,7 @@ ap_status_t ap_read(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) return lasterror; } -ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) +ap_status_t ap_write(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) { DWORD bwrote; FILETIME atime, mtime, ctime; @@ -116,7 +116,7 @@ ap_status_t ap_write(struct ap_file_t *thefile, void *buf, ap_ssize_t *nbytes) /* * Too bad WriteFileGather() is not supported on 95&98 (or NT prior to SP2) */ -ap_status_t ap_writev(struct ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, +ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes) { int i; @@ -249,7 +249,7 @@ static int printf_flush(ap_vformatter_buff_t *vbuff) return -1; } -API_EXPORT(int) ap_fprintf(struct ap_file_t *fptr, const char *format, ...) +API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/file_io/win32/seek.c b/file_io/win32/seek.c index edac0d41a..34b1fa226 100644 --- a/file_io/win32/seek.c +++ b/file_io/win32/seek.c @@ -57,7 +57,7 @@ #include <errno.h> #include <string.h> -ap_status_t ap_seek(struct ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset) +ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where, ap_off_t *offset) { DWORD howmove; DWORD rv; diff --git a/include/apr_portable.h b/include/apr_portable.h index 815b70126..ea4503e85 100644 --- a/include/apr_portable.h +++ b/include/apr_portable.h @@ -187,7 +187,7 @@ ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **, ap_exploded_time_t *); ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **, ap_time_t *); #if APR_HAS_THREADS ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd); -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_key_t *key); +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_threadkey_t *key); #endif ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, @@ -205,7 +205,7 @@ ap_status_t ap_put_os_exp_time(ap_exploded_time_t *, ap_os_exp_time_t **, ap_con #if APR_HAS_THREADS ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, ap_context_t *cont); -ap_status_t ap_put_os_threadkey(ap_key_t **key, ap_os_threadkey_t *thekey, +ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, ap_os_threadkey_t *thekey, ap_context_t *cont); #endif diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h index a7581a141..ef2725804 100644 --- a/include/apr_thread_proc.h +++ b/include/apr_thread_proc.h @@ -82,7 +82,7 @@ typedef struct ap_threadattr_t ap_threadattr_t; typedef struct ap_proc_t ap_proc_t; typedef struct ap_procattr_t ap_procattr_t; -typedef struct ap_threadkey_t ap_key_t; +typedef struct ap_threadkey_t ap_threadkey_t; typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *); @@ -105,15 +105,15 @@ ap_status_t ap_set_threaddata(void *data, char *key, ap_status_t (*cleanup) (void *), ap_thread_t *thread); -ap_status_t ap_create_thread_private(ap_key_t **key, void (*dest)(void *), +ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *), ap_context_t *cont); -ap_status_t ap_get_thread_private(void **new, ap_key_t *key); -ap_status_t ap_set_thread_private(void *priv, ap_key_t *key); -ap_status_t ap_delete_thread_private(ap_key_t *key); -ap_status_t ap_get_threadkeydata(void **data, char *key, ap_key_t *threadkey); +ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key); +ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key); +ap_status_t ap_delete_thread_private(ap_threadkey_t *key); +ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey); ap_status_t ap_set_threadkeydata(void *data, char *key, ap_status_t (*cleanup) (void *), - ap_key_t *threadkey); + ap_threadkey_t *threadkey); /* Process Function definitions */ ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont); diff --git a/include/arch/unix/mmap.c b/include/arch/unix/mmap.c index 3cfcda7b3..8ac7abdc0 100644 --- a/include/arch/unix/mmap.c +++ b/include/arch/unix/mmap.c @@ -64,7 +64,7 @@ ap_status_t mmap_cleanup(void *themmap) { - struct ap_mmap_t *mm = themmap; + ap_mmap_t *mm = themmap; int rv; rv = munmap(mm->mm, mm->size); @@ -93,7 +93,7 @@ ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, if (file == NULL || file->buffered || file->filedes == -1) return APR_EBADF; - (*new) = (struct ap_mmap_t *)ap_palloc(cont, sizeof(struct ap_mmap_t)); + (*new) = (ap_mmap_t *)ap_palloc(cont, sizeof(ap_mmap_t)); ap_seek(file, APR_SET, &offset); mm = mmap(NULL, size, PROT_READ, MAP_SHARED, file->filedes ,0); @@ -117,7 +117,7 @@ ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, * Remove a mmap'ed. * arg 1) The mmap'ed file. */ -ap_status_t ap_mmap_delete(struct ap_mmap_t *mmap) +ap_status_t ap_mmap_delete(ap_mmap_t *mmap) { ap_status_t rv; diff --git a/lib/apr_pools.c b/lib/apr_pools.c index b148ad3d9..5ff0de439 100644 --- a/lib/apr_pools.c +++ b/lib/apr_pools.c @@ -594,7 +594,7 @@ static void ap_register_pool_cleanup(struct ap_pool_t *p, void *data, } #endif -API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data, +API_EXPORT(void) ap_register_cleanup(ap_context_t *p, void *data, ap_status_t (*plain_cleanup) (void *), ap_status_t (*child_cleanup) (void *)) { @@ -610,7 +610,7 @@ API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data, } } -API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data, +API_EXPORT(void) ap_kill_cleanup(ap_context_t *p, void *data, ap_status_t (*cleanup) (void *)) { struct cleanup *c; @@ -631,7 +631,7 @@ API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data, } } -API_EXPORT(void) ap_run_cleanup(struct ap_context_t *p, void *data, +API_EXPORT(void) ap_run_cleanup(ap_context_t *p, void *data, ap_status_t (*cleanup) (void *)) { ap_block_alarms(); /* Run cleanup only once! */ @@ -776,7 +776,7 @@ static void ap_clear_real_pool(ap_pool_t *a) ap_unblock_alarms(); } -API_EXPORT(void) ap_clear_pool(struct ap_context_t *a) +API_EXPORT(void) ap_clear_pool(ap_context_t *a) { ap_clear_real_pool(a->pool); } @@ -807,7 +807,7 @@ API_EXPORT(void) ap_destroy_real_pool(ap_pool_t *a) ap_unblock_alarms(); } -API_EXPORT(void) ap_destroy_pool(struct ap_context_t *a) +API_EXPORT(void) ap_destroy_pool(ap_context_t *a) { ap_destroy_real_pool(a->pool); } @@ -1024,7 +1024,7 @@ static void * ap_pool_palloc(ap_pool_t *a, int reqsize, int (*apr_abort)(int ret #endif } -API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize) +API_EXPORT(void *) ap_palloc(ap_context_t *c, int reqsize) { if (c == NULL) { return malloc(reqsize); @@ -1032,14 +1032,14 @@ API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize) return ap_pool_palloc(c->pool, reqsize, c->apr_abort); } -API_EXPORT(void *) ap_pcalloc(struct ap_context_t *a, int size) +API_EXPORT(void *) ap_pcalloc(ap_context_t *a, int size) { void *res = ap_palloc(a, size); memset(res, '\0', size); return res; } -API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s) +API_EXPORT(char *) ap_pstrdup(ap_context_t *a, const char *s) { char *res; size_t len; @@ -1053,7 +1053,7 @@ API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s) return res; } -API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n) +API_EXPORT(char *) ap_pstrndup(ap_context_t *a, const char *s, int n) { char *res; @@ -1066,7 +1066,7 @@ API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n) return res; } -API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_context_t *a, ...) +API_EXPORT_NONSTD(char *) ap_pstrcat(ap_context_t *a, ...) { char *cp, *argp, *res; @@ -1191,7 +1191,7 @@ static int psprintf_flush(ap_vformatter_buff_t *vbuff) #endif } -API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list ap) +API_EXPORT(char *) ap_pvsprintf(ap_context_t *c, const char *fmt, va_list ap) { #ifdef ALLOC_USE_MALLOC ap_pool_t *p = c->pool; @@ -1256,7 +1256,7 @@ API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list #endif } -API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, ...) +API_EXPORT_NONSTD(char *) ap_psprintf(ap_context_t *p, const char *fmt, ...) { va_list ap; char *res; @@ -1279,7 +1279,7 @@ API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, . * generic interface, but for now, it's a special case */ -API_EXPORT(void) ap_note_subprocess(struct ap_context_t *a, ap_proc_t *pid, +API_EXPORT(void) ap_note_subprocess(ap_context_t *a, ap_proc_t *pid, enum kill_conditions how) { struct process_chain *new = diff --git a/lib/apr_tables.c b/lib/apr_tables.c index 96c0dfca6..90517a81b 100644 --- a/lib/apr_tables.c +++ b/lib/apr_tables.c @@ -84,7 +84,7 @@ * The 'array' functions... */ -static void make_array_core(ap_array_header_t *res, struct ap_context_t *c, +static void make_array_core(ap_array_header_t *res, ap_context_t *c, int nelts, int elt_size) { /* @@ -103,7 +103,7 @@ static void make_array_core(ap_array_header_t *res, struct ap_context_t *c, res->nalloc = nelts; /* ...but this many allocated */ } -API_EXPORT(ap_array_header_t *) ap_make_array(struct ap_context_t *p, +API_EXPORT(ap_array_header_t *) ap_make_array(ap_context_t *p, int nelts, int elt_size) { ap_array_header_t *res; @@ -155,7 +155,7 @@ API_EXPORT(void) ap_array_cat(ap_array_header_t *dst, dst->nelts += src->nelts; } -API_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_context_t *p, +API_EXPORT(ap_array_header_t *) ap_copy_array(ap_context_t *p, const ap_array_header_t *arr) { ap_array_header_t *res = ap_make_array(p, arr->nalloc, arr->elt_size); @@ -182,7 +182,7 @@ static APR_INLINE void copy_array_hdr_core(ap_array_header_t *res, } API_EXPORT(ap_array_header_t *) - ap_copy_array_hdr(struct ap_context_t *p, + ap_copy_array_hdr(ap_context_t *p, const ap_array_header_t *arr) { ap_array_header_t *res; @@ -196,7 +196,7 @@ API_EXPORT(ap_array_header_t *) /* The above is used here to avoid consing multiple new array bodies... */ API_EXPORT(ap_array_header_t *) - ap_append_arrays(struct ap_context_t *p, + ap_append_arrays(ap_context_t *p, const ap_array_header_t *first, const ap_array_header_t *second) { @@ -212,7 +212,7 @@ API_EXPORT(ap_array_header_t *) * or if there are no elements in the array. * If sep is non-NUL, it will be inserted between elements as a separator. */ -API_EXPORT(char *) ap_array_pstrcat(struct ap_context_t *p, +API_EXPORT(char *) ap_array_pstrcat(ap_context_t *p, const ap_array_header_t *arr, const char sep) { @@ -289,7 +289,7 @@ static ap_table_entry_t *table_push(ap_table_t *t) #endif /* MAKE_TABLE_PROFILE */ -API_EXPORT(ap_table_t *) ap_make_table(struct ap_context_t *p, int nelts) +API_EXPORT(ap_table_t *) ap_make_table(ap_context_t *p, int nelts) { ap_table_t *t = ap_palloc(p, sizeof(ap_table_t)); @@ -300,7 +300,7 @@ API_EXPORT(ap_table_t *) ap_make_table(struct ap_context_t *p, int nelts) return t; } -API_EXPORT(ap_table_t *) ap_copy_table(struct ap_context_t *p, const ap_table_t *t) +API_EXPORT(ap_table_t *) ap_copy_table(ap_context_t *p, const ap_table_t *t) { ap_table_t *new = ap_palloc(p, sizeof(ap_table_t)); @@ -530,7 +530,7 @@ API_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key, elts->val = (char *)val; } -API_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_context_t *p, +API_EXPORT(ap_table_t *) ap_overlay_tables(ap_context_t *p, const ap_table_t *overlay, const ap_table_t *base) { diff --git a/locks/beos/crossproc.c b/locks/beos/crossproc.c index e85e0a7bd..264503a04 100644 --- a/locks/beos/crossproc.c +++ b/locks/beos/crossproc.c @@ -123,7 +123,7 @@ ap_status_t destroy_inter_lock(ap_lock_t *lock) return stat; } -ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname) +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname) { return APR_SUCCESS; } diff --git a/locks/beos/intraproc.c b/locks/beos/intraproc.c index d1a1f538c..89bfc17bc 100644 --- a/locks/beos/intraproc.c +++ b/locks/beos/intraproc.c @@ -68,7 +68,7 @@ ap_status_t lock_intra_cleanup(void *data) return APR_SUCCESS; } -ap_status_t create_intra_lock(struct ap_lock_t *new) +ap_status_t create_intra_lock(ap_lock_t *new) { int32 stat; new->sem_intraproc = (sem_id)ap_palloc(new->cntxt, sizeof(sem_id)); diff --git a/locks/beos/locks.c b/locks/beos/locks.c index 3bc544756..f3a4b7dc5 100644 --- a/locks/beos/locks.c +++ b/locks/beos/locks.c @@ -54,14 +54,14 @@ #include "locks.h" -ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, +ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont) { - struct ap_lock_t *new; + ap_lock_t *new; ap_status_t stat; - new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); if (new == NULL){ return APR_ENOMEM; } @@ -134,7 +134,7 @@ ap_status_t ap_destroy_lock(ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_t *cont) +ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont) { ap_status_t stat; if ((*lock)->scope != APR_CROSS_PROCESS) { @@ -145,7 +145,7 @@ ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_ return APR_SUCCESS; } -ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) +ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data) { if (lock != NULL) { return ap_get_userdata(data, key, lock->cntxt); @@ -156,7 +156,7 @@ ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) } } -ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key, +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (lock != NULL) { diff --git a/locks/os2/locks.c b/locks/os2/locks.c index c70ef5e60..33e6bb563 100644 --- a/locks/os2/locks.c +++ b/locks/os2/locks.c @@ -71,20 +71,20 @@ void setup_lock() static ap_status_t lock_cleanup(void *thelock) { - struct ap_lock_t *lock = thelock; + ap_lock_t *lock = thelock; return ap_destroy_lock(lock); } -ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont) +ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont) { - struct ap_lock_t *new; + ap_lock_t *new; ULONG rc; char *semname; PIB *ppib; - new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); new->cntxt = cont; new->type = type; new->scope = scope; @@ -114,7 +114,7 @@ ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont int rc; PIB *ppib; - *lock = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + *lock = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); if (lock == NULL) return APR_ENOMEM; @@ -132,7 +132,7 @@ ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont -ap_status_t ap_lock(struct ap_lock_t *lock) +ap_status_t ap_lock(ap_lock_t *lock) { ULONG rc; @@ -148,7 +148,7 @@ ap_status_t ap_lock(struct ap_lock_t *lock) -ap_status_t ap_unlock(struct ap_lock_t *lock) +ap_status_t ap_unlock(ap_lock_t *lock) { ULONG rc; @@ -163,7 +163,7 @@ ap_status_t ap_unlock(struct ap_lock_t *lock) -ap_status_t ap_destroy_lock(struct ap_lock_t *lock) +ap_status_t ap_destroy_lock(ap_lock_t *lock) { ULONG rc; ap_status_t stat = APR_SUCCESS; diff --git a/locks/unix/crossproc.c b/locks/unix/crossproc.c index 26beb71e1..433950d63 100644 --- a/locks/unix/crossproc.c +++ b/locks/unix/crossproc.c @@ -70,7 +70,7 @@ void setup_lock() { ap_status_t lock_cleanup(void *lock_) { - struct ap_lock_t *lock=lock_; + ap_lock_t *lock=lock_; union semun ick; if (lock->interproc != -1) { @@ -80,7 +80,7 @@ ap_status_t lock_cleanup(void *lock_) return APR_SUCCESS; } -ap_status_t create_inter_lock(struct ap_lock_t *new) +ap_status_t create_inter_lock(ap_lock_t *new) { union semun ick; struct semid_ds buf; @@ -101,7 +101,7 @@ ap_status_t create_inter_lock(struct ap_lock_t *new) return APR_SUCCESS; } -ap_status_t lock_inter(struct ap_lock_t *lock) +ap_status_t lock_inter(ap_lock_t *lock) { lock->curr_locked = 1; if (semop(lock->interproc, &op_on, 1) < 0) { @@ -110,7 +110,7 @@ ap_status_t lock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t unlock_inter(struct ap_lock_t *lock) +ap_status_t unlock_inter(ap_lock_t *lock) { if (semop(lock->interproc, &op_off, 1) < 0) { return errno; @@ -119,7 +119,7 @@ ap_status_t unlock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t destroy_inter_lock(struct ap_lock_t *lock) +ap_status_t destroy_inter_lock(ap_lock_t *lock) { ap_status_t stat; @@ -130,7 +130,7 @@ ap_status_t destroy_inter_lock(struct ap_lock_t *lock) return stat; } -ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname) +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname) { return APR_SUCCESS; } @@ -142,7 +142,7 @@ void setup_lock() { ap_status_t lock_cleanup(void *lock_) { - struct ap_lock_t *lock=lock_; + ap_lock_t *lock=lock_; if (lock->curr_locked == 1) { if (pthread_mutex_unlock(lock->interproc)) { @@ -155,7 +155,7 @@ ap_status_t lock_cleanup(void *lock_) return APR_SUCCESS; } -ap_status_t create_inter_lock(struct ap_lock_t *new) +ap_status_t create_inter_lock(ap_lock_t *new) { ap_status_t stat; int fd; @@ -198,7 +198,7 @@ ap_status_t create_inter_lock(struct ap_lock_t *new) return APR_SUCCESS; } -ap_status_t lock_inter(struct ap_lock_t *lock) +ap_status_t lock_inter(ap_lock_t *lock) { ap_status_t stat; lock->curr_locked = 1; @@ -208,7 +208,7 @@ ap_status_t lock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t unlock_inter(struct ap_lock_t *lock) +ap_status_t unlock_inter(ap_lock_t *lock) { ap_status_t stat; @@ -219,7 +219,7 @@ ap_status_t unlock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t destroy_inter_lock(struct ap_lock_t *lock) +ap_status_t destroy_inter_lock(ap_lock_t *lock) { ap_status_t stat; if ((stat = lock_cleanup(lock)) == APR_SUCCESS) { @@ -229,7 +229,7 @@ ap_status_t destroy_inter_lock(struct ap_lock_t *lock) return stat; } -ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname) +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname) { return APR_SUCCESS; } @@ -254,7 +254,7 @@ void setup_lock() { static ap_status_t lock_cleanup(void *lock_) { - struct ap_lock_t *lock=lock_; + ap_lock_t *lock=lock_; if (lock->curr_locked == 1) { if (fcntl(lock->interproc, F_SETLKW, &unlock_it) < 0) { @@ -265,7 +265,7 @@ static ap_status_t lock_cleanup(void *lock_) return APR_SUCCESS; } -ap_status_t create_inter_lock(struct ap_lock_t *new) +ap_status_t create_inter_lock(ap_lock_t *new) { new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0644); @@ -280,7 +280,7 @@ ap_status_t create_inter_lock(struct ap_lock_t *new) return APR_SUCCESS; } -ap_status_t lock_inter(struct ap_lock_t *lock) +ap_status_t lock_inter(ap_lock_t *lock) { lock->curr_locked=1; if (fcntl(lock->interproc, F_SETLKW, &lock_it) < 0) { @@ -289,7 +289,7 @@ ap_status_t lock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t unlock_inter(struct ap_lock_t *lock) +ap_status_t unlock_inter(ap_lock_t *lock) { if (fcntl(lock->interproc, F_SETLKW, &unlock_it) < 0) { return errno; @@ -298,7 +298,7 @@ ap_status_t unlock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t destroy_inter_lock(struct ap_lock_t *lock) +ap_status_t destroy_inter_lock(ap_lock_t *lock) { ap_status_t stat; if ((stat = lock_cleanup(lock)) == APR_SUCCESS) { @@ -308,7 +308,7 @@ ap_status_t destroy_inter_lock(struct ap_lock_t *lock) return stat; } -ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname) +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname) { return APR_SUCCESS; } @@ -320,7 +320,7 @@ void setup_lock() { ap_status_t lock_cleanup(void *lock_) { - struct ap_lock_t *lock=lock_; + ap_lock_t *lock=lock_; if (lock->curr_locked == 1) { if (flock(lock->interproc, LOCK_UN) < 0) { @@ -332,7 +332,7 @@ ap_status_t lock_cleanup(void *lock_) return APR_SUCCESS; } -ap_status_t create_inter_lock(struct ap_lock_t *new) +ap_status_t create_inter_lock(ap_lock_t *new) { new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0600); @@ -345,7 +345,7 @@ ap_status_t create_inter_lock(struct ap_lock_t *new) return APR_SUCCESS; } -ap_status_t lock_inter(struct ap_lock_t *lock) +ap_status_t lock_inter(ap_lock_t *lock) { lock->curr_locked = 1; if (flock(lock->interproc, LOCK_EX) < 0) { @@ -354,7 +354,7 @@ ap_status_t lock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t unlock_inter(struct ap_lock_t *lock) +ap_status_t unlock_inter(ap_lock_t *lock) { if (flock(lock->interproc, LOCK_UN) < 0) { return errno; @@ -363,7 +363,7 @@ ap_status_t unlock_inter(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t destroy_inter_lock(struct ap_lock_t *lock) +ap_status_t destroy_inter_lock(ap_lock_t *lock) { ap_status_t stat; if ((stat = lock_cleanup(lock)) == APR_SUCCESS) { @@ -373,11 +373,11 @@ ap_status_t destroy_inter_lock(struct ap_lock_t *lock) return stat; } -ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname) +ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont, char *fname) { - struct ap_lock_t *new; + ap_lock_t *new; - new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); new->fname = ap_pstrdup(cont, fname); new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0600); diff --git a/locks/unix/intraproc.c b/locks/unix/intraproc.c index e04867053..9a10fbf76 100644 --- a/locks/unix/intraproc.c +++ b/locks/unix/intraproc.c @@ -60,11 +60,11 @@ ap_status_t lock_intra_cleanup(void *data) { - struct ap_lock_t *lock = (struct ap_lock_t *) data; + ap_lock_t *lock = (ap_lock_t *) data; return pthread_mutex_unlock(lock->intraproc); } -ap_status_t create_intra_lock(struct ap_lock_t *new) +ap_status_t create_intra_lock(ap_lock_t *new) { ap_status_t stat; pthread_mutexattr_t mattr; @@ -95,12 +95,12 @@ ap_status_t create_intra_lock(struct ap_lock_t *new) return APR_SUCCESS; } -ap_status_t lock_intra(struct ap_lock_t *lock) +ap_status_t lock_intra(ap_lock_t *lock) { return pthread_mutex_lock(lock->intraproc); } -ap_status_t unlock_intra(struct ap_lock_t *lock) +ap_status_t unlock_intra(ap_lock_t *lock) { ap_status_t status; @@ -108,7 +108,7 @@ ap_status_t unlock_intra(struct ap_lock_t *lock) return status; } -ap_status_t destroy_intra_lock(struct ap_lock_t *lock) +ap_status_t destroy_intra_lock(ap_lock_t *lock) { ap_status_t stat; if ((stat = lock_intra_cleanup(lock)) == APR_SUCCESS) { diff --git a/locks/unix/locks.c b/locks/unix/locks.c index ac111493a..67872ef84 100644 --- a/locks/unix/locks.c +++ b/locks/unix/locks.c @@ -76,14 +76,14 @@ * NOTE: APR_CROSS_PROCESS may lock both processes and threads, but it is * only guaranteed to lock processes. */ -ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, +ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont) { - struct ap_lock_t *new; + ap_lock_t *new; ap_status_t stat; - new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + new = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); new->cntxt = cont; new->type = type; @@ -124,7 +124,7 @@ ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, * Lock a protected region. * arg 1) The lock to set. */ -ap_status_t ap_lock(struct ap_lock_t *lock) +ap_status_t ap_lock(ap_lock_t *lock) { ap_status_t stat; if (lock->scope != APR_CROSS_PROCESS) { @@ -149,7 +149,7 @@ ap_status_t ap_lock(struct ap_lock_t *lock) * Unlock a protected region. * arg 1) The lock to reset. */ -ap_status_t ap_unlock(struct ap_lock_t *lock) +ap_status_t ap_unlock(ap_lock_t *lock) { ap_status_t stat; @@ -177,7 +177,7 @@ ap_status_t ap_unlock(struct ap_lock_t *lock) * NOTE: If the lock is currently active when it is destroyed, it * will be unlocked first. */ -ap_status_t ap_destroy_lock(struct ap_lock_t *lock) +ap_status_t ap_destroy_lock(ap_lock_t *lock) { ap_status_t stat; if (lock->scope != APR_CROSS_PROCESS) { @@ -212,7 +212,7 @@ ap_status_t ap_destroy_lock(struct ap_lock_t *lock) * idea to call it regardless, because it makes the code more * portable. */ -ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_t *cont) +ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont) { ap_status_t stat; if ((*lock)->scope != APR_CROSS_PROCESS) { @@ -230,7 +230,7 @@ ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_ * arg 2) The key to use when retreiving data associated with this lock * arg 3) The user data associated with the lock. */ -ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) +ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data) { if (lock != NULL) { return ap_get_userdata(data, key, lock->cntxt); @@ -250,7 +250,7 @@ ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) * arg 3) The key to use when associating data with this lock * arg 4) The cleanup to use when the lock is destroyed. */ -ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key, +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (lock != NULL) { @@ -268,7 +268,7 @@ ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key, * arg 1) The os specific lock we are converting to. * arg 2) The apr lock to convert. */ -ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, struct ap_lock_t *lock) +ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, ap_lock_t *lock) { if (lock == NULL) { return APR_ENOLOCK; @@ -291,14 +291,14 @@ ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, struct ap_lock_t *lock) * arg 2) The os specific lock to convert. * arg 3) The context to use if it is needed. */ -ap_status_t ap_put_os_lock(struct ap_lock_t **lock, ap_os_lock_t *thelock, +ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*lock) == NULL) { - (*lock) = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + (*lock) = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); (*lock)->cntxt = cont; } (*lock)->interproc = thelock->crossproc; diff --git a/locks/win32/locks.c b/locks/win32/locks.c index f245999ab..c75c7ec3d 100644 --- a/locks/win32/locks.c +++ b/locks/win32/locks.c @@ -57,14 +57,14 @@ #include "locks.h" #include "apr_portable.h" -ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, +ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont) { - struct ap_lock_t *newlock; + ap_lock_t *newlock; SECURITY_ATTRIBUTES sec; - newlock = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + newlock = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); newlock->cntxt = cont; /* ToDo: How to handle the case when no context is available? @@ -92,12 +92,12 @@ ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, return APR_SUCCESS; } -ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_t *cont) +ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_context_t *cont) { /* This routine should not be called (and OpenMutex will fail if called) * on a INTRAPROCESS lock */ - (*lock) = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + (*lock) = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); if ((*lock) == NULL) { return APR_ENOMEM; @@ -111,7 +111,7 @@ ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_ return APR_SUCCESS; } -ap_status_t ap_lock(struct ap_lock_t *lock) +ap_status_t ap_lock(ap_lock_t *lock) { DWORD rv; if (lock->scope == APR_INTRAPROCESS) { @@ -130,7 +130,7 @@ ap_status_t ap_lock(struct ap_lock_t *lock) return APR_EEXIST; } -ap_status_t ap_unlock(struct ap_lock_t *lock) +ap_status_t ap_unlock(ap_lock_t *lock) { if (lock->scope == APR_INTRAPROCESS) { LeaveCriticalSection(&lock->section); @@ -143,7 +143,7 @@ ap_status_t ap_unlock(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t ap_destroy_lock(struct ap_lock_t *lock) +ap_status_t ap_destroy_lock(ap_lock_t *lock) { if (lock->scope == APR_INTRAPROCESS) { DeleteCriticalSection(&lock->section); @@ -156,7 +156,7 @@ ap_status_t ap_destroy_lock(struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) +ap_status_t ap_get_lockdata(ap_lock_t *lock, char *key, void *data) { if (lock != NULL) { return ap_get_userdata(data, key, lock->cntxt); @@ -167,7 +167,7 @@ ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data) } } -ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key, +ap_status_t ap_set_lockdata(ap_lock_t *lock, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (lock != NULL) { @@ -179,7 +179,7 @@ ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key, } } -ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, struct ap_lock_t *lock) +ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, ap_lock_t *lock) { if (lock == NULL) { return APR_ENOFILE; @@ -188,14 +188,14 @@ ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, struct ap_lock_t *lock) return APR_SUCCESS; } -ap_status_t ap_put_os_lock(struct ap_lock_t **lock, ap_os_lock_t *thelock, +ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*lock) == NULL) { - (*lock) = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t)); + (*lock) = (ap_lock_t *)ap_palloc(cont, sizeof(ap_lock_t)); (*lock)->cntxt = cont; } (*lock)->mutex = *thelock; diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index b148ad3d9..5ff0de439 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -594,7 +594,7 @@ static void ap_register_pool_cleanup(struct ap_pool_t *p, void *data, } #endif -API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data, +API_EXPORT(void) ap_register_cleanup(ap_context_t *p, void *data, ap_status_t (*plain_cleanup) (void *), ap_status_t (*child_cleanup) (void *)) { @@ -610,7 +610,7 @@ API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data, } } -API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data, +API_EXPORT(void) ap_kill_cleanup(ap_context_t *p, void *data, ap_status_t (*cleanup) (void *)) { struct cleanup *c; @@ -631,7 +631,7 @@ API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data, } } -API_EXPORT(void) ap_run_cleanup(struct ap_context_t *p, void *data, +API_EXPORT(void) ap_run_cleanup(ap_context_t *p, void *data, ap_status_t (*cleanup) (void *)) { ap_block_alarms(); /* Run cleanup only once! */ @@ -776,7 +776,7 @@ static void ap_clear_real_pool(ap_pool_t *a) ap_unblock_alarms(); } -API_EXPORT(void) ap_clear_pool(struct ap_context_t *a) +API_EXPORT(void) ap_clear_pool(ap_context_t *a) { ap_clear_real_pool(a->pool); } @@ -807,7 +807,7 @@ API_EXPORT(void) ap_destroy_real_pool(ap_pool_t *a) ap_unblock_alarms(); } -API_EXPORT(void) ap_destroy_pool(struct ap_context_t *a) +API_EXPORT(void) ap_destroy_pool(ap_context_t *a) { ap_destroy_real_pool(a->pool); } @@ -1024,7 +1024,7 @@ static void * ap_pool_palloc(ap_pool_t *a, int reqsize, int (*apr_abort)(int ret #endif } -API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize) +API_EXPORT(void *) ap_palloc(ap_context_t *c, int reqsize) { if (c == NULL) { return malloc(reqsize); @@ -1032,14 +1032,14 @@ API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize) return ap_pool_palloc(c->pool, reqsize, c->apr_abort); } -API_EXPORT(void *) ap_pcalloc(struct ap_context_t *a, int size) +API_EXPORT(void *) ap_pcalloc(ap_context_t *a, int size) { void *res = ap_palloc(a, size); memset(res, '\0', size); return res; } -API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s) +API_EXPORT(char *) ap_pstrdup(ap_context_t *a, const char *s) { char *res; size_t len; @@ -1053,7 +1053,7 @@ API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s) return res; } -API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n) +API_EXPORT(char *) ap_pstrndup(ap_context_t *a, const char *s, int n) { char *res; @@ -1066,7 +1066,7 @@ API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n) return res; } -API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_context_t *a, ...) +API_EXPORT_NONSTD(char *) ap_pstrcat(ap_context_t *a, ...) { char *cp, *argp, *res; @@ -1191,7 +1191,7 @@ static int psprintf_flush(ap_vformatter_buff_t *vbuff) #endif } -API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list ap) +API_EXPORT(char *) ap_pvsprintf(ap_context_t *c, const char *fmt, va_list ap) { #ifdef ALLOC_USE_MALLOC ap_pool_t *p = c->pool; @@ -1256,7 +1256,7 @@ API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list #endif } -API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, ...) +API_EXPORT_NONSTD(char *) ap_psprintf(ap_context_t *p, const char *fmt, ...) { va_list ap; char *res; @@ -1279,7 +1279,7 @@ API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, . * generic interface, but for now, it's a special case */ -API_EXPORT(void) ap_note_subprocess(struct ap_context_t *a, ap_proc_t *pid, +API_EXPORT(void) ap_note_subprocess(ap_context_t *a, ap_proc_t *pid, enum kill_conditions how) { struct process_chain *new = diff --git a/misc/beos/start.c b/misc/beos/start.c index 32d8ebf08..7f41e8c3c 100644 --- a/misc/beos/start.c +++ b/misc/beos/start.c @@ -54,7 +54,7 @@ #include "misc.h" -ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t *cont) +ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont) { ap_context_t *new; ap_pool_t *pool; @@ -70,7 +70,7 @@ ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t return APR_ENOPOOL; } - new = (struct ap_context_t *)ap_palloc(cont, sizeof(struct ap_context_t)); + new = (ap_context_t *)ap_palloc(cont, sizeof(ap_context_t)); new->pool = pool; new->prog_data = NULL; @@ -87,7 +87,7 @@ ap_status_t ap_destroy_context(ap_context_t *cont) ap_status_t ap_set_userdata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_context_t *cont) + ap_context_t *cont) { datastruct *dptr = NULL, *dptr2 = NULL; if (cont) { @@ -117,7 +117,7 @@ ap_status_t ap_set_userdata(void *data, char *key, return APR_ENOCONT; } -ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont) +ap_status_t ap_get_userdata(void **data, char *key, ap_context_t *cont) { datastruct *dptr = NULL; if (cont) { diff --git a/misc/unix/getopt.c b/misc/unix/getopt.c index 49f6049b4..ab7dbeac9 100644 --- a/misc/unix/getopt.c +++ b/misc/unix/getopt.c @@ -60,7 +60,7 @@ char *ap_optarg = ""; /* argument associated with option */ * NOTE: Arguments 2 and 3 are most commonly argc and argv from * main(argc, argv) */ -ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct ap_context_t *cont) +ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, ap_context_t *cont) { char *p; static char *place = EMSG; /* option letter processing */ diff --git a/misc/unix/start.c b/misc/unix/start.c index 95b3a3d60..e8b4d63c9 100644 --- a/misc/unix/start.c +++ b/misc/unix/start.c @@ -64,9 +64,9 @@ * of it's parent context's attributes, except the ap_context_t will be a * sub-pool. */ -ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t *cont) +ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont) { - struct ap_context_t *new; + ap_context_t *new; ap_pool_t *pool; if (cont) { @@ -80,7 +80,7 @@ ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t return APR_ENOPOOL; } - new = (struct ap_context_t *)ap_palloc(cont, sizeof(struct ap_context_t)); + new = (ap_context_t *)ap_palloc(cont, sizeof(ap_context_t)); new->pool = pool; new->prog_data = NULL; @@ -95,7 +95,7 @@ ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t * Free the context and all of it's child contexts'. * arg 1) The context to free. */ -ap_status_t ap_destroy_context(struct ap_context_t *cont) +ap_status_t ap_destroy_context(ap_context_t *cont) { ap_destroy_pool(cont); return APR_SUCCESS; @@ -121,7 +121,7 @@ ap_status_t ap_destroy_context(struct ap_context_t *cont) */ ap_status_t ap_set_userdata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_context_t *cont) + ap_context_t *cont) { datastruct *dptr = NULL, *dptr2 = NULL; if (cont) { @@ -158,7 +158,7 @@ ap_status_t ap_set_userdata(void *data, char *key, * arg 2) The user data associated with the context. * arg 3) The current context. */ -ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont) +ap_status_t ap_get_userdata(void **data, char *key, ap_context_t *cont) { datastruct *dptr = NULL; if (cont) { @@ -215,7 +215,7 @@ void ap_terminate(void) * then APR will return an error and expect the calling program to * deal with the error accordingly. */ -ap_status_t ap_set_abort(int (*apr_abort)(int retcode), struct ap_context_t *cont) +ap_status_t ap_set_abort(int (*apr_abort)(int retcode), ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; diff --git a/misc/win32/getopt.c b/misc/win32/getopt.c index c17b41389..5a97d126b 100644 --- a/misc/win32/getopt.c +++ b/misc/win32/getopt.c @@ -63,7 +63,7 @@ char *ap_optarg = ""; /* argument associated with option */ * NOTE: Arguments 2 and 3 are most commonly argc and argv from * main(argc, argv) */ -ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct ap_context_t *cont) +ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, ap_context_t *cont) { char *p; static char *place = EMSG; /* option letter processing */ diff --git a/misc/win32/names.c b/misc/win32/names.c index ba4e2367a..9428d7e60 100644 --- a/misc/win32/names.c +++ b/misc/win32/names.c @@ -82,7 +82,7 @@ static BOOL OnlyDots(char *pString) * is present on the existing path. This routine also * converts alias names to long names. */ -API_EXPORT(char *) ap_os_systemcase_filename(struct ap_context_t *pCont, +API_EXPORT(char *) ap_os_systemcase_filename(ap_context_t *pCont, const char *szFile) { char buf[HUGE_STRING_LEN]; @@ -201,7 +201,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(struct ap_context_t *pCont, /* Perform canonicalization with the exception that the * input case is preserved. */ -char * canonical_filename(struct ap_context_t *pCont, const char *szFile) +char * canonical_filename(ap_context_t *pCont, const char *szFile) { char *pNewStr; char *s; diff --git a/misc/win32/start.c b/misc/win32/start.c index 6c3b54808..89913672e 100644 --- a/misc/win32/start.c +++ b/misc/win32/start.c @@ -144,7 +144,7 @@ ap_status_t ap_get_oslevel(ap_context_t *cont, ap_oslevel_e *level) ap_status_t ap_set_userdata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_context_t *cont) + ap_context_t *cont) { datastruct *dptr = NULL, *dptr2 = NULL; if (cont) { @@ -174,7 +174,7 @@ ap_status_t ap_set_userdata(void *data, char *key, return APR_ENOCONT; } -ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont) +ap_status_t ap_get_userdata(void **data, char *key, ap_context_t *cont) { datastruct *dptr = NULL; if (cont) { diff --git a/mmap/beos/mmap.c b/mmap/beos/mmap.c index 567be9e2c..21ea428c8 100644 --- a/mmap/beos/mmap.c +++ b/mmap/beos/mmap.c @@ -56,7 +56,7 @@ ap_status_t mmap_cleanup(void *themmap) { - struct ap_mmap_t *mm = themmap; + ap_mmap_t *mm = themmap; int rv; rv = delete_area(mm->area); @@ -69,7 +69,7 @@ ap_status_t mmap_cleanup(void *themmap) return errno; } -ap_status_t ap_mmap_create(struct ap_mmap_t **new, ap_file_t *file, ap_off_t offset, ap_size_t size, +ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, ap_size_t size, ap_context_t *cont) { void *mm; @@ -79,7 +79,7 @@ ap_status_t ap_mmap_create(struct ap_mmap_t **new, ap_file_t *file, ap_off_t off if (file == NULL || file->buffered || file->filedes == -1) return APR_EBADF; - (*new) = (struct ap_mmap_t *)ap_palloc(cont, sizeof(struct ap_mmap_t)); + (*new) = (ap_mmap_t *)ap_palloc(cont, sizeof(ap_mmap_t)); pages = ((size -1) / B_PAGE_SIZE) + 1; @@ -108,7 +108,7 @@ ap_status_t ap_mmap_create(struct ap_mmap_t **new, ap_file_t *file, ap_off_t off return APR_SUCCESS; } -ap_status_t ap_mmap_delete(struct ap_mmap_t *mmap) +ap_status_t ap_mmap_delete(ap_mmap_t *mmap) { ap_status_t rv; if (mmap->area == -1) diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c index 3cfcda7b3..8ac7abdc0 100644 --- a/mmap/unix/mmap.c +++ b/mmap/unix/mmap.c @@ -64,7 +64,7 @@ ap_status_t mmap_cleanup(void *themmap) { - struct ap_mmap_t *mm = themmap; + ap_mmap_t *mm = themmap; int rv; rv = munmap(mm->mm, mm->size); @@ -93,7 +93,7 @@ ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, if (file == NULL || file->buffered || file->filedes == -1) return APR_EBADF; - (*new) = (struct ap_mmap_t *)ap_palloc(cont, sizeof(struct ap_mmap_t)); + (*new) = (ap_mmap_t *)ap_palloc(cont, sizeof(ap_mmap_t)); ap_seek(file, APR_SET, &offset); mm = mmap(NULL, size, PROT_READ, MAP_SHARED, file->filedes ,0); @@ -117,7 +117,7 @@ ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, * Remove a mmap'ed. * arg 1) The mmap'ed file. */ -ap_status_t ap_mmap_delete(struct ap_mmap_t *mmap) +ap_status_t ap_mmap_delete(ap_mmap_t *mmap) { ap_status_t rv; diff --git a/network_io/beos/poll.c b/network_io/beos/poll.c index cf2f82dc6..3d8b34263 100644 --- a/network_io/beos/poll.c +++ b/network_io/beos/poll.c @@ -63,9 +63,9 @@ /* select for R4.5 of BeOS. So here we use code that uses the write */ /* bits. */ -ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) +ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) { - (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t) * num); + (*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num); if ((*new) == NULL) { return APR_ENOMEM; } @@ -80,8 +80,8 @@ ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t return APR_SUCCESS; } -ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t event) +ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t event) { if (event & APR_POLLIN) { FD_SET(sock->socketdes, aprset->read); @@ -98,7 +98,7 @@ ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, return APR_SUCCESS; } -ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) +ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) { int rv; struct timeval *thetime; @@ -127,7 +127,7 @@ ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t tim return APR_SUCCESS; } -ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset) +ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset) { ap_int16_t revents = 0; char data[256]; @@ -172,8 +172,8 @@ ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct a return APR_SUCCESS; } -ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t events) +ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t events) { if (events & APR_POLLIN) { FD_CLR(sock->socketdes, aprset->read); @@ -187,7 +187,7 @@ ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, return APR_SUCCESS; } -ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t event) +ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t event) { if (event & APR_POLLIN) { FD_ZERO(aprset->read); @@ -202,7 +202,7 @@ ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t event) return APR_SUCCESS; } -ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data) +ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data) { if (pollfd != NULL) { return ap_get_userdata(data, key, pollfd->cntxt); @@ -213,7 +213,7 @@ ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data) } } -ap_status_t ap_set_polldata(struct ap_pollfd_t *pollfd, void *data, char *key, +ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (pollfd != NULL) { diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c index e25aa9241..9845f4691 100644 --- a/network_io/beos/sendrecv.c +++ b/network_io/beos/sendrecv.c @@ -54,7 +54,7 @@ #include "networkio.h" -ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) +ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len) { ssize_t rv; @@ -99,7 +99,7 @@ ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) return APR_SUCCESS; } -ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len) +ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len) { ap_ssize_t rv; diff --git a/network_io/beos/sockaddr.c b/network_io/beos/sockaddr.c index bf4f5b534..e880fc364 100644 --- a/network_io/beos/sockaddr.c +++ b/network_io/beos/sockaddr.c @@ -54,7 +54,7 @@ #include "networkio.h" -ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port) +ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port) { if (!sock) { return APR_EBADF; @@ -63,7 +63,7 @@ ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port) return APR_SUCCESS; } -ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port) +ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port) { if (!sock) { return APR_EBADF; @@ -72,7 +72,7 @@ ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port) return APR_SUCCESS; } -ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock) +ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock) { if (!sock) { return APR_EBADF; @@ -81,7 +81,7 @@ ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock) +ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock) { if (!sock) { return APR_EBADF; @@ -90,7 +90,7 @@ ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr) +ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, const char *addr) { u_long ipaddr; @@ -113,7 +113,7 @@ ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr) return APR_SUCCESS; } -ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr) +ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr) { u_long ipaddr; @@ -136,7 +136,7 @@ ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr) return APR_SUCCESS; } -ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock) +ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock) { if (!sock) { return APR_EBADF; @@ -146,7 +146,7 @@ ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock) +ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock) { if (!sock) { return APR_EBADF; @@ -157,7 +157,7 @@ ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock) } -ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_t *sock) +ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock) { if (!sock) { return APR_EBADF; @@ -167,7 +167,7 @@ ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_ return APR_SUCCESS; } -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct ap_socket_t *sock) +ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock) { if (!sock) { return APR_EBADF; diff --git a/network_io/beos/sockets.c b/network_io/beos/sockets.c index d06f2d65b..5e77798c7 100644 --- a/network_io/beos/sockets.c +++ b/network_io/beos/sockets.c @@ -56,7 +56,7 @@ ap_status_t socket_cleanup(void *sock) { - struct ap_socket_t *thesocket = sock; + ap_socket_t *thesocket = sock; if (closesocket(thesocket->socketdes) == 0) { thesocket->socketdes = -1; return APR_SUCCESS; @@ -66,9 +66,9 @@ ap_status_t socket_cleanup(void *sock) } } -ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) +ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont) { - (*new) = (struct ap_socket_t *)ap_palloc(cont,sizeof(struct ap_socket_t)); + (*new) = (ap_socket_t *)ap_palloc(cont,sizeof(ap_socket_t)); if ((*new) == NULL){ return APR_ENOMEM; @@ -100,18 +100,18 @@ ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) return APR_SUCCESS; } -ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how) +ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how) { return APR_SUCCESS; } -ap_status_t ap_close_socket(struct ap_socket_t *thesocket) +ap_status_t ap_close_socket(ap_socket_t *thesocket) { ap_kill_cleanup(thesocket->cntxt,thesocket,socket_cleanup); return socket_cleanup(thesocket); } -ap_status_t ap_bind(struct ap_socket_t *sock) +ap_status_t ap_bind(ap_socket_t *sock) { if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) return errno; @@ -119,7 +119,7 @@ ap_status_t ap_bind(struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) +ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog) { if (listen(sock->socketdes, backlog) == -1) return errno; @@ -127,9 +127,9 @@ ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) return APR_SUCCESS; } -ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context) +ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context) { - (*new) = (struct ap_socket_t *)ap_palloc(connection_context, + (*new) = (ap_socket_t *)ap_palloc(connection_context, sizeof(ap_socket_t)); (*new)->cntxt = connection_context; @@ -157,7 +157,7 @@ ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, return APR_SUCCESS; } -ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) +ap_status_t ap_connect(ap_socket_t *sock, char *hostname) { struct hostent *hp; @@ -186,7 +186,7 @@ ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) return APR_SUCCESS; } -ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *sock) +ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock) { if (socket != NULL) { return ap_get_userdata(data, key, sock->cntxt); @@ -197,7 +197,7 @@ ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *sock) } } -ap_status_t ap_set_socketdata(struct ap_socket_t *sock, void *data, char *key, +ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (sock != NULL) { @@ -209,7 +209,7 @@ ap_status_t ap_set_socketdata(struct ap_socket_t *sock, void *data, char *key, } } -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock) { if (sock == NULL) { return APR_ENOSOCKET; @@ -218,14 +218,14 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, +ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*sock) == NULL) { - (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t)); + (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t)); (*sock)->cntxt = cont; } (*sock)->socketdes = *thesock; diff --git a/network_io/beos/sockopt.c b/network_io/beos/sockopt.c index ef340639c..c0a85aa21 100644 --- a/network_io/beos/sockopt.c +++ b/network_io/beos/sockopt.c @@ -54,7 +54,7 @@ #include "networkio.h" -ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) +ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) { int one; if (on){ @@ -92,7 +92,7 @@ ap_status_t ap_gethostname(char * buf, int len, ap_context_t *cont) } } -ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock) +ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock) { struct hostent *hptr; diff --git a/network_io/os2/poll.c b/network_io/os2/poll.c index 692f3cd99..8f9586195 100644 --- a/network_io/os2/poll.c +++ b/network_io/os2/poll.c @@ -64,9 +64,9 @@ /* OS/2 doesn't have a poll function, implement using OS/2 style select */ -ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) +ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) { - *new = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t)); + *new = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t)); if (*new == NULL) { return APR_ENOMEM; @@ -95,8 +95,8 @@ ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t -ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t events) +ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t events) { int i; @@ -126,7 +126,7 @@ ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, -ap_status_t ap_poll(struct ap_pollfd_t *pollfdset, ap_int32_t *nsds, ap_int32_t timeout) +ap_status_t ap_poll(ap_pollfd_t *pollfdset, ap_int32_t *nsds, ap_int32_t timeout) { int i; int rv = 0; @@ -164,7 +164,7 @@ ap_status_t ap_poll(struct ap_pollfd_t *pollfdset, ap_int32_t *nsds, ap_int32_t -ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset) +ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset) { int i; @@ -186,8 +186,8 @@ ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct a -ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t events) +ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t events) { int start, *count, pos; diff --git a/network_io/os2/sendrecv.c b/network_io/os2/sendrecv.c index 723ea82bb..58e88f051 100644 --- a/network_io/os2/sendrecv.c +++ b/network_io/os2/sendrecv.c @@ -59,7 +59,7 @@ #include "apr_lib.h" #include <sys/time.h> -ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) +ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len) { ssize_t rv; int fds, err = 0; @@ -98,7 +98,7 @@ ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) -ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len) +ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len) { ssize_t rv; int fds, err = 0; diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c index dd00f70d3..91eb3f45c 100644 --- a/network_io/os2/sockets.c +++ b/network_io/os2/sockets.c @@ -68,7 +68,7 @@ ap_status_t socket_cleanup(void *sock) { - struct ap_socket_t *thesocket = sock; + ap_socket_t *thesocket = sock; if (soclose(thesocket->socketdes) == 0) { thesocket->socketdes = -1; return APR_SUCCESS; @@ -78,9 +78,9 @@ ap_status_t socket_cleanup(void *sock) } } -ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) +ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont) { - (*new) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t)); + (*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -112,7 +112,7 @@ ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) return APR_SUCCESS; } -ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how) +ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how) { if (shutdown(thesocket->socketdes, how) == 0) { return APR_SUCCESS; @@ -122,7 +122,7 @@ ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how) } } -ap_status_t ap_close_socket(struct ap_socket_t *thesocket) +ap_status_t ap_close_socket(ap_socket_t *thesocket) { ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup); return socket_cleanup(thesocket); @@ -131,7 +131,7 @@ ap_status_t ap_close_socket(struct ap_socket_t *thesocket) -ap_status_t ap_bind(struct ap_socket_t *sock) +ap_status_t ap_bind(ap_socket_t *sock) { if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) return os2errno(sock_errno()); @@ -139,7 +139,7 @@ ap_status_t ap_bind(struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) +ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog) { if (listen(sock->socketdes, backlog) == -1) return os2errno(sock_errno()); @@ -147,10 +147,10 @@ ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) return APR_SUCCESS; } -ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context) +ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context) { - (*new) = (struct ap_socket_t *)ap_palloc(connection_context, - sizeof(struct ap_socket_t)); + (*new) = (ap_socket_t *)ap_palloc(connection_context, + sizeof(ap_socket_t)); (*new)->cntxt = connection_context; (*new)->remote_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt, @@ -170,7 +170,7 @@ ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, return APR_SUCCESS; } -ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) +ap_status_t ap_connect(ap_socket_t *sock, char *hostname) { struct hostent *hp; @@ -204,7 +204,7 @@ ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) -ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *socket) +ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *socket) { if (socket != NULL) { return ap_get_userdata(data, key, socket->cntxt); @@ -217,7 +217,7 @@ ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *socket -ap_status_t ap_set_socketdata(struct ap_socket_t *socket, void *data, char *key, +ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (socket != NULL) { @@ -229,7 +229,7 @@ ap_status_t ap_set_socketdata(struct ap_socket_t *socket, void *data, char *key, } } -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock) { if (sock == NULL) { return APR_ENOSOCKET; @@ -240,13 +240,13 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) -ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont) +ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*sock) == NULL) { - (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t)); + (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t)); (*sock)->cntxt = cont; } (*sock)->socketdes = *thesock; diff --git a/network_io/os2/sockopt.c b/network_io/os2/sockopt.c index 387e422ba..d6dd5d9aa 100644 --- a/network_io/os2/sockopt.c +++ b/network_io/os2/sockopt.c @@ -66,7 +66,7 @@ #include <sys/so_ioctl.h> -ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) +ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) { int one; struct linger li; @@ -128,7 +128,7 @@ ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont) -ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock) +ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock) { struct hostent *hptr; diff --git a/network_io/unix/poll.c b/network_io/unix/poll.c index ad9f55ece..270a841be 100644 --- a/network_io/unix/poll.c +++ b/network_io/unix/poll.c @@ -64,10 +64,10 @@ * arg 2) The number of socket descriptors to be polled. * arg 3) The context to operate on. */ -ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) +ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) { - (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t)); - (*new)->sock = ap_palloc(cont, sizeof(struct ap_socket_t) * num); + (*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t)); + (*new)->sock = ap_palloc(cont, sizeof(ap_socket_t) * num); (*new)->events = ap_palloc(cont, sizeof(ap_int16_t) * num); (*new)->revents = ap_palloc(cont, sizeof(ap_int16_t) * num); @@ -130,8 +130,8 @@ ap_int16_t get_revent(ap_int16_t event) * APR_POLLPRI -- signal if prioirty data is availble to be read * APR_POLLOUT -- signal if write will not block */ -ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t event) +ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t event) { int i = 0; @@ -160,7 +160,7 @@ ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, * time. A negative number means wait until a socket is signalled. * NOTE: The number of sockets signalled is returned in the second argument. */ -ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) +ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) { int i; struct pollfd *pollset; @@ -206,7 +206,7 @@ ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t tim * arg 2) The socket we wish to get information about. * arg 3) The poll structure we will be using. */ -ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset) +ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset) { int i = 0; @@ -231,8 +231,8 @@ ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct a * APR_POLLPRI -- signal if prioirty data is availble to be read * APR_POLLOUT -- signal if write will not block */ -ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t events) +ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t events) { ap_int16_t newevents; int i = 0; @@ -260,7 +260,7 @@ ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, * APR_POLLPRI -- signal if prioirty data is availble to be read * APR_POLLOUT -- signal if write will not block */ -ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t events) +ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events) { int i = 0; ap_int16_t newevents; @@ -278,9 +278,9 @@ ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t events) #else /* Use select to mimic poll */ -ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) +ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) { - (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t) * num); + (*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num); if ((*new) == NULL) { return APR_ENOMEM; } @@ -295,8 +295,8 @@ ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t return APR_SUCCESS; } -ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t event) +ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t event) { if (event & APR_POLLIN) { FD_SET(sock->socketdes, aprset->read); @@ -313,7 +313,7 @@ ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, return APR_SUCCESS; } -ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) +ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) { int rv; struct timeval *thetime; @@ -341,7 +341,7 @@ ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t tim return APR_SUCCESS; } -ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset) +ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset) { ap_int16_t revents = 0; char data[1]; @@ -388,8 +388,8 @@ ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct a return APR_SUCCESS; } -ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t events) +ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t events) { if (events & APR_POLLIN) { FD_CLR(sock->socketdes, aprset->read); @@ -403,7 +403,7 @@ ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, return APR_SUCCESS; } -ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t event) +ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t event) { if (event & APR_POLLIN) { FD_ZERO(aprset->read); @@ -427,7 +427,7 @@ ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t event) * arg 2) The key to use for retreiving data associated with a poll struct. * arg 3) The user data associated with the pollfd. */ -ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data) +ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data) { if (pollfd != NULL) { return ap_get_userdata(data, key, pollfd->cntxt); @@ -446,7 +446,7 @@ ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data) * arg 2) The user data to associate with the pollfd. */ -ap_status_t ap_set_polldata(struct ap_pollfd_t *pollfd, void *data, char *key, +ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (pollfd != NULL) { diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c index e15880486..de0cb7ba7 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -67,7 +67,7 @@ #endif /* HAVE_SENDFILE */ -static ap_status_t wait_for_io_or_timeout(struct ap_socket_t *sock, int for_read) +static ap_status_t wait_for_io_or_timeout(ap_socket_t *sock, int for_read) { struct timeval tv; fd_set fdset; @@ -104,7 +104,7 @@ static ap_status_t wait_for_io_or_timeout(struct ap_socket_t *sock, int for_read * this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option. * The number of bytes actually sent is stored in argument 3. */ -ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) +ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len) { ssize_t rv; @@ -142,7 +142,7 @@ ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) * this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option. * The number of bytes actually sent is stored in argument 3. */ -ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len) +ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len) { ssize_t rv; @@ -182,7 +182,7 @@ ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len) * this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option. * The number of bytes actually sent is stored in argument 3. */ -ap_status_t ap_sendv(struct ap_socket_t * sock, const struct iovec *vec, +ap_status_t ap_sendv(ap_socket_t * sock, const struct iovec *vec, ap_int32_t nvec, ap_int32_t *len) { ssize_t rv; diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index ee187b799..909044617 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -63,7 +63,7 @@ * that this socket is going to use this port if possible. If * the port is already used, we won't find out about it here. */ -ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port) +ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port) { sock->local_addr->sin_port = htons((short)port); return APR_SUCCESS; @@ -79,7 +79,7 @@ ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port) * NOTE: This does not make a connection to the remote port, it is just * telling apr which port ap_connect() should attempt to connect to. */ -ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port) +ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port) { sock->remote_addr->sin_port = htons((short)port); return APR_SUCCESS; @@ -93,7 +93,7 @@ ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port) * arg 1) The local port this socket is associated with. * arg 2) The socket to enquire about. */ -ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock) +ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock) { *port = ntohs(sock->local_addr->sin_port); return APR_SUCCESS; @@ -107,7 +107,7 @@ ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock) * arg 1) The remote port this socket is associated with. * arg 2) The socket to enquire about. */ -ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock) +ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock) { *port = ntohs(sock->remote_addr->sin_port); return APR_SUCCESS; @@ -124,7 +124,7 @@ ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock) * NOTE: This does not bind the two together, it is just telling apr * that this socket is going to use this address if possible. */ -ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr) +ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, const char *addr) { u_long ipaddr; @@ -153,7 +153,7 @@ ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr) * NOTE: This does not make a connection to the remote address, it is just * telling apr which address ap_connect() should attempt to connect to. */ -ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr) +ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr) { u_long ipaddr; @@ -180,7 +180,7 @@ ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr) * arg 1) The local IP address associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock) +ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock) { *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr)); return APR_SUCCESS; @@ -194,7 +194,7 @@ ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock) * arg 1) The remote IP address associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock) +ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock) { *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr)); return APR_SUCCESS; @@ -210,7 +210,7 @@ ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock) * arg 1) The local name associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_t *sock) +ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock) { *name = sock->local_addr; return APR_SUCCESS; @@ -225,7 +225,7 @@ ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_ * arg 1) The remote name associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct ap_socket_t *sock) +ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock) { *name = sock->remote_addr; return APR_SUCCESS; diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c index 36dabd712..873855233 100644 --- a/network_io/unix/sockets.c +++ b/network_io/unix/sockets.c @@ -57,7 +57,7 @@ static ap_status_t socket_cleanup(void *sock) { - struct ap_socket_t *thesocket = sock; + ap_socket_t *thesocket = sock; if (close(thesocket->socketdes) == 0) { thesocket->socketdes = -1; return APR_SUCCESS; @@ -73,9 +73,9 @@ static ap_status_t socket_cleanup(void *sock) * arg 1) The new socket that has been setup. * arg 2) The context to use */ -ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) +ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont) { - (*new) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t)); + (*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -117,7 +117,7 @@ ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) * NOTE: This does not actually close the socket descriptor, it just * controls which calls are still valid on the socket. */ -ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how) +ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how) { if (shutdown(thesocket->socketdes, how) == 0) { return APR_SUCCESS; @@ -132,7 +132,7 @@ ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how) * Close a tcp socket. * arg 1) The socket to close */ -ap_status_t ap_close_socket(struct ap_socket_t *thesocket) +ap_status_t ap_close_socket(ap_socket_t *thesocket) { ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup); return socket_cleanup(thesocket); @@ -145,7 +145,7 @@ ap_status_t ap_close_socket(struct ap_socket_t *thesocket) * NOTE: This is where we will find out if there is any other process * using the selected port. */ -ap_status_t ap_bind(struct ap_socket_t *sock) +ap_status_t ap_bind(ap_socket_t *sock) { if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) return errno; @@ -161,7 +161,7 @@ ap_status_t ap_bind(struct ap_socket_t *sock) * listen queue. If this value is less than zero, the listen * queue size is set to zero. */ -ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) +ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog) { if (listen(sock->socketdes, backlog) == -1) return errno; @@ -179,10 +179,10 @@ ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) * arg 2) The socket we are listening on. * arg 3) The context for the new socket. */ -ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context) +ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context) { - (*new) = (struct ap_socket_t *)ap_palloc(connection_context, - sizeof(struct ap_socket_t)); + (*new) = (ap_socket_t *)ap_palloc(connection_context, + sizeof(ap_socket_t)); (*new)->cntxt = connection_context; (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt, @@ -220,7 +220,7 @@ ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, * APR assumes that the sockaddr_in in the apr_socket is completely * filled out. */ -ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) +ap_status_t ap_connect(ap_socket_t *sock, char *hostname) { struct hostent *hp; @@ -259,7 +259,7 @@ ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) * arg 1) The currently open socket. * arg 2) The user data associated with the socket. */ -ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *sock) +ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *sock) { if (sock != NULL) { return ap_get_userdata(data, key, sock->cntxt); @@ -279,7 +279,7 @@ ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *sock) * arg 3) The key to associate with the data. * arg 4) The cleanup to call when the socket is destroyed. */ -ap_status_t ap_set_socketdata(struct ap_socket_t *sock, void *data, char *key, +ap_status_t ap_set_socketdata(ap_socket_t *sock, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (sock != NULL) { @@ -297,7 +297,7 @@ ap_status_t ap_set_socketdata(struct ap_socket_t *sock, void *data, char *key, * arg 1) The socket to convert. * arg 2) The os specifc equivelant of the apr socket.. */ -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock) { if (sock == NULL) { return APR_ENOSOCKET; @@ -314,14 +314,14 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) * arg 2) The socket to convert to. * arg 3) The socket we are converting to an apr type. */ -ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, +ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*sock) == NULL) { - (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t)); + (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t)); (*sock)->cntxt = cont; (*sock)->local_addr = (struct sockaddr_in *)ap_palloc((*sock)->cntxt, sizeof(struct sockaddr_in)); diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c index 5e09f1c2c..0306772f1 100644 --- a/network_io/unix/sockopt.c +++ b/network_io/unix/sockopt.c @@ -114,7 +114,7 @@ static ap_status_t sononblock(int sd) * APR_SO_SNDBUF -- Set the SendBufferSize * arg 3) Are we turning the option on or off. */ -ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) +ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) { int one; struct linger li; @@ -193,7 +193,7 @@ ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont) * arg 1) A buffer to store the hostname in. * arg 2) The socket to examine. */ -ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock) +ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock) { struct hostent *hptr; diff --git a/network_io/win32/poll.c b/network_io/win32/poll.c index 90781c92d..e5fd905d4 100644 --- a/network_io/win32/poll.c +++ b/network_io/win32/poll.c @@ -61,9 +61,9 @@ #include <time.h> -ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) +ap_status_t ap_setup_poll(ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont) { - (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t) * num); + (*new) = (ap_pollfd_t *)ap_palloc(cont, sizeof(ap_pollfd_t) * num); if ((*new) == NULL) { return APR_ENOMEM; } @@ -80,8 +80,8 @@ ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t return APR_SUCCESS; } -ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t event) +ap_status_t ap_add_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t event) { if (event & APR_POLLIN) { FD_SET(sock->sock, aprset->read); @@ -98,7 +98,7 @@ ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, return APR_SUCCESS; } -ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) +ap_status_t ap_poll(ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout) { int rv; struct timeval *thetime; @@ -142,7 +142,7 @@ ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t tim return APR_SUCCESS; } -ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset) +ap_status_t ap_get_revents(ap_int16_t *event, ap_socket_t *sock, ap_pollfd_t *aprset) { ap_int16_t revents = 0; WSABUF data; @@ -195,7 +195,7 @@ ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct a return APR_SUCCESS; } -ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data) +ap_status_t ap_get_polldata(ap_pollfd_t *pollfd, char *key, void *data) { if (pollfd != NULL) { return ap_get_userdata(data, key, pollfd->cntxt); @@ -206,7 +206,7 @@ ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data) } } -ap_status_t ap_set_polldata(struct ap_pollfd_t *pollfd, void *data, char *key, +ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (pollfd != NULL) { @@ -218,8 +218,8 @@ ap_status_t ap_set_polldata(struct ap_pollfd_t *pollfd, void *data, char *key, } } -ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, - struct ap_socket_t *sock, ap_int16_t events) +ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, + ap_socket_t *sock, ap_int16_t events) { if (events & APR_POLLIN) { FD_CLR(sock->sock, aprset->read); @@ -236,7 +236,7 @@ ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, return APR_SUCCESS; } -ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t events) +ap_status_t ap_clear_poll_sockets(ap_pollfd_t *aprset, ap_int16_t events) { if (events & APR_POLLIN) { FD_ZERO(aprset->read); diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c index d00df8a34..409c200ec 100644 --- a/network_io/win32/sendrecv.c +++ b/network_io/win32/sendrecv.c @@ -60,7 +60,7 @@ #include "fileio.h" #include <time.h> -ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) +ap_status_t ap_send(ap_socket_t *sock, const char *buf, ap_ssize_t *len) { ap_ssize_t rv; WSABUF wsaData; @@ -81,7 +81,7 @@ ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len) return APR_SUCCESS; } -ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len) +ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len) { ap_ssize_t rv; WSABUF wsaData; @@ -102,7 +102,7 @@ ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len) return APR_SUCCESS; } -ap_status_t ap_sendv(struct ap_socket_t *sock, const struct iovec *vec, +ap_status_t ap_sendv(ap_socket_t *sock, const struct iovec *vec, ap_int32_t nvec, ap_int32_t *nbytes) { ap_ssize_t rv; diff --git a/network_io/win32/sockaddr.c b/network_io/win32/sockaddr.c index 1f6e38f54..0e24d7189 100644 --- a/network_io/win32/sockaddr.c +++ b/network_io/win32/sockaddr.c @@ -68,7 +68,7 @@ * that this socket is going to use this port if possible. If * the port is already used, we won't find out about it here. */ -ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port) +ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port) { sock->local_addr->sin_port = htons((short)port); return APR_SUCCESS; @@ -84,7 +84,7 @@ ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port) * NOTE: This does not make a connection to the remote port, it is just * telling apr which port ap_connect() should attempt to connect to. */ -ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port) +ap_status_t ap_set_remote_port(ap_socket_t *sock, ap_uint32_t port) { sock->remote_addr->sin_port = htons((short)port); return APR_SUCCESS; @@ -98,7 +98,7 @@ ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port) * arg 1) The local port this socket is associated with. * arg 2) The socket to enquire about. */ -ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock) +ap_status_t ap_get_local_port(ap_uint32_t *port, ap_socket_t *sock) { *port = ntohs(sock->local_addr->sin_port); return APR_SUCCESS; @@ -112,7 +112,7 @@ ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock) * arg 1) The remote port this socket is associated with. * arg 2) The socket to enquire about. */ -ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock) +ap_status_t ap_get_remote_port(ap_uint32_t *port, ap_socket_t *sock) { *port = ntohs(sock->remote_addr->sin_port); return APR_SUCCESS; @@ -129,7 +129,7 @@ ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock) * NOTE: This does not bind the two together, it is just telling apr * that this socket is going to use this address if possible. */ -ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr) +ap_status_t ap_set_local_ipaddr(ap_socket_t *sock, const char *addr) { u_long ipaddr; @@ -156,7 +156,7 @@ ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr) * NOTE: This does not make a connection to the remote address, it is just * telling apr which address ap_connect() should attempt to connect to. */ -ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr) +ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr) { u_long ipaddr; @@ -181,7 +181,7 @@ ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr) * arg 1) The local IP address associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock) +ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock) { *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr)); return APR_SUCCESS; @@ -195,7 +195,7 @@ ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock) * arg 1) The remote IP address associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock) +ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock) { *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr)); return APR_SUCCESS; @@ -208,7 +208,7 @@ ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock) * arg 1) The local name associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_t *sock) +ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock) { *name = sock->local_addr; return APR_SUCCESS; @@ -222,7 +222,7 @@ ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_ * arg 1) The remote name associated with the socket. * arg 2) The socket to use */ -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct ap_socket_t *sock) +ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock) { *name = sock->remote_addr; return APR_SUCCESS; diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c index a4e80588b..5484d3523 100644 --- a/network_io/win32/sockets.c +++ b/network_io/win32/sockets.c @@ -64,7 +64,7 @@ static ap_status_t socket_cleanup(void *sock) { - struct ap_socket_t *thesocket = sock; + ap_socket_t *thesocket = sock; if (closesocket(thesocket->sock) != SOCKET_ERROR) { thesocket->sock = INVALID_SOCKET; return APR_SUCCESS; @@ -74,9 +74,9 @@ static ap_status_t socket_cleanup(void *sock) } } -ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) +ap_status_t ap_create_tcp_socket(ap_socket_t **new, ap_context_t *cont) { - (*new) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t)); + (*new) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -109,7 +109,7 @@ ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont) return APR_SUCCESS; } -ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how) +ap_status_t ap_shutdown(ap_socket_t *thesocket, ap_shutdown_how_e how) { int winhow; @@ -135,13 +135,13 @@ ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how) } } -ap_status_t ap_close_socket(struct ap_socket_t *thesocket) +ap_status_t ap_close_socket(ap_socket_t *thesocket) { ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup); return socket_cleanup(thesocket); } -ap_status_t ap_bind(struct ap_socket_t *sock) +ap_status_t ap_bind(ap_socket_t *sock) { if (bind(sock->sock, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) { return errno; @@ -150,7 +150,7 @@ ap_status_t ap_bind(struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) +ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog) { if (listen(sock->sock, backlog) == SOCKET_ERROR) return APR_EEXIST; @@ -158,10 +158,10 @@ ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) return APR_SUCCESS; } -ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context) +ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_context_t *connection_context) { - (*new) = (struct ap_socket_t *)ap_palloc(connection_context, - sizeof(struct ap_socket_t)); + (*new) = (ap_socket_t *)ap_palloc(connection_context, + sizeof(ap_socket_t)); (*new)->cntxt = connection_context; (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt, @@ -184,7 +184,7 @@ ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, return APR_SUCCESS; } -ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) +ap_status_t ap_connect(ap_socket_t *sock, char *hostname) { struct hostent *hp; int lasterror; @@ -226,7 +226,7 @@ ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) } } -ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *socket) +ap_status_t ap_get_socketdata(void **data, char *key, ap_socket_t *socket) { if (socket != NULL) { return ap_get_userdata(data, key, socket->cntxt); @@ -237,7 +237,7 @@ ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *socket } } -ap_status_t ap_set_socketdata(struct ap_socket_t *socket, void *data, char *key, +ap_status_t ap_set_socketdata(ap_socket_t *socket, void *data, char *key, ap_status_t (*cleanup) (void *)) { if (socket != NULL) { @@ -249,7 +249,7 @@ ap_status_t ap_set_socketdata(struct ap_socket_t *socket, void *data, char *key, } } -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock) { if (sock == NULL) { return APR_ENOSOCKET; @@ -258,14 +258,14 @@ ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock) return APR_SUCCESS; } -ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, +ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*sock) == NULL) { - (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t)); + (*sock) = (ap_socket_t *)ap_palloc(cont, sizeof(ap_socket_t)); (*sock)->cntxt = cont; (*sock)->local_addr = (struct sockaddr_in *)ap_palloc((*sock)->cntxt, sizeof(struct sockaddr_in)); diff --git a/network_io/win32/sockopt.c b/network_io/win32/sockopt.c index 37801b06f..e9c75fef9 100644 --- a/network_io/win32/sockopt.c +++ b/network_io/win32/sockopt.c @@ -79,7 +79,7 @@ ap_status_t sononblock(SOCKET sd) return APR_SUCCESS; } -ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) +ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on) { int one; struct linger li; @@ -141,7 +141,7 @@ ap_status_t ap_gethostname(char *buf, int len, ap_context_t *cont) return APR_SUCCESS; } -ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock) +ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock) { struct hostent *hptr; diff --git a/threadproc/beos/proc.c b/threadproc/beos/proc.c index a3b8be766..7c58a2947 100644 --- a/threadproc/beos/proc.c +++ b/threadproc/beos/proc.c @@ -60,10 +60,10 @@ struct send_pipe { int err; }; -ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont) +ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont) { - (*new) = (struct ap_procattr_t *)ap_palloc(cont, - sizeof(struct ap_procattr_t)); + (*new) = (ap_procattr_t *)ap_palloc(cont, + sizeof(ap_procattr_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -81,7 +81,7 @@ ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *con return APR_SUCCESS; } -ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, +ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, ap_int32_t out, ap_int32_t err) { ap_status_t status; @@ -133,7 +133,7 @@ ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, return APR_SUCCESS; } -ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, +ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir) { char * cwd; @@ -153,24 +153,24 @@ ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, return APR_ENOMEM; } -ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr, +ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr, ap_cmdtype_e cmd) { attr->cmdtype = cmd; return APR_SUCCESS; } -ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t detach) +ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach) { attr->detached = detach; return APR_SUCCESS; } -ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont) +ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont) { int pid; - (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*proc) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); if ((pid = fork()) < 0) { return errno; @@ -186,9 +186,9 @@ ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont) } -ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, +ap_status_t ap_create_process(ap_proc_t **new, const char *progname, char *const args[], char **env, - struct ap_procattr_t *attr, ap_context_t *cont) + ap_procattr_t *attr, ap_context_t *cont) { int i=0,nargs=0; char **newargs = NULL; @@ -198,7 +198,7 @@ ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, struct send_pipe *sp; char * dir = NULL; - (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*new) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); sp = (struct send_pipe *)ap_palloc(cont, sizeof(struct send_pipe)); if ((*new) == NULL){ @@ -270,25 +270,25 @@ ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, return APR_SUCCESS; } -ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childin(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_in; return APR_SUCCESS; } -ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childout(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_out; return APR_SUCCESS; } -ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childerr(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_err; return APR_SUCCESS; } -ap_status_t ap_wait_proc(struct ap_proc_t *proc, +ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how_e wait) { status_t exitval; @@ -313,7 +313,7 @@ ap_status_t ap_wait_proc(struct ap_proc_t *proc, return APR_CHILD_NOTDONE; } -ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in, +ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in, ap_file_t *parent_in) { if (attr->child_in == NULL && attr->parent_in == NULL) @@ -328,7 +328,7 @@ ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_ return APR_SUCCESS; } -ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child_out, +ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out, ap_file_t *parent_out) { if (attr->child_out == NULL && attr->parent_out == NULL) @@ -343,7 +343,7 @@ ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child return APR_SUCCESS; } -ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child_err, +ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err, ap_file_t *parent_err) { if (attr->child_err == NULL && attr->parent_err == NULL) @@ -367,14 +367,14 @@ ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc) return APR_SUCCESS; } -ap_status_t ap_put_os_proc(struct ap_proc_t **proc, ap_os_proc_t *theproc, +ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*proc) == NULL) { - (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*proc) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); (*proc)->cntxt = cont; } (*proc)->tid = *theproc; diff --git a/threadproc/beos/procsup.c b/threadproc/beos/procsup.c index 811e53b84..f4b1ecf9a 100644 --- a/threadproc/beos/procsup.c +++ b/threadproc/beos/procsup.c @@ -54,11 +54,11 @@ #include "threadproc.h" -ap_status_t ap_detach(struct ap_proc_t **new, ap_context_t *cont) +ap_status_t ap_detach(ap_proc_t **new, ap_context_t *cont) { int x; - (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*new) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); (*new)->cntxt = cont; (*new)->attr = NULL; @@ -89,7 +89,7 @@ ap_status_t ap_detach(struct ap_proc_t **new, ap_context_t *cont) } } -ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc) +ap_status_t ap_get_procdata(char *key, void *data, ap_proc_t *proc) { if (proc != NULL) { return ap_get_userdata(data, key, proc->cntxt); @@ -102,7 +102,7 @@ ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc) ap_status_t ap_set_procdata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_proc_t *proc) + ap_proc_t *proc) { if (proc != NULL) { return ap_set_userdata(data, key, cleanup, proc->cntxt); diff --git a/threadproc/beos/signals.c b/threadproc/beos/signals.c index 7a43e9d2f..5c0fc4cfa 100644 --- a/threadproc/beos/signals.c +++ b/threadproc/beos/signals.c @@ -54,7 +54,7 @@ #include "threadproc.h" -ap_status_t ap_kill(struct ap_proc_t *proc, int signal) +ap_status_t ap_kill(ap_proc_t *proc, int signal) { /* I've changed this to use kill_thread instead of kill() as kill() tended to kill the whole server! This isn't as good as it ignores diff --git a/threadproc/beos/thread.c b/threadproc/beos/thread.c index 1d4acefaa..4eff59d45 100644 --- a/threadproc/beos/thread.c +++ b/threadproc/beos/thread.c @@ -54,12 +54,12 @@ #include "threadproc.h" -ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont) +ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont) { ap_status_t stat; - (*new) = (struct ap_threadattr_t *)ap_palloc(cont, - sizeof(struct ap_threadattr_t)); + (*new) = (ap_threadattr_t *)ap_palloc(cont, + sizeof(ap_threadattr_t)); (*new)->attr = (int32)ap_palloc(cont, sizeof(int32)); @@ -73,7 +73,7 @@ ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *con return APR_SUCCESS; } -ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on) +ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on) { if (on == 1){ attr->detached = 1; @@ -83,7 +83,7 @@ ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on) return APR_SUCCESS; } -ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr) +ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr) { if (attr->detached == 1){ return APR_DETACH; @@ -91,14 +91,14 @@ ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr) return APR_NOTDETACH; } -ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr, +ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, ap_thread_start_t func, void *data, ap_context_t *cont) { int32 temp; ap_status_t stat; - (*new) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t)); + (*new) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t)); if ((*new) == NULL) { return APR_ENOMEM; } diff --git a/threadproc/beos/threadcancel.c b/threadproc/beos/threadcancel.c index 7cfac36b1..5eed0bbf8 100644 --- a/threadproc/beos/threadcancel.c +++ b/threadproc/beos/threadcancel.c @@ -55,7 +55,7 @@ #include "threadproc.h" -ap_status_t ap_cancel_thread(struct ap_thread_t *thd) +ap_status_t ap_cancel_thread(ap_thread_t *thd) { if (kill_thread(thd->td) == 0) { return APR_SUCCESS; diff --git a/threadproc/beos/threadpriv.c b/threadproc/beos/threadpriv.c index 662ae4bac..c0d6d8e10 100644 --- a/threadproc/beos/threadpriv.c +++ b/threadproc/beos/threadpriv.c @@ -58,10 +58,10 @@ static struct beos_key key_table[BEOS_MAX_DATAKEYS]; static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS]; static sem_id lock; -ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, +ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *), ap_context_t *cont) { - (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t)); + (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t)); if ((*key) == NULL) { return APR_ENOMEM; } @@ -82,7 +82,7 @@ ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, return APR_ENOMEM; } -ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key) +ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key) { thread_id tid; int i, index=0; @@ -114,7 +114,7 @@ ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key) return APR_SUCCESS; } -ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key) +ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key) { thread_id tid; int i,index = 0, ret; @@ -169,7 +169,7 @@ ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key) return APR_ENOMEM; } -ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key) +ap_status_t ap_delete_thread_private(ap_threadkey_t *key) { if (key->key < BEOS_MAX_DATAKEYS){ acquire_sem(key_table[key->key].lock); diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c index 38f44ff92..f6345aba0 100644 --- a/threadproc/os2/proc.c +++ b/threadproc/os2/proc.c @@ -71,10 +71,10 @@ #include <stdlib.h> #include <os2.h> -ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont) +ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont) { - (*new) = (struct ap_procattr_t *)ap_palloc(cont, - sizeof(struct ap_procattr_t)); + (*new) = (ap_procattr_t *)ap_palloc(cont, + sizeof(ap_procattr_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -92,7 +92,7 @@ ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *con return APR_SUCCESS; } -ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, +ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, ap_int32_t out, ap_int32_t err) { ap_status_t stat; @@ -117,7 +117,7 @@ ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, return APR_SUCCESS; } -ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, const char *dir) +ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir) { attr->currdir = ap_pstrdup(attr->cntxt, dir); if (attr->currdir) { @@ -126,24 +126,24 @@ ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, const char *dir) return APR_ENOMEM; } -ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr, +ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr, ap_cmdtype_e cmd) { attr->cmdtype = cmd; return APR_SUCCESS; } -ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t detach) +ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach) { attr->detached = detach; return APR_SUCCESS; } -ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont) +ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont) { int pid; - (*proc) = ap_palloc(cont, sizeof(struct ap_proc_t)); + (*proc) = ap_palloc(cont, sizeof(ap_proc_t)); if ((pid = fork()) < 0) { return errno; @@ -165,7 +165,7 @@ ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont) /* quotes in the string are doubled up. * Used to escape quotes in args passed to OS/2's cmd.exe */ -static char *double_quotes(struct ap_context_t *cntxt, char *str) +static char *double_quotes(ap_context_t *cntxt, char *str) { int num_quotes = 0; int len = 0; @@ -190,9 +190,9 @@ static char *double_quotes(struct ap_context_t *cntxt, char *str) -ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, +ap_status_t ap_create_process(ap_proc_t **new, const char *progname, char *const args[], char **env, - struct ap_procattr_t *attr, ap_context_t *cont) + ap_procattr_t *attr, ap_context_t *cont) { int i, arg, numargs, cmdlen; ap_status_t status; @@ -208,7 +208,7 @@ ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, char *env_block, *env_block_pos; RESULTCODES rescodes; - (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*new) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -412,25 +412,25 @@ ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, -ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childin(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_in; return APR_SUCCESS; } -ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childout(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_out; return APR_SUCCESS; } -ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childerr(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_err; return APR_SUCCESS; } -ap_status_t ap_wait_proc(struct ap_proc_t *proc, +ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how_e wait) { RESULTCODES codes; diff --git a/threadproc/os2/signals.c b/threadproc/os2/signals.c index d4db268d0..de975757f 100644 --- a/threadproc/os2/signals.c +++ b/threadproc/os2/signals.c @@ -63,7 +63,7 @@ #define INCL_DOS #include <os2.h> -ap_status_t ap_kill(struct ap_proc_t *proc, int signal) +ap_status_t ap_kill(ap_proc_t *proc, int signal) { /* SIGTERM's don't work too well in OS/2 (only affects other EMX programs). CGIs may not be, esp. REXX scripts, so use a native call instead */ diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c index 108377fbf..0dad0a20b 100644 --- a/threadproc/os2/thread.c +++ b/threadproc/os2/thread.c @@ -61,9 +61,9 @@ #define INCL_DOS #include <os2.h> -ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont) +ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont) { - (*new) = (struct ap_threadattr_t *)ap_palloc(cont, sizeof(struct ap_threadattr_t)); + (*new) = (ap_threadattr_t *)ap_palloc(cont, sizeof(ap_threadattr_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -76,7 +76,7 @@ ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *con -ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on) +ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on) { attr->attr |= APR_THREADATTR_DETACHED; return APR_SUCCESS; @@ -84,7 +84,7 @@ ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on) -ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr) +ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr) { return (attr->attr & APR_THREADATTR_DETACHED) ? APR_DETACH : APR_NOTDETACH; } @@ -93,20 +93,20 @@ ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr) static void ap_thread_begin(void *arg) { - struct ap_thread_t *thread = (struct ap_thread_t *)arg; + ap_thread_t *thread = (ap_thread_t *)arg; thread->rv = thread->func(thread->data); } -ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr, +ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, ap_thread_start_t func, void *data, ap_context_t *cont) { ap_status_t stat; ap_thread_t *thread; - thread = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t)); + thread = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t)); *new = thread; if (thread == NULL) { @@ -154,7 +154,7 @@ ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval) -ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd) +ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd) { ULONG rc; TID waittid = thd->tid; @@ -169,7 +169,7 @@ ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd) -ap_status_t ap_thread_detach(struct ap_thread_t *thd) +ap_status_t ap_thread_detach(ap_thread_t *thd) { thd->attr->attr |= APR_THREADATTR_DETACHED; return APR_SUCCESS; diff --git a/threadproc/os2/threadcancel.c b/threadproc/os2/threadcancel.c index 64bb2719d..7261a088c 100644 --- a/threadproc/os2/threadcancel.c +++ b/threadproc/os2/threadcancel.c @@ -57,7 +57,7 @@ #include "apr_general.h" #include "fileio.h" -ap_status_t ap_cancel_thread(struct ap_thread_t *thd) +ap_status_t ap_cancel_thread(ap_thread_t *thd) { return os2errno(DosKillThread(thd->tid)); } diff --git a/threadproc/os2/threadpriv.c b/threadproc/os2/threadpriv.c index 0022ed871..b62615e75 100644 --- a/threadproc/os2/threadpriv.c +++ b/threadproc/os2/threadpriv.c @@ -59,10 +59,10 @@ #include "apr_lib.h" #include "fileio.h" -ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, +ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *), ap_context_t *cont) { - (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t)); + (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t)); if ((*key) == NULL) { return APR_ENOMEM; @@ -72,19 +72,19 @@ ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, return os2errno(DosAllocThreadLocalMemory(1, &((*key)->key))); } -ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key) +ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key) { (*new) = (void *)*(key->key); return APR_SUCCESS; } -ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key) +ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key) { *(key->key) = (ULONG)priv; return APR_SUCCESS; } -ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key) +ap_status_t ap_delete_thread_private(ap_threadkey_t *key) { return os2errno(DosFreeThreadLocalMemory(key->key)); } diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c index 425a21953..8f81b1242 100644 --- a/threadproc/unix/proc.c +++ b/threadproc/unix/proc.c @@ -61,10 +61,10 @@ * arg 1) The newly created procattr. * arg 2) The context to use */ -ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont) +ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont) { - (*new) = (struct ap_procattr_t *)ap_palloc(cont, - sizeof(struct ap_procattr_t)); + (*new) = (ap_procattr_t *)ap_palloc(cont, + sizeof(ap_procattr_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -92,7 +92,7 @@ ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *con * arg 3) Should stdout be a pipe bnack to the parent? * arg 4) Should stderr be a pipe bnack to the parent? */ -ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, +ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, ap_int32_t out, ap_int32_t err) { ap_status_t status; @@ -159,7 +159,7 @@ ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, * arg 2) ap_file_t value to use as child_in. Must be a valid file. * arg 3) ap_file_t value to use as parent_in. Must be a valid file. */ -ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in, +ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in, ap_file_t *parent_in) { if (attr->child_in == NULL && attr->parent_in == NULL) @@ -188,7 +188,7 @@ ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_ * arg 2) ap_file_t value to use as child_out. Must be a valid file. * arg 3) ap_file_t value to use as parent_out. Must be a valid file. */ -ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child_out, +ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out, ap_file_t *parent_out) { if (attr->child_out == NULL && attr->parent_out == NULL) @@ -217,7 +217,7 @@ ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child * arg 2) ap_file_t value to use as child_err. Must be a valid file. * arg 3) ap_file_t value to use as parent_err. Must be a valid file. */ -ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child_err, +ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err, ap_file_t *parent_err) { if (attr->child_err == NULL && attr->parent_err == NULL) @@ -241,7 +241,7 @@ ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child * the parent currently resides in, when the createprocess call * is made. */ -ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, +ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir) { attr->currdir = ap_pstrdup(attr->cntxt, dir); @@ -259,7 +259,7 @@ ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, * APR_SHELLCMD -- Shell script * APR_PROGRAM -- Executable program (default) */ -ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr, +ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr, ap_cmdtype_e cmd) { attr->cmdtype = cmd; @@ -272,7 +272,7 @@ ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr, * arg 1) The procattr we care about. * arg 2) Should the child start in detached state? Default is no. */ -ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t detach) +ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach) { attr->detached = detach; return APR_SUCCESS; @@ -285,11 +285,11 @@ ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t detach) * arg 1) The resulting process handle. * arg 2) The context to use. */ -ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont) +ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont) { int pid; - (*proc) = ap_palloc(cont, sizeof(struct ap_proc_t)); + (*proc) = ap_palloc(cont, sizeof(ap_proc_t)); if ((pid = fork()) < 0) { return errno; @@ -319,16 +319,16 @@ ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont) * process * arg 6) The context to use. */ -ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, +ap_status_t ap_create_process(ap_proc_t **new, const char *progname, char *const args[], char **env, - struct ap_procattr_t *attr, ap_context_t *cont) + ap_procattr_t *attr, ap_context_t *cont) { int i; typedef const char *my_stupid_string; my_stupid_string *newargs; - struct ap_proc_t *pgrp; + ap_proc_t *pgrp; - (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*new) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -417,7 +417,7 @@ ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, * arg 1) The returned file handle. * arg 2) The process handle that corresponds to the desired child process */ -ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childin(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_in; return APR_SUCCESS; @@ -429,7 +429,7 @@ ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc) * arg 1) The returned file handle. * arg 2) The process handle that corresponds to the desired child process */ -ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childout(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_out; return APR_SUCCESS; @@ -441,7 +441,7 @@ ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc) * arg 1) The returned file handle. * arg 2) The process handle that corresponds to the desired child process */ -ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childerr(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_err; return APR_SUCCESS; @@ -460,7 +460,7 @@ ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc) * APR_CHILD_DONE -- child is no longer running. * APR_CHILD_NOTDONE -- child is still running. */ -ap_status_t ap_wait_proc(struct ap_proc_t *proc, +ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how_e waithow) { pid_t status; @@ -507,14 +507,14 @@ ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc) * arg 2) The os specific proc to convert * arg 3) The context to use if it is needed. */ -ap_status_t ap_put_os_proc(struct ap_proc_t **proc, ap_os_proc_t *theproc, +ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*proc) == NULL) { - (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*proc) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); (*proc)->cntxt = cont; } (*proc)->pid = *theproc; diff --git a/threadproc/unix/procsup.c b/threadproc/unix/procsup.c index b878b622d..a4ac1b642 100644 --- a/threadproc/unix/procsup.c +++ b/threadproc/unix/procsup.c @@ -60,11 +60,11 @@ * arg 1) The new process handler * arg 2) The context to use if it is needed. */ -ap_status_t ap_detach(struct ap_proc_t **new, ap_context_t *cont) +ap_status_t ap_detach(ap_proc_t **new, ap_context_t *cont) { int x; - (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*new) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); (*new)->cntxt = cont; (*new)->attr = NULL; @@ -131,7 +131,7 @@ ap_status_t ap_detach(struct ap_proc_t **new, ap_context_t *cont) * arg 2) The user data associated with the proc. * arg 3) The currently open proc. */ -ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc) +ap_status_t ap_get_procdata(char *key, void *data, ap_proc_t *proc) { if (proc != NULL) { return ap_get_userdata(data, key, proc->cntxt); @@ -153,7 +153,7 @@ ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc) */ ap_status_t ap_set_procdata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_proc_t *proc) + ap_proc_t *proc) { if (proc != NULL) { return ap_set_userdata(data, key, cleanup, proc->cntxt); diff --git a/threadproc/unix/signals.c b/threadproc/unix/signals.c index 68bb18245..de076cde2 100644 --- a/threadproc/unix/signals.c +++ b/threadproc/unix/signals.c @@ -60,7 +60,7 @@ * arg 1) The process to terminate. * arg 2) How to kill the process. */ -ap_status_t ap_kill(struct ap_proc_t *proc, int sig) +ap_status_t ap_kill(ap_proc_t *proc, int sig) { if (kill(proc->pid, sig) == -1) { return errno; diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c index d90d27053..f62b925de 100644 --- a/threadproc/unix/thread.c +++ b/threadproc/unix/thread.c @@ -64,12 +64,12 @@ * arg 1) The newly created threadattr. * arg 2) The context to use */ -ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont) +ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont) { ap_status_t stat; - (*new) = (struct ap_threadattr_t *)ap_palloc(cont, - sizeof(struct ap_threadattr_t)); + (*new) = (ap_threadattr_t *)ap_palloc(cont, + sizeof(ap_threadattr_t)); (*new)->attr = (pthread_attr_t *)ap_palloc(cont, sizeof(pthread_attr_t)); @@ -92,7 +92,7 @@ ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *con * arg 1) The threadattr to affect * arg 2) Thread detach state on or off */ -ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on) +ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on) { ap_status_t stat; if ((stat = pthread_attr_setdetachstate(attr->attr, on)) == 0) { @@ -108,7 +108,7 @@ ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on) * Get the detach mode for this threadattr. * arg 1) The threadattr to reference */ -ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr) +ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr) { int state; @@ -129,14 +129,14 @@ ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr) * arg 4) Any data to be passed to the starting function * arg 5) The context to use */ -ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr, +ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, ap_thread_start_t func, void *data, ap_context_t *cont) { ap_status_t stat; pthread_attr_t *temp; - (*new) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t)); + (*new) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -187,7 +187,7 @@ ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval) * arg 1) The return value from the dead thread. * arg 2) The thread to join */ -ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd) +ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd) { ap_status_t stat; @@ -204,7 +204,7 @@ ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd) * detach a thread * arg 1) The thread to detach */ -ap_status_t ap_thread_detach(struct ap_thread_t *thd) +ap_status_t ap_thread_detach(ap_thread_t *thd) { ap_status_t stat; @@ -223,7 +223,7 @@ ap_status_t ap_thread_detach(struct ap_thread_t *thd) * arg 2) The key to associate with the data * arg 3) The currently open thread. */ -ap_status_t ap_get_threaddata(void **data, char *key, struct ap_thread_t *thread) +ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread) { if (thread != NULL) { return ap_get_userdata(data, key, thread->cntxt); @@ -246,7 +246,7 @@ ap_status_t ap_get_threaddata(void **data, char *key, struct ap_thread_t *thread */ ap_status_t ap_set_threaddata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_thread_t *thread) + ap_thread_t *thread) { if (thread != NULL) { return ap_set_userdata(data, key, cleanup, thread->cntxt); @@ -263,7 +263,7 @@ ap_status_t ap_set_threaddata(void *data, char *key, * arg 1) The apr thread to convert * arg 2) The os specific thread we are converting to */ -ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct ap_thread_t *thd) +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd) { if (thd == NULL) { return APR_ENOTHREAD; @@ -280,14 +280,14 @@ ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct ap_thread_t *thd) * arg 2) The os specific thread to convert * arg 3) The context to use if it is needed. */ -ap_status_t ap_put_os_thread(struct ap_thread_t **thd, ap_os_thread_t *thethd, +ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*thd) == NULL) { - (*thd) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t)); + (*thd) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t)); (*thd)->cntxt = cont; } (*thd)->td = thethd; diff --git a/threadproc/unix/threadcancel.c b/threadproc/unix/threadcancel.c index d16fcac4b..242241015 100644 --- a/threadproc/unix/threadcancel.c +++ b/threadproc/unix/threadcancel.c @@ -63,7 +63,7 @@ * Asynchronously kill a thread * arg 1) The thread to kill. */ -ap_status_t ap_cancel_thread(struct ap_thread_t *thd) +ap_status_t ap_cancel_thread(ap_thread_t *thd) { ap_status_t stat; if ((stat = pthread_cancel(*thd->td)) == 0) { diff --git a/threadproc/unix/threadpriv.c b/threadproc/unix/threadpriv.c index c00efde61..232ab2f89 100644 --- a/threadproc/unix/threadpriv.c +++ b/threadproc/unix/threadpriv.c @@ -67,11 +67,11 @@ * arg 2) The destructor to use when freeing the private memory. * arg 3) The context to use */ -ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, +ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *), ap_context_t *cont) { ap_status_t stat; - (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t)); + (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t)); if ((*key) == NULL) { return APR_ENOMEM; @@ -86,24 +86,24 @@ ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, } /* ***APRDOC******************************************************** - * ap_status_t ap_get_thread_private(void **new, ap_key_t *key) + * ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key) * Get a pointer to the thread private memory * arg 1) The data stored in private memory * arg 2) The handle for the desired thread private memory */ -ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key) +ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key) { (*new) = pthread_getspecific(key->key); return APR_SUCCESS; } /* ***APRDOC******************************************************** - * ap_status_t ap_set_thread_private(void *priv, ap_key_t *key) + * ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key) * Set the data to be stored in thread private memory * arg 1) The data to be stored in private memory * arg 2) The handle for the desired thread private memory */ -ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key) +ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key) { ap_status_t stat; if ((stat = pthread_setspecific(key->key, priv)) == 0) { @@ -115,11 +115,11 @@ ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key) } /* ***APRDOC******************************************************** - * ap_status_t ap_delete_thread_private(ap_key_t *key) + * ap_status_t ap_delete_thread_private(ap_threadkey_t *key) * Free the thread private memory * arg 1) The handle for the desired thread private memory */ -ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key) +ap_status_t ap_delete_thread_private(ap_threadkey_t *key) { ap_status_t stat; if ((stat = pthread_key_delete(key->key)) == 0) { @@ -136,7 +136,7 @@ ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key) * arg 2) The key associated with the data * arg 3) The currently open threadkey. */ -ap_status_t ap_get_threadkeydata(void **data, char *key, struct ap_threadkey_t *threadkey) +ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey) { if (threadkey != NULL) { return ap_get_userdata(data, key, threadkey->cntxt); @@ -159,7 +159,7 @@ ap_status_t ap_get_threadkeydata(void **data, char *key, struct ap_threadkey_t * */ ap_status_t ap_set_threadkeydata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_threadkey_t *threadkey) + ap_threadkey_t *threadkey) { if (threadkey != NULL) { return ap_set_userdata(data, key, cleanup, threadkey->cntxt); @@ -171,13 +171,13 @@ ap_status_t ap_set_threadkeydata(void *data, } /* ***APRDOC******************************************************** - * ap_status_t ap_get_os_threadkey(ap_key_t *thekey, ap_os_threadkey_t *key) + * ap_status_t ap_get_os_threadkey(ap_threadkey_t *thekey, ap_os_threadkey_t *key) * convert the thread private memory key to os specific type * from an apr type. * arg 1) The apr handle we are converting from. * arg 2) The os specific handle we are converting to. */ -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct ap_threadkey_t *key) +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_threadkey_t *key) { if (key == NULL) { return APR_ENOFILE; @@ -187,21 +187,21 @@ ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct ap_threadkey_t } /* ***APRDOC******************************************************** - * ap_status_t ap_put_os_threadkey(ap_key_t *key, ap_os_threadkey_t *thekey, + * ap_status_t ap_put_os_threadkey(ap_threadkey_t *key, ap_os_threadkey_t *thekey, * ap_context_t *cont) * convert the thread private memory key from os specific type to apr type. * arg 1) The apr handle we are converting to. * arg 2) The os specific handle to convert * arg 3) The context to use if it is needed. */ -ap_status_t ap_put_os_threadkey(struct ap_threadkey_t **key, +ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, ap_os_threadkey_t *thekey, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*key) == NULL) { - (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t)); + (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t)); (*key)->cntxt = cont; } (*key)->key = *thekey; diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c index c2049f698..891ef42fa 100644 --- a/threadproc/win32/proc.c +++ b/threadproc/win32/proc.c @@ -65,10 +65,10 @@ #include <string.h> #include <process.h> -ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont) +ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont) { - (*new) = (struct ap_procattr_t *)ap_palloc(cont, - sizeof(struct ap_procattr_t)); + (*new) = (ap_procattr_t *)ap_palloc(cont, + sizeof(ap_procattr_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -89,7 +89,7 @@ ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *con return APR_SUCCESS; } -ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, +ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, ap_int32_t out, ap_int32_t err) { ap_status_t stat; @@ -114,11 +114,11 @@ ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, return APR_SUCCESS; } #if 0 -ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in, +ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in, ap_file_t *parent_in) { } -ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child_out, +ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, ap_file_t *child_out, ap_file_t *parent_out) { if (attr->child_out == NULL && attr->parent_out == NULL) @@ -132,7 +132,7 @@ ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child return APR_SUCCESS; } -ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child_err, +ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, ap_file_t *child_err, ap_file_t *parent_err) { if (attr->child_err == NULL && attr->parent_err == NULL) @@ -146,7 +146,7 @@ ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child return APR_SUCCESS; } #endif -ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, +ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir) { char path[MAX_PATH]; @@ -170,22 +170,22 @@ ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, return APR_ENOMEM; } -ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr, +ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr, ap_cmdtype_e cmd) { attr->cmdtype = cmd; return APR_SUCCESS; } -ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t det) +ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t det) { attr->detached = det; return APR_SUCCESS; } -ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, +ap_status_t ap_create_process(ap_proc_t **new, const char *progname, char *const args[], char **env, - struct ap_procattr_t *attr, ap_context_t *cont) + ap_procattr_t *attr, ap_context_t *cont) { int i, iEnvBlockLen; char *cmdline; @@ -195,7 +195,7 @@ ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, char *envstr; char *pEnvBlock, *pNext; - (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*new) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -364,25 +364,25 @@ ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, return GetLastError(); } -ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childin(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_in; return APR_SUCCESS; } -ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childout(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_out; return APR_SUCCESS; } -ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc) +ap_status_t ap_get_childerr(ap_file_t **new, ap_proc_t *proc) { (*new) = proc->attr->parent_err; return APR_SUCCESS; } -ap_status_t ap_wait_proc(struct ap_proc_t *proc, +ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how_e wait) { DWORD stat; @@ -406,7 +406,7 @@ ap_status_t ap_wait_proc(struct ap_proc_t *proc, return GetLastError(); } -ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc) +ap_status_t ap_get_procdata(char *key, void *data, ap_proc_t *proc) { if (proc != NULL) { return ap_get_userdata(data, key, proc->cntxt); @@ -419,7 +419,7 @@ ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc) ap_status_t ap_set_procdata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_proc_t *proc) + ap_proc_t *proc) { if (proc != NULL) { return ap_set_userdata(data, key, cleanup, proc->cntxt); @@ -439,14 +439,14 @@ ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc) return APR_SUCCESS; } -ap_status_t ap_put_os_proc(struct ap_proc_t **proc, ap_os_proc_t *theproc, +ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*proc) == NULL) { - (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t)); + (*proc) = (ap_proc_t *)ap_palloc(cont, sizeof(ap_proc_t)); (*proc)->cntxt = cont; } (*proc)->pi = *theproc; diff --git a/threadproc/win32/signals.c b/threadproc/win32/signals.c index dad479834..08119b78d 100644 --- a/threadproc/win32/signals.c +++ b/threadproc/win32/signals.c @@ -64,7 +64,7 @@ #endif /* Windows only really support killing process, but that will do for now. */ -ap_status_t ap_kill(struct ap_proc_t *proc, int signal) +ap_status_t ap_kill(ap_proc_t *proc, int signal) { if (TerminateProcess(proc->pi.hProcess, signal) == 0) { return errno; diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c index 27c5567c3..41c07feb8 100644 --- a/threadproc/win32/thread.c +++ b/threadproc/win32/thread.c @@ -61,10 +61,10 @@ #include <process.h> -ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont) +ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont) { - (*new) = (struct ap_threadattr_t *)ap_palloc(cont, - sizeof(struct ap_threadattr_t)); + (*new) = (ap_threadattr_t *)ap_palloc(cont, + sizeof(ap_threadattr_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -74,20 +74,20 @@ ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *con return APR_SUCCESS; } -ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on) +ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on) { attr->detach = on; return APR_SUCCESS; } -ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr) +ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr) { if (attr->detach == 1) return APR_DETACH; return APR_NOTDETACH; } -ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr, +ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, ap_thread_start_t func, void *data, ap_context_t *cont) { @@ -95,7 +95,7 @@ ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *a unsigned temp; int lasterror; - (*new) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t)); + (*new) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t)); if ((*new) == NULL) { return APR_ENOMEM; @@ -131,7 +131,7 @@ ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval) return APR_SUCCESS; } -ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd) +ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd) { ap_status_t stat; @@ -146,7 +146,7 @@ ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd) } } -ap_status_t ap_thread_detach(struct ap_thread_t *thd) +ap_status_t ap_thread_detach(ap_thread_t *thd) { if (CloseHandle(thd->td)) { return APR_SUCCESS; @@ -156,7 +156,7 @@ ap_status_t ap_thread_detach(struct ap_thread_t *thd) } } -ap_status_t ap_get_threaddata(void **data, char *key, struct ap_thread_t *thread) +ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread) { if (thread != NULL) { return ap_get_userdata(data, key, thread->cntxt); @@ -169,7 +169,7 @@ ap_status_t ap_get_threaddata(void **data, char *key, struct ap_thread_t *thread ap_status_t ap_set_threaddata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_thread_t *thread) + ap_thread_t *thread) { if (thread != NULL) { return ap_set_userdata(data, key, cleanup, thread->cntxt); @@ -180,7 +180,7 @@ ap_status_t ap_set_threaddata(void *data, char *key, } } -ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct ap_thread_t *thd) +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd) { if (thd == NULL) { return APR_ENOTHREAD; @@ -189,14 +189,14 @@ ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct ap_thread_t *thd) return APR_SUCCESS; } -ap_status_t ap_put_os_thread(struct ap_thread_t **thd, ap_os_thread_t *thethd, +ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*thd) == NULL) { - (*thd) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t)); + (*thd) = (ap_thread_t *)ap_palloc(cont, sizeof(ap_thread_t)); (*thd)->cntxt = cont; } (*thd)->td = thethd; diff --git a/threadproc/win32/threadcancel.c b/threadproc/win32/threadcancel.c index c92ee3078..a4d80637f 100644 --- a/threadproc/win32/threadcancel.c +++ b/threadproc/win32/threadcancel.c @@ -57,7 +57,7 @@ #include "apr_general.h" -ap_status_t ap_cancel_thread(struct ap_thread_t *thd) +ap_status_t ap_cancel_thread(ap_thread_t *thd) { if (TerminateThread(thd->td, APR_SUCCESS) == 0) { return APR_EEXIST; diff --git a/threadproc/win32/threadpriv.c b/threadproc/win32/threadpriv.c index 513c73178..df7d78d1c 100644 --- a/threadproc/win32/threadpriv.c +++ b/threadproc/win32/threadpriv.c @@ -59,14 +59,14 @@ #include "apr_errno.h" #include "apr_portable.h" -ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, +ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *), ap_context_t *cont) { (*key)->key = TlsAlloc(); return APR_SUCCESS; } -ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key) +ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key) { if ((*new) = TlsGetValue(key->key)) { return APR_SUCCESS; @@ -74,7 +74,7 @@ ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key) return APR_EEXIST; } -ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key) +ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key) { if (TlsSetValue(key->key, priv)) { return APR_SUCCESS; @@ -82,7 +82,7 @@ ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key) return APR_EEXIST; } -ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key) +ap_status_t ap_delete_thread_private(ap_threadkey_t *key) { if (TlsFree(key->key)) { return APR_SUCCESS; @@ -90,7 +90,7 @@ ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key) return APR_EEXIST; } -ap_status_t ap_get_threadkeydata(void **data, char *key, struct ap_threadkey_t *threadkey) +ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey) { if (threadkey != NULL) { return ap_get_userdata(data, key, threadkey->cntxt); @@ -102,7 +102,7 @@ ap_status_t ap_get_threadkeydata(void **data, char *key, struct ap_threadkey_t * } ap_status_t ap_set_threadkeydata(void *data, char *key, ap_status_t (*cleanup) (void *), - struct ap_threadkey_t *threadkey) + ap_threadkey_t *threadkey) { if (threadkey != NULL) { return ap_set_userdata(data, key, cleanup, threadkey->cntxt); @@ -113,7 +113,7 @@ ap_status_t ap_set_threadkeydata(void *data, char *key, ap_status_t (*cleanup) ( } } -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct ap_threadkey_t *key) +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_threadkey_t *key) { if (key == NULL) { return APR_ENOFILE; @@ -122,14 +122,14 @@ ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct ap_threadkey_t return APR_SUCCESS; } -ap_status_t ap_put_os_threadkey(struct ap_threadkey_t **key, +ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, ap_os_threadkey_t *thekey, ap_context_t *cont) { if (cont == NULL) { return APR_ENOCONT; } if ((*key) == NULL) { - (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t)); + (*key) = (ap_threadkey_t *)ap_palloc(cont, sizeof(ap_threadkey_t)); (*key)->cntxt = cont; } (*key)->key = *thekey; |