[core] rename lib apr symbols to fspr

This commit is contained in:
Chris Rienzo authored and Andrey Volk committed 2022-08-29 20:17:08 +03:00
1 parent 3c7e8ff989
commit 5c2726f413
354 files changed
+11614 -11614

No files matched your search

@@ -17,11 +17,11 @@
#ifndef DSO_H
#define DSO_H
#include "apr_private.h"
#include "apr_general.h"
#include "apr_pools.h"
#include "apr_dso.h"
#include "apr.h"
#include "fspr_private.h"
#include "fspr_general.h"
#include "fspr_pools.h"
#include "fspr_dso.h"
#include "fspr.h"
#include <dlfcn.h>
@@ -32,8 +32,8 @@ struct sym_list {
char *symbol;
};
struct apr_dso_handle_t {
apr_pool_t *pool;
struct fspr_dso_handle_t {
fspr_pool_t *pool;
void *handle;
const char *errormsg;
sym_list *symbols;
@@ -17,15 +17,15 @@
#ifndef FILE_IO_H
#define FILE_IO_H
#include "apr.h"
#include "apr_private.h"
#include "apr_general.h"
#include "apr_tables.h"
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_errno.h"
#include "apr_lib.h"
#include "apr_poll.h"
#include "fspr.h"
#include "fspr_private.h"
#include "fspr_general.h"
#include "fspr_tables.h"
#include "fspr_file_io.h"
#include "fspr_file_info.h"
#include "fspr_errno.h"
#include "fspr_lib.h"
#include "fspr_poll.h"
/* System headers the file I/O library needs */
#if APR_HAVE_FCNTL_H
@@ -78,45 +78,45 @@
typedef struct stat struct_stat;
struct apr_file_t {
apr_pool_t *pool;
struct fspr_file_t {
fspr_pool_t *pool;
int filedes;
char *fname;
apr_int32_t flags;
fspr_int32_t flags;
int eof_hit;
int is_pipe;
apr_interval_time_t timeout;
fspr_interval_time_t timeout;
int buffered;
enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
int ungetchar; /* Last char provided by an unget op. (-1 = no char)*/
/* if there is a timeout set, then this pollset is used */
apr_pollset_t *pollset;
fspr_pollset_t *pollset;
/* Stuff for buffered mode */
char *buffer;
int bufpos; /* Read/Write position in buffer */
apr_off_t dataRead; /* amount of valid data read into buffer */
fspr_off_t dataRead; /* amount of valid data read into buffer */
int direction; /* buffer being used for 0 = read, 1 = write */
apr_off_t filePtr; /* position in file of handle */
fspr_off_t filePtr; /* position in file of handle */
#if APR_HAS_THREADS
struct apr_thread_mutex_t *thlock;
struct fspr_thread_mutex_t *thlock;
#endif
};
struct apr_dir_t {
apr_pool_t *pool;
struct fspr_dir_t {
fspr_pool_t *pool;
char *dirname;
DIR *dirstruct;
struct dirent *entry;
};
typedef struct apr_stat_entry_t apr_stat_entry_t;
typedef struct fspr_stat_entry_t fspr_stat_entry_t;
struct apr_stat_entry_t {
struct fspr_stat_entry_t {
struct stat info;
char *casedName;
apr_time_t expire;
fspr_time_t expire;
NXPathCtx_t pathCtx;
};
@@ -131,21 +131,21 @@ struct apr_stat_entry_t {
* we need to fold the case to canonical form. This function is
* supposed to do so.
*/
apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
fspr_status_t filepath_root_case(char **rootpath, char *root, fspr_pool_t *p);
/* This function check to see of the given path includes a drive/volume
* specifier. If the _only_ parameter is set to DRIVE_ONLY then it
* check to see of the path only contains a drive/volume specifier and
* nothing else.
*/
apr_status_t filepath_has_drive(const char *rootpath, int only, apr_pool_t *p);
fspr_status_t filepath_has_drive(const char *rootpath, int only, fspr_pool_t *p);
/* This function compares the drive/volume specifiers for each given path.
* It returns zero if they match or non-zero if not.
*/
apr_status_t filepath_compare_drive(const char *path1, const char *path2, apr_pool_t *p);
fspr_status_t filepath_compare_drive(const char *path1, const char *path2, fspr_pool_t *p);
apr_status_t apr_unix_file_cleanup(void *);
fspr_status_t fspr_unix_file_cleanup(void *);
#endif /* ! FILE_IO_H */
@@ -17,12 +17,12 @@
#ifndef GLOBAL_MUTEX_H
#define GLOBAL_MUTEX_H
#include "apr_global_mutex.h"
#include "apr_thread_mutex.h"
#include "fspr_global_mutex.h"
#include "fspr_thread_mutex.h"
struct apr_global_mutex_t {
apr_pool_t *pool;
apr_thread_mutex_t *mutex;
struct fspr_global_mutex_t {
fspr_pool_t *pool;
fspr_thread_mutex_t *mutex;
};
#endif /* GLOBAL_MUTEX_H */
@@ -17,10 +17,10 @@
#ifndef TIME_INTERNAL_H
#define TIME_INTERNAL_H
#include "apr.h"
#include "fspr.h"
#define TZONE (*___timezone())
void apr_netware_setup_time(void);
void fspr_netware_setup_time(void);
#endif /* TIME_INTERNAL_H */
@@ -22,9 +22,9 @@
arch/netware and then arch/unix. But in this specific case we
want arch/win32.
*/
#include <../win32/apr_arch_networkio.h>
#include <../win32/fspr_arch_networkio.h>
#else
#include <../unix/apr_arch_networkio.h>
#include <../unix/fspr_arch_networkio.h>
#endif
#endif /* ! NETWORK_IO_H */
@@ -17,12 +17,12 @@
#ifndef PROC_MUTEX_H
#define PROC_MUTEX_H
#include "apr_proc_mutex.h"
#include "apr_thread_mutex.h"
#include "fspr_proc_mutex.h"
#include "fspr_thread_mutex.h"
struct apr_proc_mutex_t {
apr_pool_t *pool;
apr_thread_mutex_t *mutex;
struct fspr_proc_mutex_t {
fspr_pool_t *pool;
fspr_thread_mutex_t *mutex;
};
#endif /* PROC_MUTEX_H */
@@ -17,11 +17,11 @@
#ifndef THREAD_COND_H
#define THREAD_COND_H
#include "apr_thread_cond.h"
#include "fspr_thread_cond.h"
#include <nks/synch.h>
struct apr_thread_cond_t {
apr_pool_t *pool;
struct fspr_thread_cond_t {
fspr_pool_t *pool;
NXCond_t *cond;
};
@@ -17,11 +17,11 @@
#ifndef THREAD_MUTEX_H
#define THREAD_MUTEX_H
#include "apr_thread_mutex.h"
#include "fspr_thread_mutex.h"
#include <nks/synch.h>
struct apr_thread_mutex_t {
apr_pool_t *pool;
struct fspr_thread_mutex_t {
fspr_pool_t *pool;
NXMutex_t *mutex;
};
@@ -17,11 +17,11 @@
#ifndef THREAD_RWLOCK_H
#define THREAD_RWLOCK_H
#include "apr_thread_rwlock.h"
#include "fspr_thread_rwlock.h"
#include <nks/synch.h>
struct apr_thread_rwlock_t {
apr_pool_t *pool;
struct fspr_thread_rwlock_t {
fspr_pool_t *pool;
NXRwLock_t *rwlock;
};
@@ -14,9 +14,9 @@
* limitations under the License.
*/
#include "apr.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
#include "fspr.h"
#include "fspr_thread_proc.h"
#include "fspr_file_io.h"
#include <sys/wait.h>
@@ -26,52 +26,52 @@
#define SHELL_PATH ""
#define APR_DEFAULT_STACK_SIZE 65536
struct apr_thread_t {
apr_pool_t *pool;
struct fspr_thread_t {
fspr_pool_t *pool;
NXContext_t ctx;
NXThreadId_t td;
char *thread_name;
apr_int32_t cancel;
apr_int32_t cancel_how;
fspr_int32_t cancel;
fspr_int32_t cancel_how;
void *data;
apr_thread_start_t func;
apr_status_t exitval;
fspr_thread_start_t func;
fspr_status_t exitval;
};
struct apr_threadattr_t {
apr_pool_t *pool;
apr_size_t stack_size;
apr_int32_t detach;
struct fspr_threadattr_t {
fspr_pool_t *pool;
fspr_size_t stack_size;
fspr_int32_t detach;
char *thread_name;
};
struct apr_threadkey_t {
apr_pool_t *pool;
struct fspr_threadkey_t {
fspr_pool_t *pool;
NXKey_t key;
};
struct apr_procattr_t {
apr_pool_t *pool;
apr_file_t *parent_in;
apr_file_t *child_in;
apr_file_t *parent_out;
apr_file_t *child_out;
apr_file_t *parent_err;
apr_file_t *child_err;
struct fspr_procattr_t {
fspr_pool_t *pool;
fspr_file_t *parent_in;
fspr_file_t *child_in;
fspr_file_t *parent_out;
fspr_file_t *child_out;
fspr_file_t *parent_err;
fspr_file_t *child_err;
char *currdir;
apr_int32_t cmdtype;
apr_int32_t detached;
apr_int32_t addrspace;
fspr_int32_t cmdtype;
fspr_int32_t detached;
fspr_int32_t addrspace;
};
struct apr_thread_once_t {
struct fspr_thread_once_t {
unsigned long value;
};
//struct apr_proc_t {
// apr_pool_t *pool;
//struct fspr_proc_t {
// fspr_pool_t *pool;
// pid_t pid;
// apr_procattr_t *attr;
// fspr_procattr_t *attr;
//};
#endif /* ! THREAD_PROC_H */
@@ -28,7 +28,7 @@
/* Include the public APR symbols, include our idea of the 'right'
* subset of the Windows.h header. This saves us repetition.
*/
#include "apr.h"
#include "fspr.h"
#include <sys/types.h>
#include <stddef.h>
@@ -185,7 +185,7 @@ void* getStatCache();
/*
* Include common private declarations.
*/
#include "../apr_private_common.h"
#include "../fspr_private_common.h"
#endif /*APR_PRIVATE_H*/
#endif /*NETWARE*/