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