summaryrefslogtreecommitdiff
path: root/src/helpers/MiscFunctions.cpp
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-07-25 22:40:34 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-07-25 22:40:34 +0200
commitb0d91cbf3afd72dc320a8f5386b2fe3f3fe0ae68 (patch)
treef583c9247dce6136ec7e75003337041e53a32801 /src/helpers/MiscFunctions.cpp
parentdb899e00e7e5a5d92bc863f831dd8fe90d55bd57 (diff)
simplify formats
Diffstat (limited to 'src/helpers/MiscFunctions.cpp')
-rw-r--r--src/helpers/MiscFunctions.cpp22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
index 3fc6d20e..b7285637 100644
--- a/src/helpers/MiscFunctions.cpp
+++ b/src/helpers/MiscFunctions.cpp
@@ -83,32 +83,14 @@ void wlr_signal_emit_safe(struct wl_signal *signal, void *data) {
}
std::string getFormat(const char *fmt, ...) {
- char buf[LOGMESSAGESIZE] = "";
- char* outputStr;
- int logLen;
+ char* outputStr = nullptr;
va_list args;
va_start(args, fmt);
- logLen = vsnprintf(buf, sizeof buf, fmt, args);
+ vasprintf(&outputStr, fmt, args);
va_end(args);
- if ((long unsigned int)logLen < sizeof buf) {
- outputStr = strdup(buf);
- } else {
- outputStr = (char*)malloc(logLen + 1);
-
- if (!outputStr) {
- printf("CRITICAL: Cannot alloc size %d for log! (Out of memory?)", logLen + 1);
- return "";
- }
-
- va_start(args, fmt);
- vsnprintf(outputStr, logLen + 1U, fmt, args);
- va_end(args);
- }
-
std::string output = std::string(outputStr);
-
free(outputStr);
return output;