Add log.c with info() and warn()

This commit is contained in:
Johan Malm 2020-08-12 19:37:44 +01:00
parent 5ea1527558
commit 2a17df0f8b
11 changed files with 68 additions and 17 deletions

View file

@ -11,6 +11,7 @@
#include <glib.h>
#include "common/dir.h"
#include "common/log.h"
struct dir {
const char *prefix;
@ -84,7 +85,7 @@ char *find_dir(struct ctx *ctx)
/* handle /etc/xdg... */
ctx->build_path_fn(ctx, NULL, d.path);
if (debug)
fprintf(stderr, "DEBUG: %s\n", ctx->buf);
info("%s", ctx->buf);
if (isdir(ctx->buf))
return ctx->buf;
} else {
@ -96,8 +97,7 @@ char *find_dir(struct ctx *ctx)
for (gchar **p = prefixes; *p; p++) {
ctx->build_path_fn(ctx, *p, d.path);
if (debug)
fprintf(stderr, "DEBUG: %s\n",
ctx->buf);
info("%s", ctx->buf);
if (isdir(ctx->buf))
return ctx->buf;
}

32
src/common/log.c Normal file
View file

@ -0,0 +1,32 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#define LABWC_COLOR_YELLOW "\033[0;33m"
#define LABWC_COLOR_RED "\033[0;31m"
#define LABWC_COLOR_RESET "\033[0m"
void info(const char *msg, ...)
{
va_list params;
fprintf(stderr, LABWC_COLOR_YELLOW);
fprintf(stderr, "[labwc] info: ");
va_start(params, msg);
vfprintf(stderr, msg, params);
va_end(params);
fprintf(stderr, LABWC_COLOR_RESET);
fprintf(stderr, "\n");
}
void warn(const char *err, ...)
{
va_list params;
fprintf(stderr, LABWC_COLOR_RED);
fprintf(stderr, "[labwc] warning: ");
va_start(params, err);
vfprintf(stderr, err, params);
va_end(params);
fprintf(stderr, LABWC_COLOR_RESET);
fprintf(stderr, "\n");
}

View file

@ -3,5 +3,6 @@ labwc_sources += files(
'dir.c',
'font.c',
'grab-file.c',
'log.c',
'spawn.c',
)