You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2015/09/14 16:04:19 UTC
svn commit: r1702955 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
Author: ylavic
Date: Mon Sep 14 14:04:19 2015
New Revision: 1702955
URL: http://svn.apache.org/r1702955
Log:
mod_slotmem_shm: revert frivolous s/name/fname/ from r1702473, keep the comments.
Modified:
httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1702955&r1=1702954&r2=1702955&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Mon Sep 14 14:04:19 2015
@@ -42,7 +42,7 @@ typedef struct {
#define AP_UNSIGNEDINT_OFFSET (APR_ALIGN_DEFAULT(sizeof(unsigned int)))
struct ap_slotmem_instance_t {
- char *fname; /* file based SHM path/name */
+ char *name; /* file based SHM path/name */
char *pname; /* persisted file path/name */
int fbased; /* filebased? */
void *shm; /* ptr to memory segment (apr_shm_t *) */
@@ -275,8 +275,8 @@ static apr_status_t cleanup_slotmem(void
store_slotmem(next);
}
if (next->fbased) {
- apr_shm_remove(next->fname, next->gpool);
- apr_file_remove(next->fname, next->gpool);
+ apr_shm_remove(next->name, next->gpool);
+ apr_file_remove(next->name, next->gpool);
}
apr_shm_destroy((apr_shm_t *)next->shm);
next = next->next;
@@ -340,7 +340,7 @@ static apr_status_t slotmem_create(ap_sl
/* first try to attach to existing slotmem */
if (next) {
for (;;) {
- if (strcmp(next->fname, fname) == 0) {
+ if (strcmp(next->name, fname) == 0) {
/* we already have it */
*new = next;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02603)
@@ -439,7 +439,7 @@ static apr_status_t slotmem_create(ap_sl
/* For the chained slotmem stuff */
res = (ap_slotmem_instance_t *) apr_pcalloc(gpool,
sizeof(ap_slotmem_instance_t));
- res->fname = apr_pstrdup(gpool, fname);
+ res->name = apr_pstrdup(gpool, fname);
res->pname = apr_pstrdup(gpool, pname);
res->fbased = fbased;
res->shm = shm;
@@ -491,7 +491,7 @@ static apr_status_t slotmem_attach(ap_sl
/* first try to attach to existing slotmem */
if (next) {
for (;;) {
- if (strcmp(next->fname, fname) == 0) {
+ if (strcmp(next->name, fname) == 0) {
/* we already have it */
*new = next;
*item_size = next->desc.size;
@@ -523,7 +523,7 @@ static apr_status_t slotmem_attach(ap_sl
/* For the chained slotmem stuff */
res = (ap_slotmem_instance_t *) apr_pcalloc(gpool,
sizeof(ap_slotmem_instance_t));
- res->fname = apr_pstrdup(gpool, fname);
+ res->name = apr_pstrdup(gpool, fname);
res->fbased = 1;
res->shm = shm;
res->num_free = (unsigned int *)ptr;
@@ -669,7 +669,7 @@ static apr_status_t slotmem_grab(ap_slot
if (i >= slot->desc.num) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02293)
"slotmem(%s) grab failed. Num %u/num_free %u",
- slot->fname, slotmem_num_slots(slot),
+ slot->name, slotmem_num_slots(slot),
slotmem_num_free_slots(slot));
return APR_EINVAL;
}
@@ -690,7 +690,7 @@ static apr_status_t slotmem_fgrab(ap_slo
if (id >= slot->desc.num) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02397)
"slotmem(%s) fgrab failed. Num %u/num_free %u",
- slot->fname, slotmem_num_slots(slot),
+ slot->name, slotmem_num_slots(slot),
slotmem_num_free_slots(slot));
return APR_EINVAL;
}
@@ -717,7 +717,7 @@ static apr_status_t slotmem_release(ap_s
if (id >= slot->desc.num || !inuse[id] ) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02294)
"slotmem(%s) release failed. Num %u/inuse[%u] %d",
- slot->fname, slotmem_num_slots(slot),
+ slot->name, slotmem_num_slots(slot),
id, (int)inuse[id]);
if (id >= slot->desc.num) {
return APR_EINVAL;