load bpph from cache and merge it the http request result

[ppastats.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4f3a227..7bd87fc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -27,6 +27,7 @@
 
 #include "cache.h"
 #include "html.h"
+#include "http.h"
 #include "log.h"
 #include "lp_ws.h"
 #include "config.h"
@@ -99,43 +100,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);
@@ -207,7 +205,7 @@ int main(int argc, char **argv)
        /* for valgrind.... */
        free(package_status);
        free(output_dir);
-       lp_ws_cleanup();
+       http_cleanup();
        cache_cleanup();
 
        exit(EXIT_SUCCESS);