plugins/tracklength-gstreamer.c: Rewrite to use `GstDiscoverer'.

[disorder] / libtests / t-regsub.c

diff --git a/libtests/t-regsub.c b/libtests/t-regsub.c
index 1497db2da5b732fe842a1b305e928596360f5985..70c156e07bf059de069b2eb6eb64174df21e7ce9 100644 (file)
--- a/libtests/t-regsub.c
+++ b/libtests/t-regsub.c
@@ -2,27 +2,25 @@
  * This file is part of DisOrder.
  * Copyright (C) 2005, 2007, 2008 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/>.
  */
 #include "test.h"
 
 static void test_regsub(void) {
-  pcre *re;
-  const char *errstr;
-  int erroffset;
+  regexp *re;
+  char errstr[RXCERR_LEN];
+  size_t erroffset;
 
   check_integer(regsub_flags(""), 0);
   check_integer(regsub_flags("g"), REGSUB_GLOBAL);
@@ -30,11 +28,11 @@ static void test_regsub(void) {
   check_integer(regsub_flags("gi"), REGSUB_GLOBAL|REGSUB_CASE_INDEPENDENT);
   check_integer(regsub_flags("iiggxx"), REGSUB_GLOBAL|REGSUB_CASE_INDEPENDENT);
   check_integer(regsub_compile_options(0), 0);
-  check_integer(regsub_compile_options(REGSUB_CASE_INDEPENDENT), PCRE_CASELESS);
-  check_integer(regsub_compile_options(REGSUB_GLOBAL|REGSUB_CASE_INDEPENDENT), PCRE_CASELESS);
+  check_integer(regsub_compile_options(REGSUB_CASE_INDEPENDENT), RXF_CASELESS);
+  check_integer(regsub_compile_options(REGSUB_GLOBAL|REGSUB_CASE_INDEPENDENT), RXF_CASELESS);
   check_integer(regsub_compile_options(REGSUB_GLOBAL), 0);
 
-  re = pcre_compile("foo", PCRE_UTF8, &errstr, &erroffset, 0);
+  re = regexp_compile("foo", 0, errstr, sizeof(errstr), &erroffset);
   assert(re != 0);
   check_string(regsub(re, "wibble-foo-foo-bar", "spong", 0),
                "wibble-spong-foo-bar");
@@ -44,7 +42,7 @@ static void test_regsub(void) {
                "wibble-x-x-bar");
   insist(regsub(re, "wibble-x-x-bar", "spong", REGSUB_MUST_MATCH) == 0);
 
-  re = pcre_compile("a+", PCRE_UTF8, &errstr, &erroffset, 0);
+  re = regexp_compile("a+", 0, errstr, sizeof(errstr), &erroffset);
   assert(re != 0);
   check_string(regsub(re, "baaaaa", "spong", 0),
                "bspong");
@@ -52,8 +50,11 @@ static void test_regsub(void) {
                "bspong");
   check_string(regsub(re, "baaaaa", "foo-$&-bar", 0),
                "bfoo-aaaaa-bar");
+  check_string(regsub(re, "baaaaa", "foo-$&-bar$x", 0),
+               "bfoo-aaaaa-bar$x");
 
-  re = pcre_compile("(a+)(b+)", PCRE_UTF8|PCRE_CASELESS, &errstr, &erroffset, 0);
+  re = regexp_compile("(a+)(b+)", RXF_CASELESS,
+                      errstr, sizeof(errstr), &erroffset);
   assert(re != 0);
   check_string(regsub(re, "foo-aaaabbb-bar", "spong", 0),
                "foo-spong-bar");