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 844add33184962d139f114ec5de8a092aa6c56b4..71dd0e1dd52ecedc254143722cf6e11636845c22 100644 (file)
--- 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 774417c087e7de6e062a6d14aee5d6b04356622b..dfbd6fed5cf9dff4ea666544ef2ea5698b24cfeb 100644 (file)
--- 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();
    }