From 589986012c4b3ab68e299a2eadca18f90080113b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 14 Jul 2022 20:28:04 +0200
Subject: Merging upstream version 2.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 util/log.c | 90 --------------------------------------------------------------
 1 file changed, 90 deletions(-)
 delete mode 100644 util/log.c

(limited to 'util/log.c')

diff --git a/util/log.c b/util/log.c
deleted file mode 100644
index 4a22354..0000000
--- a/util/log.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2021 SUSE LLC
- *
- * 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 published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * This file implements basic logging functionality.
- */
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <time.h>
-#define LOG_FUNCNAME 1
-#include "log.h"
-#include "cleanup.h"
-
-#ifndef LOG_CLOCK
-#define LOG_CLOCK CLOCK_MONOTONIC
-#endif
-
-int log_level = DEFAULT_LOGLEVEL;
-bool log_timestamp;
-bool log_pid;
-
-void __attribute__((format(printf, 3, 4)))
-__msg(int lvl, const char *func, const char *format, ...)
-{
-	va_list ap;
-	char pidbuf[16];
-	char timebuf[32];
-	static const char *const formats[] = {
-		"%s%s%s",
-		"%s%s%s: ",
-		"%s<%s>%s ",
-		"%s<%s> %s: ",
-		"[%s] %s%s ",
-		"[%s]%s %s: ",
-		"[%s] <%s>%s ",
-		"[%s] <%s> %s: ",
-	};
-	char *header __cleanup__(cleanup_charp) = NULL;
-	char *message __cleanup__(cleanup_charp) = NULL;
-	int idx;
-
-	if (lvl > log_level)
-		return;
-
-	if (log_timestamp) {
-		struct timespec now;
-
-		clock_gettime(LOG_CLOCK, &now);
-		snprintf(timebuf, sizeof(timebuf), "%6ld.%06ld",
-			 (long)now.tv_sec, now.tv_nsec / 1000);
-	} else
-		*timebuf = '\0';
-
-	if (log_pid)
-		snprintf(pidbuf, sizeof(pidbuf), "%ld", (long)getpid());
-	else
-		*pidbuf = '\0';
-
-	idx = ((log_timestamp ? 1 : 0) << 2) |
-		((log_pid ? 1 : 0) << 1) | (func ? 1 : 0);
-
-	if (asprintf(&header, formats[idx], timebuf, pidbuf, func ? func : "")
-	    == -1)
-		header = NULL;
-
-	va_start(ap, format);
-	if (vasprintf(&message, format, ap) == -1)
-		message = NULL;
-	va_end(ap);
-
-	fprintf(stderr, "%s%s", header ? header : "<error>",
-		message ? message : "<error>");
-
-}
-- 
cgit v1.2.3