Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2A6A41069A for ; Sat, 1 Feb 2014 08:26:58 +0000 (UTC) Received: (qmail 55055 invoked by uid 500); 1 Feb 2014 08:26:57 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 54844 invoked by uid 500); 1 Feb 2014 08:26:55 -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 54837 invoked by uid 99); 1 Feb 2014 08:26:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Feb 2014 08:26:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Feb 2014 08:26:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CCECC23889E2; Sat, 1 Feb 2014 08:26:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1563381 - in /httpd/httpd/trunk: modules/cache/cache_storage.c server/util.c Date: Sat, 01 Feb 2014 08:26:33 -0000 To: cvs@httpd.apache.org From: jailletc36@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140201082633.CCECC23889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jailletc36 Date: Sat Feb 1 08:26:33 2014 New Revision: 1563381 URL: http://svn.apache.org/r1563381 Log: s/apr_pstrndup/apr_pstrmemdup/ when applicable Modified: httpd/httpd/trunk/modules/cache/cache_storage.c httpd/httpd/trunk/server/util.c Modified: httpd/httpd/trunk/modules/cache/cache_storage.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_storage.c?rev=1563381&r1=1563380&r2=1563381&view=diff ============================================================================== --- httpd/httpd/trunk/modules/cache/cache_storage.c (original) +++ httpd/httpd/trunk/modules/cache/cache_storage.c Sat Feb 1 08:26:33 2014 @@ -582,7 +582,7 @@ static apr_status_t cache_canonicalise_k && !strncmp(param + 1, *identifier, len) && (*(param + len + 1) == '=') && !ap_strchr_c(param + len + 2, '/')) { - path = apr_pstrndup(p, path, param - path); + path = apr_pstrmemdup(p, path, param - path); continue; } /* Modified: httpd/httpd/trunk/server/util.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util.c?rev=1563381&r1=1563380&r2=1563381&view=diff ============================================================================== --- httpd/httpd/trunk/server/util.c (original) +++ httpd/httpd/trunk/server/util.c Sat Feb 1 08:26:33 2014 @@ -116,7 +116,7 @@ AP_DECLARE(char *) ap_field_noparam(apr_ while ((semi > intype) && apr_isspace(semi[-1])) { semi--; } - return apr_pstrndup(p, intype, semi - intype); + return apr_pstrmemdup(p, intype, semi - intype); } } @@ -737,7 +737,7 @@ AP_DECLARE(char *) ap_getword_nulls(apr_ return res; } - res = apr_pstrndup(atrans, *line, pos - *line); + res = apr_pstrmemdup(atrans, *line, pos - *line); ++pos; @@ -1464,7 +1464,6 @@ AP_DECLARE(char *) ap_get_token(apr_pool const char *ptr = *accept_line; const char *tok_start; char *token; - int tok_len; /* Find first non-white byte */ @@ -1485,8 +1484,7 @@ AP_DECLARE(char *) ap_get_token(apr_pool break; } - tok_len = ptr - tok_start; - token = apr_pstrndup(p, tok_start, tok_len); + token = apr_pstrmemdup(p, tok_start, ptr - tok_start); /* Advance accept_line pointer to the next non-white byte */