oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

test/*: use fprintf(stderr,...) and Log() instead of g_printerr()

Browse Source 
Avoid GLib.
This commit is contained in:
Max Kellermann
2013-12-15 17:12:43 +01:00
parent d5dfe7d457
commit 66d90dd412
6 changed files with 63 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/read_conf.cxx
View File

@@ -21,40 +21,26 @@
#include "ConfigGlobal.hxx"
#include "fs/Path.hxx"
#include "util/Error.hxx"
#include <glib.h>
#include "Log.hxx"
#include <assert.h>
static void
my_log_func(gcc_unused const gchar *log_domain,
GLogLevelFlags log_level,
const gchar *message, gcc_unused gpointer user_data)
{
if (log_level > G_LOG_LEVEL_WARNING)
return;
g_printerr("%s\n", message);
}
int main(int argc, char **argv)
{
if (argc != 3) {
g_printerr("Usage: read_conf FILE SETTING\n");
return 1;
fprintf(stderr, "Usage: read_conf FILE SETTING\n");
return EXIT_FAILURE;
}
const Path config_path = Path::FromFS(argv[1]);
const char *name = argv[2];
g_log_set_default_handler(my_log_func, NULL);
config_global_init();
Error error;
if (!ReadConfigFile(config_path, error)) {
g_printerr("%s:", error.GetMessage());
return 1;
LogError(error);
return EXIT_FAILURE;
}
ConfigOption option = ParseConfigOptionName(name);
@@ -63,11 +49,11 @@ int main(int argc, char **argv)
: nullptr;
int ret;
if (value != NULL) {
g_print("%s\n", value);
ret = 0;
printf("%s\n", value);
ret = EXIT_SUCCESS;
} else {
g_printerr("No such setting: %s\n", name);
ret = 2;
fprintf(stderr, "No such setting: %s\n", name);
ret = EXIT_FAILURE;
}
config_global_finish();