Merge branch 'master' of ssh://tonvoon@nagiosplug.git.sourceforge.net/gitroot/nagiosp...

[nagiosplug.git] / plugins / check_apt.c

diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 440755d6e28122217c4a98fe5ffb363604463422..7efa596b278bcab9bbe893b76499da4fe9c27dad 100644 (file)
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -7,8 +7,6 @@
 * 
 * Original author: Sean Finney
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_apt plugin
@@ -29,12 +27,9 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
-* 
 *****************************************************************************/
 
 const char *progname = "check_apt";
-const char *revision = "$Revision$";
 const char *copyright = "2006-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -116,7 +111,7 @@ int main (int argc, char **argv) {
                result = max_state(result, STATE_OK);
        }
 
-       printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s\n"), 
+       printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s\n"),
               state_text(result),
               packages_available,
               (upgrade==DIST_UPGRADE)?"dist-upgrade":"upgrade",
@@ -159,7 +154,7 @@ int process_arguments (int argc, char **argv) {
                        print_help();
                        exit(STATE_OK);
                case 'V':
-                       print_revision(progname, revision);
+                       print_revision(progname, NP_VERSION);
                        exit(STATE_OK);
                case 'v':
                        verbose++;
@@ -305,7 +300,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount){
        }
        regfree(&ireg);
        regfree(&sreg);
-       if(do_exclude!=NULL) regfree(&ereg); 
+       if(do_exclude!=NULL) regfree(&ereg);
        free(cmdline);
        return result;
 }
@@ -364,7 +359,7 @@ char* add_to_regexp(char *expr, const char *next){
                sprintf((char*)(re+strlen(re)-2), "|%s) ", next);
        }
 
-       return re;      
+       return re;
 }
 
 char* construct_cmdline(upgrade_type u, const char *opts){
@@ -404,7 +399,7 @@ char* construct_cmdline(upgrade_type u, const char *opts){
 void
 print_help (void)
 {
-  print_revision(progname, revision);
+  print_revision(progname, NP_VERSION);
 
   printf(_(COPYRIGHT), copyright, email);
 
@@ -416,10 +411,10 @@ print_help (void)
 
   print_usage();
 
-  printf(_(UT_HELP_VRSN));
-  printf(_(UT_EXTRA_OPTS));
+  printf(UT_HELP_VRSN);
+  printf(UT_EXTRA_OPTS);
 
-  printf(_(UT_TIMEOUT), timeout_interval);
+  printf(UT_TIMEOUT, timeout_interval);
 
   printf (" %s\n", "-U, --upgrade=OPTS");
   printf ("    %s\n", _("[Default] Perform an upgrade.  If an optional OPTS argument is provided,"));
@@ -458,13 +453,7 @@ print_help (void)
   printf ("    %s\n", _("timeout (with -t) to prevent the plugin from timing out if apt-get"));
   printf ("    %s\n", _("upgrade is expected to take longer than the default timeout."));
 
-#ifdef NP_EXTRA_OPTS
-  printf("\n");
-  printf("%s\n", _("Notes:"));
-  printf(_(UT_EXTRA_OPTS_NOTES));
-#endif
-
-  printf(_(UT_SUPPORT));
+  printf(UT_SUPPORT);
 }
 
 
@@ -472,6 +461,6 @@ print_help (void)
 void
 print_usage(void)
 {
-  printf (_("Usage:"));
+  printf ("%s\n", _("Usage:"));
   printf ("%s [[-d|-u|-U]opts] [-n] [-t timeout]\n", progname);
 }