projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use g_info and g_debug properly.
[lttv.git]
/
ltt
/
branches
/
poly
/
lttv
/
main
/
option.c
diff --git
a/ltt/branches/poly/lttv/main/option.c
b/ltt/branches/poly/lttv/main/option.c
index c6de05413ebe9b2d860b1f63a0fcf68e417ac54b..7c80b7f65541215da8d9482c58057f6ed4fd425c 100644
(file)
--- a/
ltt/branches/poly/lttv/main/option.c
+++ b/
ltt/branches/poly/lttv/main/option.c
@@
-21,9
+21,6
@@
#include <glib.h>
#include <lttv/option.h>
#include <glib.h>
#include <lttv/option.h>
-#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
-
typedef struct _LttvOption {
char *long_name;
char char_name;
typedef struct _LttvOption {
char *long_name;
char char_name;
@@
-57,7
+54,7
@@
free_option(LttvOption *option)
void lttv_option_init(int argc, char **argv)
{
void lttv_option_init(int argc, char **argv)
{
- g_
info(
"Init option.c");
+ g_
log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
"Init option.c");
options = g_hash_table_new(g_str_hash, g_str_equal);
}
options = g_hash_table_new(g_str_hash, g_str_equal);
}
@@
-70,7
+67,7
@@
void lttv_option_destroy()
int i;
int i;
- g_
info(
"Destroy option.c");
+ g_
log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
"Destroy option.c");
g_hash_table_foreach(options, list_options, list);
g_hash_table_destroy(options);
g_hash_table_foreach(options, list_options, list);
g_hash_table_destroy(options);
@@
-88,7
+85,7
@@
void lttv_option_add(const char *long_name, const char char_name,
{
LttvOption *option;
{
LttvOption *option;
- g_
info(
"Add option %s", long_name);
+ g_
log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
"Add option %s", long_name);
if(g_hash_table_lookup(options, long_name) != NULL) {
g_warning("duplicate option");
return;
if(g_hash_table_lookup(options, long_name) != NULL) {
g_warning("duplicate option");
return;
@@
-112,7
+109,7
@@
lttv_option_remove(const char *long_name)
{
LttvOption *option = g_hash_table_lookup(options, long_name);
{
LttvOption *option = g_hash_table_lookup(options, long_name);
- g_
info(
"Remove option %s", long_name);
+ g_
log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO,
"Remove option %s", long_name);
if(option == NULL) {
g_warning("trying to remove unknown option %s", long_name);
return;
if(option == NULL) {
g_warning("trying to remove unknown option %s", long_name);
return;
@@
-209,17
+206,20
@@
void lttv_option_parse(int argc, char **argv)
if(rc > 0) {
option = (LttvOption *)(list->pdata[rc - 1]);
if(rc > 0) {
option = (LttvOption *)(list->pdata[rc - 1]);
- g_info("Option %s encountered", option->long_name);
+ g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "Option %s encountered",
+ option->long_name);
if(option->hook != NULL) {
if(option->hook != NULL) {
- g_info("Option %s hook called", option->long_name);
+ g_log(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Option %s hook called",
+ option->long_name);
option->hook(option->hook_data);
}
i++;
}
else if(rc == POPT_ERROR_BADOPT && i != first_arg) {
option->hook(option->hook_data);
}
i++;
}
else if(rc == POPT_ERROR_BADOPT && i != first_arg) {
- g_info("Option %s not recognized, rescan options with new additions",
- poptBadOption(c,0));
+ g_log(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
+ "Option %s not recognized, rescan options with new additions",
+ poptBadOption(c,0));
/* Perhaps this option is newly added, restart parsing */
/* Perhaps this option is newly added, restart parsing */
@@
-232,7
+232,8
@@
void lttv_option_parse(int argc, char **argv)
for(i = 0; i < first_arg; i++) {
rc = poptGetNextOpt(c);
option = (LttvOption *)(list->pdata[rc - 1]);
for(i = 0; i < first_arg; i++) {
rc = poptGetNextOpt(c);
option = (LttvOption *)(list->pdata[rc - 1]);
- g_info("Option %s rescanned, skipped", option->long_name);
+ g_log(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Option %s rescanned, skipped",
+ option->long_name);
}
}
}
}
This page took
0.02412 seconds
and
4
git commands to generate.