[prev in list] [next in list] [prev in thread] [next in thread] 

List:       proftpd-committers
Subject:    [ProFTPD-committers] CVS: proftpd/modules mod_core.c,1.274,1.275
From:       TJ Saunders <castaglia () users ! sourceforge ! net>
Date:       2005-09-21 17:40:37
Message-ID: E1EI8aD-00029g-To () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/proftp/proftpd/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8198/modules

Modified Files:
	mod_core.c 
Log Message:

Clean up the debug logging done when handling config directive regexes.
No need to report on the memory location for the allocated regex.


Index: mod_core.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/modules/mod_core.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- mod_core.c	23 Aug 2005 16:50:26 -0000	1.274
+++ mod_core.c	21 Sep 2005 17:40:35 -0000	1.275
@@ -1640,11 +1640,12 @@
   CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL|CONF_ANON|CONF_DIR|
     CONF_DYNDIR);
 
-  pr_log_debug(DEBUG4, "Compiling %s regex '%s'.", type, cmd->argv[1]);
+  pr_log_debug(DEBUG4, "%s: compiling %s regex '%s'", cmd->argv[0], type,
+    cmd->argv[1]);
   preg = pr_regexp_alloc();
-  pr_log_debug(DEBUG4, "Allocated %s regex at location %p.", type, preg);
 
-  if ((res = regcomp(preg, cmd->argv[1], REG_EXTENDED|REG_NOSUB)) != 0) {
+  res = regcomp(preg, cmd->argv[1], REG_EXTENDED|REG_NOSUB);
+  if (res != 0) {
     char errstr[200] = {'\0'};
 
     regerror(res, preg, errstr, sizeof(errstr));



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]