Merge branch 'master' into dev/check_ssh-patches

1 files changed, 6 insertions, 10 deletions

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index ad673237..2d22619b 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -229,7 +229,7 @@ struct in_addr requested_address;
 
 int process_arguments(int, char **);
 int call_getopt(int, char **);
-int validate_arguments(int, int);
+int validate_arguments(int);
 void print_usage(void);
 void print_help(void);
 
@@ -470,10 +470,6 @@ int send_dhcp_discover(int sock){
         packet_xid=random();
         discover_packet.xid=htonl(packet_xid);
 
-        /**** WHAT THE HECK IS UP WITH THIS?!?  IF I DON'T MAKE THIS CALL, ONLY ONE SERVER RESPONSE IS PROCESSED!!!! ****/
-        /* downright bizzarre... */
-        ntohl(discover_packet.xid);
-
         /*discover_packet.secs=htons(65535);*/
         discover_packet.secs=0xFF;
 
@@ -1059,8 +1055,8 @@ int process_arguments(int argc, char **argv){
                 return ERROR;
 
         arg_index = call_getopt(argc,argv);
-        return validate_arguments(argc,arg_index);
-        }
+        return validate_arguments(argc);
+}
 
 
 
@@ -1158,13 +1154,13 @@ int call_getopt(int argc, char **argv){
         }
 
 
-int validate_arguments(int argc, int arg_index){
+int validate_arguments(int argc){
 
-        if(argc-optind > 0)
+        if(argc - optind > 0)
                 usage(_("Got unexpected non-option argument"));
 
         return OK;
-        }
+}
 
 
 #if defined(__sun__) || defined(__solaris__) || defined(__hpux__)