[nginx] svn commit: r4432 - in branches/stable-1.0: . src/core

mdounin at mdounin.ru mdounin at mdounin.ru
Sat Feb 4 23:28:10 UTC 2012


Author: mdounin
Date: 2012-02-04 23:28:10 +0000 (Sat, 04 Feb 2012)
New Revision: 4432

Log:
Merge of r4327:

Removed unused function ngx_regex_capture_count().  The function has
been unused since r3326 (0.8.25).


Modified:
   branches/stable-1.0/
   branches/stable-1.0/src/core/ngx_regex.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326,4342-4343
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4342-4343

Modified: branches/stable-1.0/src/core/ngx_regex.c
===================================================================
--- branches/stable-1.0/src/core/ngx_regex.c	2012-02-04 23:18:12 UTC (rev 4431)
+++ branches/stable-1.0/src/core/ngx_regex.c	2012-02-04 23:28:10 UTC (rev 4432)
@@ -137,23 +137,6 @@
 
 
 ngx_int_t
-ngx_regex_capture_count(ngx_regex_t *re)
-{
-    int  rc, n;
-
-    n = 0;
-
-    rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
-
-    if (rc < 0) {
-        return (ngx_int_t) rc;
-    }
-
-    return (ngx_int_t) n;
-}
-
-
-ngx_int_t
 ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log)
 {
     ngx_int_t         n;



More information about the nginx-devel mailing list