Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D579E200BFB for ; Wed, 11 Jan 2017 19:05:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D40FA160B4E; Wed, 11 Jan 2017 18:05:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4F09C160B3B for ; Wed, 11 Jan 2017 19:05:16 +0100 (CET) Received: (qmail 5923 invoked by uid 500); 11 Jan 2017 18:05:15 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 5914 invoked by uid 99); 11 Jan 2017 18:05:15 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jan 2017 18:05:15 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 7BB393A01D7 for ; Wed, 11 Jan 2017 18:05:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1778331 - /httpd/httpd/trunk/modules/core/mod_watchdog.c Date: Wed, 11 Jan 2017 18:05:13 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170111180514.7BB393A01D7@svn01-us-west.apache.org> archived-at: Wed, 11 Jan 2017 18:05:17 -0000 Author: jim Date: Wed Jan 11 18:05:13 2017 New Revision: 1778331 URL: http://svn.apache.org/viewvc?rev=1778331&view=rev Log: name changes re: suggestion Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=1778331&r1=1778330&r2=1778331&view=diff ============================================================================== --- httpd/httpd/trunk/modules/core/mod_watchdog.c (original) +++ httpd/httpd/trunk/modules/core/mod_watchdog.c Wed Jan 11 18:05:13 2017 @@ -436,19 +436,19 @@ static int wd_post_config_hook(apr_pool_ { apr_status_t rv; const char *pk = "watchdog_init_module_tag"; - apr_pool_t *pproc = pconf; + apr_pool_t *ppconf = pconf; const apr_array_header_t *wl; if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) /* First time config phase -- skip. */ return OK; - apr_pool_userdata_get((void *)&wd_server_conf, pk, pproc); + apr_pool_userdata_get((void *)&wd_server_conf, pk, ppconf); if (!wd_server_conf) { - if (!(wd_server_conf = apr_pcalloc(pproc, sizeof(wd_server_conf_t)))) + if (!(wd_server_conf = apr_pcalloc(ppconf, sizeof(wd_server_conf_t)))) return APR_ENOMEM; - apr_pool_create(&wd_server_conf->pool, pproc); - apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, pproc); + apr_pool_create(&wd_server_conf->pool, ppconf); + apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, ppconf); } wd_server_conf->s = s; if ((wl = ap_list_provider_names(pconf, AP_WATCHDOG_PGROUP,