summaryrefslogtreecommitdiff
path: root/server/src/macroheaderparser.cc
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/macroheaderparser.cc')
-rw-r--r--server/src/macroheaderparser.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/server/src/macroheaderparser.cc b/server/src/macroheaderparser.cc
index 48ed381..0ad18d4 100644
--- a/server/src/macroheaderparser.cc
+++ b/server/src/macroheaderparser.cc
@@ -50,12 +50,12 @@
void MacroHeaderParser::error(const char* fmt, ...)
{
- PRACRO_ERR_LOG(macro, "Error in MacroHeaderParser: ");
+ ERR_LOG(macro, "Error in MacroHeaderParser: ");
{
va_list argp;
va_start(argp, fmt);
- PRACRO_ERR_LOG_VA(macro, fmt, argp);
+ ERR_LOG_VA(macro, fmt, argp);
va_end(argp);
fprintf(stderr, "\n");
@@ -80,7 +80,7 @@ MacroHeaderParser::MacroHeaderParser(std::string macrofile)
file = macrofile;
- PRACRO_DEBUG(macro, "Using macro file: %s\n", macrofile.c_str());
+ DEBUG(macro, "Using macro file: %s\n", macrofile.c_str());
fd = open(macrofile.c_str(), O_RDONLY);
if(fd == -1) error("Could not open file %s", macrofile.c_str());
@@ -110,12 +110,12 @@ int MacroHeaderParser::readData(char *data, size_t size)
// tag, and can dismiss the rest of the document.
if(fd == -1) {
- PRACRO_ERR_LOG(macro, "Invalid file descriptor.\n");
+ ERR_LOG(macro, "Invalid file descriptor.\n");
return 0;
}
ssize_t r = read(fd, data, size);
if(r == -1) {
- PRACRO_ERR_LOG(macro, "Could not read...%s\n", strerror(errno));
+ ERR_LOG(macro, "Could not read...%s\n", strerror(errno));
return 0;
}
return r;
@@ -125,10 +125,11 @@ void MacroHeaderParser::parseError(const char *buf, size_t len, std::string erro
{
if(m) return; // Ignore "unclosed token" errors when the macro tag has been parsed.
- PRACRO_ERR_LOG(macro, "MacroHeaderParser[%s] error at line %d: %s\n", file.c_str(), lineno, error.c_str());
- PRACRO_ERR_LOG(macro, "\tBuffer %u bytes: [", len);
+ ERR_LOG(macro, "MacroHeaderParser[%s] error at line %d: %s\n",
+ file.c_str(), lineno, error.c_str());
+ ERR_LOG(macro, "\tBuffer %u bytes: [", len);
if(fwrite(buf, len, 1, stderr) != len) {}
- PRACRO_ERR_LOG(macro, "]\n");
+ ERR_LOG(macro, "]\n");
char *slineno;
if(asprintf(&slineno, " at line %d\n", lineno) != -1) {