projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix year
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
5eaf105
..
ea4147c
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.
2.99907080300 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.
3rc3 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
@@
-47,7
+47,7
@@
void PrintUsage(
const char *help_main =
N_("RRDtool %s"
const char *help_main =
N_("RRDtool %s"
- " Copyright 1997-200
7
by Tobias Oetiker <tobi@oetiker.ch>\n"
+ " Copyright 1997-200
8
by Tobias Oetiker <tobi@oetiker.ch>\n"
" Compiled %s %s\n\n"
"Usage: rrdtool [options] command command_options\n\n");
" Compiled %s %s\n\n"
"Usage: rrdtool [options] command command_options\n\n");
@@
-387,7
+387,8
@@
int main(
#ifdef HAVE_LOCALE_H
setlocale(LC_ALL, "");
#endif
#ifdef HAVE_LOCALE_H
setlocale(LC_ALL, "");
#endif
-#ifdef HAVE_LIBINTL_H
+
+#if defined(HAVE_LIBINTL_H) && defined(BUILD_LIBINTL)
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
textdomain(GETTEXT_PACKAGE);
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
textdomain(GETTEXT_PACKAGE);
@@
-803,8
+804,8
@@
int HandleInputLine(
} else if (strcmp("graphv", argv[1]) == 0) {
info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */
} else if (strcmp("graphv", argv[1]) == 0) {
info_t *grinfo = NULL; /* 1 to distinguish it from the NULL that rrd_graph sends in */
-
- if (grinfo
= rrd_graph_v(argc - 1, &argv[1])
) {
+ grinfo = rrd_graph_v(argc - 1, &argv[1]);
+ if (grinfo) {
info_print(grinfo);
info_free(grinfo);
}
info_print(grinfo);
info_free(grinfo);
}