X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mysql_selector.c;h=702e08d3478a4f2c4c995ba4bc6dda68210a0b04;hp=07cbfc65878bfc43ca4bb1fb90c4fa3a216b0536;hb=cb6d1dfb9e4067229a4bbde0abd05784d97ef14b;hpb=01965c9b51d8850aa27b23dd098346cf2d29b76f

diff --git a/mysql_selector.c b/mysql_selector.c
index 07cbfc65..702e08d3 100644
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -10,10 +10,13 @@
 #define MEDIUM_BLOB_SIZE 16777220 /*  (2**24 + 4) */
 #define BLOB_SIZE 65539 /* (2**16 + 3) */
 /** \endcond */
+
+#include "para.h"
 #include "server.cmdline.h"
+#include "afh.h"
 #include "server.h"
 #include "vss.h"
-#include "afs.h"
+#include "afs_common.h"
 #include <mysql/mysql.h>
 #include <mysql/mysql_version.h>
 #include <regex.h>
@@ -67,11 +70,11 @@ static const struct para_macro mysql_macro_list[] = {
 };
 
 /**
- * simple search and replace routine
+ * Simple search and replace routine.
  *
- * \param src source string
- * \param macro_name the name of the macro
- * \param replacement the replacement format string
+ * \param src Source String.
+ * \param macro_name The name of the macro.
+ * \param replacement The replacement format string.
  *
  * In \p src, replace each occurence of \p macro_name(arg) by the string
  * determined by the \p replacement format string. \p replacement may (but
@@ -79,7 +82,7 @@ static const struct para_macro mysql_macro_list[] = {
  * replaced by \p arg.
  *
  * \return A string in which all matches in \p src are replaced, or \p NULL if
- * an syntax error was encountered. Caller must free the result.
+ * an error was encountered. Caller must free the result.
  *
  * \sa regcomp(3)
  */
@@ -95,7 +98,8 @@ __must_check __malloc static char *s_a_r(const char *src, const char* macro_name
 
 	if (!macro_name || !replacement || !src)
 		return para_strdup(src);
-	regcomp(&preg, macro_name, 0);
+	if (regcomp(&preg, macro_name, 0) != 0)
+		return NULL;
 	while (regexec(&preg,  bufptr, nmatch, pmatch, eflags)
 			!= REG_NOMATCH) {
 		char *tmp, *arg, *o_bracket, *c_bracket;