xkbcomp: Remove duplicated macros

[platform/upstream/libxkbcommon.git] / src / xkbcomp / xkbpath.c

diff --git a/src/xkbcomp/xkbpath.c b/src/xkbcomp/xkbpath.c
index 3550769..df739a1 100644 (file)
--- a/src/xkbcomp/xkbpath.c
+++ b/src/xkbcomp/xkbpath.c
@@ -217,7 +217,7 @@ XkbAddDirectoryToPath(const char *dir)
     len = strlen(dir);
     if (len + 2 >= PATH_MAX)
     {                           /* allow for '/' and at least one character */
-        ERROR2("Path entry (%s) too long (maxiumum length is %d)\n",
+        ERROR("Path entry (%s) too long (maxiumum length is %d)\n",
                dir, PATH_MAX - 3);
         return False;
     }
@@ -235,7 +235,7 @@ XkbAddDirectoryToPath(const char *dir)
         (char *) calloc(strlen(dir) + 1, sizeof(char));
     if (includePath[nPathEntries] == NULL)
     {
-        WSGO1("Allocation failed (includePath[%d])\n", nPathEntries);
+        WSGO("Allocation failed (includePath[%d])\n", nPathEntries);
         return False;
     }
     strcpy(includePath[nPathEntries++], dir);
@@ -322,7 +322,7 @@ XkbAddFileToCache(char *name, unsigned type, char *path, void *data)
         if ((type == entry->type) && (uStringEqual(name, entry->name)))
         {
             void *old = entry->data;
-            WSGO2("Replacing file cache entry (%s/%d)\n", name, type);
+            WSGO("Replacing file cache entry (%s/%d)\n", name, type);
             entry->path = path;
             entry->data = data;
             return old;
@@ -397,7 +397,7 @@ XkbFindFileInPath(char *name, unsigned type, char **pathRtrn)
 
         if ((nameLen + typeLen + pathLen + 2) >= PATH_MAX)
         {
-            ERROR3("File name (%s/%s/%s) too long\n", includePath[i],
+            ERROR("File name (%s/%s/%s) too long\n", includePath[i],
                    typeDir, name);
             ACTION("Ignored\n");
             continue;