X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fmatch.c;h=f9ce31ded98bf71d8e8f78bc72b60636fe62957c;hb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;hp=5ddc1da290f6f886d5e744a4c9d589870e89d013;hpb=12179dea039515c06168c0037d048566a3f623de;p=debian%2Famanda

diff --git a/common-src/match.c b/common-src/match.c
index 5ddc1da..f9ce31d 100644
--- a/common-src/match.c
+++ b/common-src/match.c
@@ -30,7 +30,7 @@
  */
 
 #include "amanda.h"
-#include "regex.h"
+#include <regex.h>
 
 static int match_word(const char *glob, const char *word, const char separator);
 
@@ -83,14 +83,14 @@ match(
     if((result = regcomp(&regc, regex,
 			 REG_EXTENDED|REG_NOSUB|REG_NEWLINE)) != 0) {
         regerror(result, &regc, errmsg, SIZEOF(errmsg));
-	error("regex \"%s\": %s", regex, errmsg);
+	error(_("regex \"%s\": %s"), regex, errmsg);
 	/*NOTREACHED*/
     }
 
     if((result = regexec(&regc, str, 0, 0, 0)) != 0
        && result != REG_NOMATCH) {
         regerror(result, &regc, errmsg, SIZEOF(errmsg));
-	error("regex \"%s\": %s", regex, errmsg);
+	error(_("regex \"%s\": %s"), regex, errmsg);
 	/*NOTREACHED*/
     }
 
@@ -136,14 +136,14 @@ match_glob(
     if((result = regcomp(&regc, regex,
 			 REG_EXTENDED|REG_NOSUB|REG_NEWLINE)) != 0) {
         regerror(result, &regc, errmsg, SIZEOF(errmsg));
-	error("glob \"%s\" -> regex \"%s\": %s", glob, regex, errmsg);
+	error(_("glob \"%s\" -> regex \"%s\": %s"), glob, regex, errmsg);
 	/*NOTREACHED*/
     }
 
     if((result = regexec(&regc, str, 0, 0, 0)) != 0
        && result != REG_NOMATCH) {
         regerror(result, &regc, errmsg, SIZEOF(errmsg));
-	error("glob \"%s\" -> regex \"%s\": %s", glob, regex, errmsg);
+	error(_("glob \"%s\" -> regex \"%s\": %s"), glob, regex, errmsg);
 	/*NOTREACHED*/
     }
 
@@ -244,14 +244,14 @@ match_tar(
     if((result = regcomp(&regc, regex,
 			 REG_EXTENDED|REG_NOSUB|REG_NEWLINE)) != 0) {
         regerror(result, &regc, errmsg, SIZEOF(errmsg));
-	error("glob \"%s\" -> regex \"%s\": %s", glob, regex, errmsg);
+	error(_("glob \"%s\" -> regex \"%s\": %s"), glob, regex, errmsg);
 	/*NOTREACHED*/
     }
 
     if((result = regexec(&regc, str, 0, 0, 0)) != 0
        && result != REG_NOMATCH) {
         regerror(result, &regc, errmsg, SIZEOF(errmsg));
-	error("glob \"%s\" -> regex \"%s\": %s", glob, regex, errmsg);
+	error(_("glob \"%s\" -> regex \"%s\": %s"), glob, regex, errmsg);
 	/*NOTREACHED*/
     }
 
@@ -543,7 +543,7 @@ match_datestamp(
     int match_exact;
 
     if(strlen(dateexp) >= 100 || strlen(dateexp) < 1) {
-	error("Illegal datestamp expression %s",dateexp);
+	error(_("Illegal datestamp expression %s"),dateexp);
 	/*NOTREACHED*/
     }
    
@@ -565,7 +565,7 @@ match_datestamp(
 
     if((dash = strchr(mydateexp,'-'))) {
 	if(match_exact == 1) {
-	    error("Illegal datestamp expression %s",dateexp);
+	    error(_("Illegal datestamp expression %s"),dateexp);
 	    /*NOTREACHED*/
 	}
 	len = (size_t)(dash - mydateexp);
@@ -605,7 +605,7 @@ match_level(
     int match_exact;
 
     if(strlen(levelexp) >= 100 || strlen(levelexp) < 1) {
-	error("Illegal level expression %s",levelexp);
+	error(_("Illegal level expression %s"),levelexp);
 	/*NOTREACHED*/
     }
    
@@ -627,7 +627,7 @@ match_level(
 
     if((dash = strchr(mylevelexp,'-'))) {
 	if(match_exact == 1) {
-	    error("Illegal level expression %s",levelexp);
+	    error(_("Illegal level expression %s"),levelexp);
 	    /*NOTREACHED*/
 	}
 	len = (size_t)(dash - mylevelexp);