Changeset cbc8657

Timestamp:

Jul 23, 2011, 9:23:57 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

39adf06, 3234121

Parents:

287c634

git-author:

David Benjamin <davidben@mit.edu> (07/23/11 19:05:47)

git-committer:

David Benjamin <davidben@mit.edu> (07/23/11 21:23:57)

Message:

Don't hardcode regerror buffer size

This lets us kill the silly LINE macro. regerror can be called first to
get the length, and then the data.

Files:

• owl.h (modified) (1 diff)
• regex.c (modified) (2 diffs)

owl.h

@@ -205 +205 @@
 #define OWL_META(key) ((key)|010000)
 /* OWL_CTRL is definied in kepress.c */
-
-#define LINE 2048
 
 #ifdef HAVE_LIBZEPHYR

regex.c

@@ -11 +11 @@
 {
   int ret;
-  char buff1[LINE];
+  size_t errbuf_size;
+  char *errbuf;
   const char *ptr;
   
@@ -26 +27 @@
   ret=regcomp(&(re->re), ptr, REG_EXTENDED|REG_ICASE);
   if (ret) {
-    regerror(ret, NULL, buff1, LINE);
-    owl_function_makemsg("Error in regular expression: %s", buff1);
+    errbuf_size = regerror(ret, NULL, NULL, 0);
+    errbuf = g_new(char, errbuf_size);
+    regerror(ret, NULL, errbuf, errbuf_size);
+    owl_function_error("Error in regular expression: %s", errbuf);
+    g_free(errbuf);
     g_free(re->string);
     re->string=NULL;