From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 27 Feb 2003 14:27:56 +0000 (+0000)
Subject: eliminate not from fnmatch
X-Git-Tag: Release-1.30~111
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e19d7c3639fee8727d27a53c7c6fbeb755a9d5d7;p=bacula%2Fbacula

eliminate not from fnmatch


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@356 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/lib/fnmatch.c b/bacula/src/lib/fnmatch.c
index 844add3318..71dd0e1dd5 100644
--- a/bacula/src/lib/fnmatch.c
+++ b/bacula/src/lib/fnmatch.c
@@ -132,7 +132,7 @@ fnmatch (const char *pattern, const char *string, int flags)
         case '[':
 	  {
 	    /* Nonzero if the sense of the character class is inverted.  */
-	    register int not;
+	    register int nnot;
 
             if (*n == '\0')
 	      return FNM_NOMATCH;
@@ -141,8 +141,8 @@ fnmatch (const char *pattern, const char *string, int flags)
                 (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
 	      return FNM_NOMATCH;
 
-            not = (*p == '!' || *p == '^');
-	    if (not)
+            nnot = (*p == '!' || *p == '^');
+	    if (nnot)
 	      ++p;
 
 	    c = *p++;
@@ -188,7 +188,7 @@ fnmatch (const char *pattern, const char *string, int flags)
                 if (c == ']')
 		  break;
 	      }
-	    if (!not)
+	    if (!nnot)
 	      return FNM_NOMATCH;
 	    break;
 
@@ -209,7 +209,7 @@ fnmatch (const char *pattern, const char *string, int flags)
 		    ++p;
 		  }
 	      }
-	    if (not)
+	    if (nnot)
 	      return FNM_NOMATCH;
 	  }
 	  break;
diff --git a/bacula/src/stored/bls.c b/bacula/src/stored/bls.c
index 774417c087..dfbd6fed5c 100644
--- a/bacula/src/stored/bls.c
+++ b/bacula/src/stored/bls.c
@@ -167,7 +167,7 @@ int main (int argc, char *argv[])
    argv += optind;
 
    if (!argc) {
-      Pmsg0(0, "No archive name specified\n");
+      Pmsg0(0, _("No archive name specified\n"));
       usage();
    }