Commit fa183ce354146d94a9e05402debdcfaf50fdde0f
2009-04-12T12:15:05
xkbcomp: Fix use of removed macros
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c
index 6d3fb8f..2845032 100644
--- a/src/xkbcomp/listing.c
+++ b/src/xkbcomp/listing.c
@@ -278,7 +278,7 @@ AddDirectory(char *head, char *ptrn, char *rest, char *map)
tmp = strchr(tmp, ')');
if ((tmp == NULL) || (tmp[1] != '\0'))
{
- ERROR1("File and map must have the format file(map)\n");
+ ERROR("File and map must have the format file(map)\n");
return 0;
}
*map = '\0';
@@ -386,7 +386,7 @@ AddMatchingFiles(char *head_in)
|| (head
&& ((strchr(head, '(') != NULL) || (strchr(head, ')') != NULL))))
{
- ERROR1("Files/maps to list must have the form file(map)\n");
+ ERROR("Files/maps to list must have the form file(map)\n");
ACTION("Illegal specifier ignored\n");
return 0;
}
@@ -423,14 +423,14 @@ GenerateListing(char *out_name)
if (nFilesListed < 1)
{
- ERROR1("Must specify at least one file or pattern to list\n");
+ ERROR("Must specify at least one file or pattern to list\n");
return 0;
}
if ((!out_name) || ((out_name[0] == '-') && (out_name[1] == '\0')))
outFile = stdout;
else if ((outFile = fopen(out_name, "w")) == NULL)
{
- ERROR1("Cannot open \"%s\" to write keyboard description\n",
+ ERROR("Cannot open \"%s\" to write keyboard description\n",
out_name);
ACTION("Exiting\n");
return 0;
@@ -458,7 +458,7 @@ GenerateListing(char *out_name)
if (stat(list[i].file, &sbuf) < 0)
{
if (oldWarningLevel > 5)
- WARN1("Couldn't open \"%s\"\n", list[i].file);
+ WARN("Couldn't open \"%s\"\n", list[i].file);
continue;
}
if (S_ISDIR(sbuf.st_mode))
@@ -472,7 +472,7 @@ GenerateListing(char *out_name)
if (!inputFile)
{
if (oldWarningLevel > 5)
- WARN1("Couldn't open \"%s\"\n", list[i].file);
+ WARN("Couldn't open \"%s\"\n", list[i].file);
continue;
}
setScanState(list[i].file, 1);