diff options
author | Ivan Zhakov <ivan@apache.org> | 2022-07-08 20:55:13 +0000 |
---|---|---|
committer | Ivan Zhakov <ivan@apache.org> | 2022-07-08 20:55:13 +0000 |
commit | 407ad9f12f81ca572a0dd6ca1be9ae78fac4cb3e (patch) | |
tree | f32898df4cd25c2acc1e6f9a5d8e9a55480a118a /threadproc | |
parent | e0132550068aab858bac67b5dbb409ccc14a3e20 (diff) | |
download | apr-407ad9f12f81ca572a0dd6ca1be9ae78fac4cb3e.tar.gz |
Replace tabs to spaces.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1902583 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc')
-rw-r--r-- | threadproc/beos/thread.c | 20 | ||||
-rw-r--r-- | threadproc/beos/threadpriv.c | 198 | ||||
-rw-r--r-- | threadproc/netware/threadpriv.c | 2 | ||||
-rw-r--r-- | threadproc/win32/proc.c | 20 |
4 files changed, 120 insertions, 120 deletions
diff --git a/threadproc/beos/thread.c b/threadproc/beos/thread.c index f5752a81e..f14ef076e 100644 --- a/threadproc/beos/thread.c +++ b/threadproc/beos/thread.c @@ -27,27 +27,27 @@ APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool } (*new)->pool = pool; - (*new)->attr = (int32)B_NORMAL_PRIORITY; + (*new)->attr = (int32)B_NORMAL_PRIORITY; return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr, apr_int32_t on) { - if (on == 1){ - attr->detached = 1; - } else { - attr->detached = 0; - } + if (on == 1){ + attr->detached = 1; + } else { + attr->detached = 0; + } return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr) { - if (attr->detached == 1){ - return APR_DETACH; - } - return APR_NOTDETACH; + if (attr->detached == 1){ + return APR_DETACH; + } + return APR_NOTDETACH; } APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr, diff --git a/threadproc/beos/threadpriv.c b/threadproc/beos/threadpriv.c index 442235f7d..162e37f6e 100644 --- a/threadproc/beos/threadpriv.c +++ b/threadproc/beos/threadpriv.c @@ -29,121 +29,121 @@ APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key, } (*key)->pool = pool; - - acquire_sem(lock); - for ((*key)->key=0; (*key)->key < BEOS_MAX_DATAKEYS; (*key)->key++){ - if (key_table[(*key)->key].assigned == 0){ - key_table[(*key)->key].assigned = 1; - key_table[(*key)->key].destructor = dest; - release_sem(lock); - return APR_SUCCESS; - } - } - release_sem(lock); + acquire_sem(lock); + for ((*key)->key=0; (*key)->key < BEOS_MAX_DATAKEYS; (*key)->key++){ + if (key_table[(*key)->key].assigned == 0){ + key_table[(*key)->key].assigned = 1; + key_table[(*key)->key].destructor = dest; + release_sem(lock); + return APR_SUCCESS; + } + + } + release_sem(lock); return APR_ENOMEM; } APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key) { - thread_id tid; - int i, index=0; - tid = find_thread(NULL); - for (i=0;i<BEOS_MAX_DATAKEYS;i++){ - if (beos_data[i]->data){ - /* it's been used */ - if (beos_data[i]->td == tid){ - index = i; - } - } - } - if (index == 0){ - /* no storage for thread so we can't get anything... */ - return APR_ENOMEM; - } + thread_id tid; + int i, index=0; + tid = find_thread(NULL); + for (i=0;i<BEOS_MAX_DATAKEYS;i++){ + if (beos_data[i]->data){ + /* it's been used */ + if (beos_data[i]->td == tid){ + index = i; + } + } + } + if (index == 0){ + /* no storage for thread so we can't get anything... */ + return APR_ENOMEM; + } - if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ - acquire_sem(key_table[key->key].lock); - if (key_table[key->key].count){ - (*new) = (void*)beos_data[index]->data[key->key]; - } else { - (*new) = NULL; - } - release_sem(key_table[key->key].lock); - } else { - (*new) = NULL; - } - return APR_SUCCESS; + if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ + acquire_sem(key_table[key->key].lock); + if (key_table[key->key].count){ + (*new) = (void*)beos_data[index]->data[key->key]; + } else { + (*new) = NULL; + } + release_sem(key_table[key->key].lock); + } else { + (*new) = NULL; + } + return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, apr_threadkey_t *key) { - thread_id tid; - int i,index = 0, ret = 0; + thread_id tid; + int i,index = 0, ret = 0; - tid = find_thread(NULL); - for (i=0; i < BEOS_MAX_DATAKEYS; i++){ - if (beos_data[i]->data){ - if (beos_data[i]->td == tid){index = i;} - } - } - if (index==0){ - /* not yet been allocated */ - for (i=0; i< BEOS_MAX_DATAKEYS; i++){ - if (! beos_data[i]->data){ - /* we'll take this one... */ - index = i; - beos_data[i]->data = (const void **)malloc(sizeof(void *) * BEOS_MAX_DATAKEYS); - memset((void *)beos_data[i]->data, 0, sizeof(void *) * BEOS_MAX_DATAKEYS); - beos_data[i]->count = (int)malloc(sizeof(int)); - beos_data[i]->td = (thread_id)malloc(sizeof(thread_id)); - beos_data[i]->td = tid; - } - } - } - if (index == 0){ - /* we're out of luck.. */ - return APR_ENOMEM; - } - if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ - acquire_sem(key_table[key->key].lock); - if (key_table[key->key].count){ - if (beos_data[index]->data[key->key] == NULL){ - if (priv != NULL){ - beos_data[index]->count++; - key_table[key->key].count++; - } - } else { - if (priv == NULL){ - beos_data[index]->count--; - key_table[key->key].count--; - } - } - beos_data[index]->data[key->key] = priv; - ret = 1; - } else { - ret = 0; - } - release_sem(key_table[key->key].lock); - } - if (ret) - return APR_SUCCESS; - return APR_ENOMEM; + tid = find_thread(NULL); + for (i=0; i < BEOS_MAX_DATAKEYS; i++){ + if (beos_data[i]->data){ + if (beos_data[i]->td == tid){index = i;} + } + } + if (index==0){ + /* not yet been allocated */ + for (i=0; i< BEOS_MAX_DATAKEYS; i++){ + if (! beos_data[i]->data){ + /* we'll take this one... */ + index = i; + beos_data[i]->data = (const void **)malloc(sizeof(void *) * BEOS_MAX_DATAKEYS); + memset((void *)beos_data[i]->data, 0, sizeof(void *) * BEOS_MAX_DATAKEYS); + beos_data[i]->count = (int)malloc(sizeof(int)); + beos_data[i]->td = (thread_id)malloc(sizeof(thread_id)); + beos_data[i]->td = tid; + } + } + } + if (index == 0){ + /* we're out of luck.. */ + return APR_ENOMEM; + } + if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ + acquire_sem(key_table[key->key].lock); + if (key_table[key->key].count){ + if (beos_data[index]->data[key->key] == NULL){ + if (priv != NULL){ + beos_data[index]->count++; + key_table[key->key].count++; + } + } else { + if (priv == NULL){ + beos_data[index]->count--; + key_table[key->key].count--; + } + } + beos_data[index]->data[key->key] = priv; + ret = 1; + } else { + ret = 0; + } + release_sem(key_table[key->key].lock); + } + if (ret) + return APR_SUCCESS; + return APR_ENOMEM; } APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key) { - if (key->key < BEOS_MAX_DATAKEYS){ - acquire_sem(key_table[key->key].lock); - if (key_table[key->key].count == 1){ - key_table[key->key].destructor = NULL; - key_table[key->key].count = 0; - } - release_sem(key_table[key->key].lock); - } else { - return APR_ENOMEM; - } - return APR_SUCCESS; + if (key->key < BEOS_MAX_DATAKEYS){ + acquire_sem(key_table[key->key].lock); + if (key_table[key->key].count == 1){ + key_table[key->key].destructor = NULL; + key_table[key->key].count = 0; + } + release_sem(key_table[key->key].lock); + } else { + return APR_ENOMEM; + } + return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key, diff --git a/threadproc/netware/threadpriv.c b/threadproc/netware/threadpriv.c index 54680a563..a908f4eb2 100644 --- a/threadproc/netware/threadpriv.c +++ b/threadproc/netware/threadpriv.c @@ -23,7 +23,7 @@ apr_status_t apr_threadkey_private_create(apr_threadkey_t **key, apr_status_t stat; (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t)); - if ((*key) == NULL) { + if ((*key) == NULL) { return APR_ENOMEM; } diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c index 283e19afd..a1d201ce8 100644 --- a/threadproc/win32/proc.c +++ b/threadproc/win32/proc.c @@ -419,7 +419,7 @@ static char *apr_caret_escape_args(apr_pool_t *p, const char *str) unsigned char *d; const unsigned char *s; - cmd = apr_palloc(p, 2 * strlen(str) + 1); /* Be safe */ + cmd = apr_palloc(p, 2 * strlen(str) + 1); /* Be safe */ d = (unsigned char *)cmd; s = (const unsigned char *)str; for (; *s; ++s) { @@ -429,15 +429,15 @@ static char *apr_caret_escape_args(apr_pool_t *p, const char *str) * Convert them to spaces since they are effectively white * space to most applications */ - if (*s == '\r' || *s == '\n') { - *d++ = ' '; + if (*s == '\r' || *s == '\n') { + *d++ = ' '; continue; - } + } - if (IS_SHCHAR(*s)) { - *d++ = '^'; - } - *d++ = *s; + if (IS_SHCHAR(*s)) { + *d++ = '^'; + } + *d++ = *s; } *d = '\0'; @@ -722,9 +722,9 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, pNext = wcschr(pNext, L'\0') + 1; i++; } - if (!i) + if (!i) *(pNext++) = L'\0'; - *pNext = L'\0'; + *pNext = L'\0'; } } |