aboutsummaryrefslogtreecommitdiff
path: root/daemon/DynBuf.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'daemon/DynBuf.cpp')
-rw-r--r--daemon/DynBuf.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/daemon/DynBuf.cpp b/daemon/DynBuf.cpp
index df20713..690cbcb 100644
--- a/daemon/DynBuf.cpp
+++ b/daemon/DynBuf.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) ARM Limited 2013-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2013-2015. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -42,7 +42,7 @@ bool DynBuf::read(const char *const path) {
const int fd = open(path, O_RDONLY | O_CLOEXEC);
if (fd < 0) {
- logg->logMessage("%s(%s:%i): open failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("open failed");
return false;
}
@@ -52,14 +52,14 @@ bool DynBuf::read(const char *const path) {
const size_t minCapacity = length + MIN_BUFFER_FREE + 1;
if (capacity < minCapacity) {
if (resize(minCapacity) != 0) {
- logg->logMessage("%s(%s:%i): DynBuf::resize failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("DynBuf::resize failed");
goto fail;
}
}
const ssize_t bytes = ::read(fd, buf + length, capacity - length - 1);
if (bytes < 0) {
- logg->logMessage("%s(%s:%i): read failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("read failed");
goto fail;
} else if (bytes == 0) {
break;
@@ -105,7 +105,7 @@ bool DynBuf::printf(const char *format, ...) {
if (capacity <= 0) {
if (resize(2 * MIN_BUFFER_FREE) != 0) {
- logg->logMessage("%s(%s:%i): DynBuf::resize failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("DynBuf::resize failed");
return false;
}
}
@@ -114,13 +114,13 @@ bool DynBuf::printf(const char *format, ...) {
int bytes = vsnprintf(buf, capacity, format, ap);
va_end(ap);
if (bytes < 0) {
- logg->logMessage("%s(%s:%i): fsnprintf failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("fsnprintf failed");
return false;
}
if (static_cast<size_t>(bytes) > capacity) {
if (resize(bytes + 1) != 0) {
- logg->logMessage("%s(%s:%i): DynBuf::resize failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("DynBuf::resize failed");
return false;
}
@@ -128,7 +128,7 @@ bool DynBuf::printf(const char *format, ...) {
bytes = vsnprintf(buf, capacity, format, ap);
va_end(ap);
if (bytes < 0) {
- logg->logMessage("%s(%s:%i): fsnprintf failed", __FUNCTION__, __FILE__, __LINE__);
+ logg->logMessage("fsnprintf failed");
return false;
}
}