Memory management for hands-off reader

[disorder] / lib / regsub.c

diff --git a/lib/regsub.c b/lib/regsub.c
index bad6034560eb4669ab3438a35fca3052354aee0e..1b7cad47813e217dc07f44ddc2744c114b7472fa 100644 (file)
--- a/lib/regsub.c
+++ b/lib/regsub.c
@@ -1,27 +1,25 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 20008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+/** @file lib/regsub.c
+ * @brief Regexp substitution
+ */
+#include "common.h"
 
-#include <config.h>
-#include "types.h"
-
-#include <string.h>
 #include <pcre.h>
 
 #include "regsub.h"
@@ -145,7 +143,7 @@ const char *regsub(const pcre *re, const char *subject, const char *replace,
       break;
   }
   if(rc <= 0 && rc != PCRE_ERROR_NOMATCH) {
-    error(0, "pcre_exec returned %d, subject '%s'", rc, subject);
+    disorder_error(0, "pcre_exec returned %d, subject '%s'", rc, subject);
     return 0;
   }
   if((flags & REGSUB_MUST_MATCH) && matches == 0)
@@ -163,4 +161,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:69b3b3dafcbaa25619a77a33c44ad699 */