Spent the day working on backwards compatability using getaddrinfo()

[nagiosplug.git] / plugins / check_nt.c

diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index b9aae1c41329d7c1a5fc522dfb4640fc2aafa5ac..c7baa474215a9c4553657514fc280c12918710e6 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -148,9 +148,9 @@ int main(int argc, char **argv){
                                        else if(utilization >= lvalue_list[1+offset] && return_code<STATE_WARNING)
                                                return_code=STATE_WARNING;
 
-                                       asprintf(&output_message," (%lu min. %lu%)",lvalue_list[0+offset], utilization);
+                                       asprintf(&output_message," %lu%% (%lu min average)", utilization, lvalue_list[0+offset]);
                                        asprintf(&temp_string,"%s%s",temp_string,output_message);
-                                       offset+=3;      //move accross the array 
+                                       offset+=3;      //move across the array 
                                }               
                                if (strlen(temp_string)>10) {
                                        // we had at least on loop
@@ -387,7 +387,6 @@ int main(int argc, char **argv){
 int process_arguments(int argc, char **argv){
        int c;
 
-#ifdef HAVE_GETOPT_H
        int option_index = 0;
        static struct option long_options[] =
        { 
@@ -401,7 +400,6 @@ int process_arguments(int argc, char **argv){
                {"help",     no_argument,      0,'h'},
                {0,0,0,0}
        };
-#endif
 
        /* no options were supplied */
        if(argc<2) return ERROR;
@@ -424,11 +422,7 @@ int process_arguments(int argc, char **argv){
        }
 
        while (1){
-#ifdef HAVE_GETOPT_H
                c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:",long_options,&option_index);
-#else
-               c = getopt(argc,argv,"+hVH:t:c:w:p:v:l:s:d:");
-#endif
 
                if (c==-1||c==EOF||c==1)
                        break;