From c4b78515d68fce43bf08c2ed0cdc0703713385b1 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 3 Jan 2012 11:56:37 +0200 Subject: [PATCH] Eliminate rpm cli callback internals from the API - rpmcliHashes*, and rpmcliProgress* and rpmcliPackagesTotal are implementation details of rpmShowProgress() and are useless outside of it. Make them static, these shouldn't have been exported to begin with. --- lib/rpmcli.h | 6 ------ lib/rpminstall.c | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/rpmcli.h b/lib/rpmcli.h index 15a4c4c..1e92c50 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h @@ -293,12 +293,6 @@ typedef rpmFlags rpmInstallFlags; #define UNINSTALL_NODEPS INSTALL_NODEPS #define UNINSTALL_ALLMATCHES INSTALL_ALLMATCHES -extern int rpmcliPackagesTotal; -extern int rpmcliHashesCurrent; -extern int rpmcliHashesTotal; -extern int rpmcliProgressCurrent; -extern int rpmcliProgressTotal; - /** \ingroup rpmcli * The rpm CLI generic transaction callback handler. * @todo Remove headerFormat() from the progress callback. diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 6082db0..7573c24 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -17,11 +17,11 @@ #include "lib/manifest.h" #include "debug.h" -int rpmcliPackagesTotal = 0; -int rpmcliHashesCurrent = 0; -int rpmcliHashesTotal = 0; -int rpmcliProgressCurrent = 0; -int rpmcliProgressTotal = 0; +static int rpmcliPackagesTotal = 0; +static int rpmcliHashesCurrent = 0; +static int rpmcliHashesTotal = 0; +static int rpmcliProgressCurrent = 0; +static int rpmcliProgressTotal = 0; /** * Print a CLI progress bar. -- 2.7.4