X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=ef215eb026cd379f25b9fc6baef2a452d193b93c;hb=03afbf21a42fd2ee8d5d54e21fa9e948c3d6e883;hp=9bc93a04b3e74eac6df885391768316132111dae;hpb=b14028b6b42d8b27b958591bf203e93efd5db166;p=ppastats.git

diff --git a/src/main.c b/src/main.c
index 9bc93a0..ef215eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,11 +27,11 @@
 
 #include "cache.h"
 #include "html.h"
+#include "log.h"
 #include "lp_ws.h"
 #include "config.h"
 #include "ppastats.h"
 
-int debug;
 static const char *program_name;
 
 static void display_published_binaries(const char *owner,
@@ -99,43 +99,40 @@ static struct option long_options[] = {
 static void print_version()
 {
 	printf("ppastats %s\n", VERSION);
-	printf(_("Copyright (C) %s jeanfi@gmail.com\n\
-License GPLv2: GNU GPL version 2 or later \
-<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n\
-This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"),
-		 "2011-2012");
+	printf(_("Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later\n"
+"<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"),
+	       "2011-2012");
 }
 
 static void print_help()
 {
 	printf(_("Usage: %s [OPTION]... PPA_OWNER PPA_NAME\n"), program_name);
 
-	puts(_("ppastats is a command application"
-	       " for generating PPA statistics.\n"));
-
-	puts(_("Prints number of downloads for each published packages of a "
-	       "PPA or generates an HTML page containing a graph "
-	       "representation."));
+	puts(_(
+"ppastats is a command application for generating PPA statistics.\n"));
+	puts(_(
+"Prints number of downloads for each published packages of a PPA or generates\n"
+"an HTML page containing a graph representation."));
 
 	puts("");
 	puts(_("Options:"));
-	puts(_("\
-  -h, --help          display this help and exit\n\
-  -v, --version       display version information and exit"));
+	puts(_("  -h, --help          display this help and exit"));
+	puts(_("  -v, --version       display version information and exit"));
 
 	puts("");
 
-	puts(_("\
-  -o, --output-dir=[PATH]       generates HTML pages into 'PATH'."));
+	puts(_("  -o, --output-dir=[PATH]  generates HTML pages into 'PATH'"));
 
-	puts(_("\
-  -s, --status=[STATUS]		retrieves only package of the given status\n\
-				(possible values are: Pending, Published, \n\
-				Superseded, Deleted or Obsolete)."));
+	puts(_(
+"  -s, --status=[STATUS]    retrieves only package of the given status\n"
+"                           (possible values are: Pending, Published,\n"
+"                           Superseded, Deleted or Obsolete)"));
 
-	puts(_("\
-  -S, --skip-js-css		skip installation of js and css files"));
+	puts(_(
+" -S, --skip-js-css         skip installation of js and css files"));
 	puts("");
 
 	printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT);
@@ -145,13 +142,8 @@ static void print_help()
 
 int main(int argc, char **argv)
 {
-	char *owner, *ppa;
-	int optc;
-	int output_html = 0;
-	char *package_status = NULL;
-	int cmdok = 1;
-	char *output_dir = NULL;
-	int install_static_files = 1;
+	char *owner, *ppa, *package_status, *output_dir;
+	int optc, output_html, cmdok, install_static_files;
 
 	program_name = argv[0];
 
@@ -159,6 +151,12 @@ int main(int argc, char **argv)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
+	cmdok = 1;
+	install_static_files = 1;
+	output_dir = NULL;
+	package_status = NULL;
+	output_html = 0;
+
 	while ((optc = getopt_long(argc, argv, "vho:ds:S", long_options,
 				   NULL)) != -1) {
 		switch (optc) {
@@ -167,7 +165,7 @@ int main(int argc, char **argv)
 			output_dir = strdup(optarg);
 			break;
 		case 'd':
-			debug = 1;
+			log_level = LOG_DEBUG;
 			break;
 		case 'h':
 			print_help();