diff -urN ../orig.nplg/plugins/check_dhcp.c ./plugins/check_dhcp.c
--- ../orig.nplg/plugins/check_dhcp.c	2005-01-28 15:00:58.000000000 +0100
+++ ./plugins/check_dhcp.c	2005-06-01 07:29:42.000000000 +0200
@@ -73,8 +73,6 @@
 #include <sys/poll.h>
 #include <sys/dlpi.h>
 
-#define bcopy(source, destination, length) memcpy(destination, source, length)
-
 #define AREA_SZ 5000		/* buffer length in bytes */ 
 static u_long ctl_area[AREA_SZ];
 static u_long dat_area[AREA_SZ];
@@ -83,7 +81,7 @@
 
 #define GOT_CTRL 1 
 #define GOT_DATA 2 
-#define GOT_BOTH 3 
+#define GOT_BOTH 3
 #define GOT_INTR 4 
 #define GOT_ERR 128 
 
@@ -101,23 +99,6 @@
 
 #endif
 
-#define HAVE_GETOPT_H
-
-
-/**** Common definitions ****/
-
-#define STATE_OK          0
-#define STATE_WARNING     1
-#define STATE_CRITICAL    2
-#define STATE_UNKNOWN     -1
-
-#define OK                0
-#define ERROR             -1
-
-#define FALSE             0
-#define TRUE              1
-
-
 /**** DHCP definitions ****/
 
 #define MAX_DHCP_CHADDR_LENGTH           16
@@ -397,7 +378,7 @@
 
 
 	/* clear the packet data structure */
-	bzero(&discover_packet,sizeof(discover_packet));
+	memset(&discover_packet, 0, sizeof(discover_packet));
 
 
 	/* boot request flag (backward compatible with BOOTP servers) */
@@ -451,12 +432,12 @@
         sockaddr_broadcast.sin_family=AF_INET;
         sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT);
         sockaddr_broadcast.sin_addr.s_addr=INADDR_BROADCAST;
-	bzero(&sockaddr_broadcast.sin_zero,sizeof(sockaddr_broadcast.sin_zero));
+	memset(&sockaddr_broadcast.sin_zero, 0, sizeof(sockaddr_broadcast.sin_zero));
 
 
 	if (verbose) {
 		printf(_("DHCPDISCOVER to %s port %d\n"),inet_ntoa(sockaddr_broadcast.sin_addr),ntohs(sockaddr_broadcast.sin_port));
-		printf("DHCPDISCOVER XID: %lu (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid));
+		printf("DHCPDISCOVER XID: %u (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid));
 		printf("DHCDISCOVER ciaddr:  %s\n",inet_ntoa(discover_packet.ciaddr));
 		printf("DHCDISCOVER yiaddr:  %s\n",inet_ntoa(discover_packet.yiaddr));
 		printf("DHCDISCOVER siaddr:  %s\n",inet_ntoa(discover_packet.siaddr));
@@ -480,7 +461,6 @@
 	dhcp_packet offer_packet;
 	struct sockaddr_in source;
 	int result=OK;
-	int timeout=1;
 	int responses=0;
 	int x;
 	time_t start_time;
@@ -498,8 +478,8 @@
 		if (verbose) 
 			printf("\n\n");
 
-		bzero(&source,sizeof(source));
-		bzero(&offer_packet,sizeof(offer_packet));
+		memset(&source, 0, sizeof(source));
+		memset(&offer_packet, 0, sizeof(offer_packet));
 
 		result=OK;
 		result=receive_dhcp_packet(&offer_packet,sizeof(offer_packet),sock,dhcpoffer_timeout,&source);
@@ -519,13 +499,13 @@
 
 		if (verbose) {
 			printf(_("DHCPOFFER from IP address %s\n"),inet_ntoa(source.sin_addr));
-			printf("DHCPOFFER XID: %lu (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));
+			printf("DHCPOFFER XID: %u (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));
 		}
 
 		/* check packet xid to see if its the same as the one we used in the discover packet */
 		if(ntohl(offer_packet.xid)!=packet_xid){
 			if (verbose)
-				printf(_("DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid);
+				printf(_("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid);
 
 			continue;
 		        }
@@ -576,7 +556,6 @@
 
 /* sends a DHCP packet */
 int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in *dest){
-	struct sockaddr_in myname;
 	int result;
 
 	result=sendto(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)dest,sizeof(*dest));
@@ -617,9 +596,14 @@
 
         else{
 
-		/* why do we need to peek first?  i don't know, its a hack.  without it, the source address of the first packet received was
-		   not being interpreted correctly.  sigh... */
-		bzero(&source_address,sizeof(source_address));
+		/* why do we need to peek first?  i don't know, its a hack.
+		 * without it, the source address of the first packet received was
+		 * not being interpreted correctly.  sigh... */
+			/* Need to peek first to receive OOB data which otherwise
+			 * gets intermingled with the real data and corrupts it,
+			 * causing the sources address of the first received packet to
+			 * not being interpreted correctly */
+		memset(&source_address, 0, sizeof(source_address));
 		address_size=sizeof(source_address);
                 recv_result=recvfrom(sock,(char *)buffer,buffer_size,MSG_PEEK,(struct sockaddr *)&source_address,&address_size);
 		if (verbose)
@@ -658,11 +642,11 @@
         int flag=1;
 
         /* Set up the address we're going to bind to. */
-	bzero(&myname,sizeof(myname));
+	memset(&myname, 0, sizeof(myname));
         myname.sin_family=AF_INET;
         myname.sin_port=htons(DHCP_CLIENT_PORT);
         myname.sin_addr.s_addr=INADDR_ANY;                 /* listen on any address */
-        bzero(&myname.sin_zero,sizeof(myname.sin_zero));
+        memset(&myname.sin_zero, 0, sizeof(myname.sin_zero));
 
         /* create a socket for DHCP communications */
 	sock=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
@@ -976,7 +960,6 @@
 	int i=0;
 	struct in_addr ipaddress;
 
-#ifdef HAVE_GETOPT_H
 	int option_index = 0;
 	static struct option long_options[] =
 	{ 
@@ -989,14 +972,9 @@
 		{"help",           no_argument,      0,'h'},
 		{0,0,0,0}
 	};
-#endif
 
 	while(1){
-#ifdef HAVE_GETOPT_H
 		c=getopt_long(argc,argv,"+hVvt:s:r:t:i:",long_options,&option_index);
-#else
-		c=getopt(argc,argv,"+?hVvt:s:r:t:i:");
-#endif
 
 		i++;
 
@@ -1183,8 +1161,9 @@
 	printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"), strerror(errno));
         exit(STATE_UNKNOWN);
     }
-    bcopy((u_char *)bind_ack + bind_ack->dl_addr_offset, addr,
-        bind_ack->dl_addr_length);
+    memcpy(addr, (u_char *)bind_ack + bind_ack->dl_addr_offset,
+           bind_ack->dl_addr_length);
+
     return 0;
 }
 
@@ -1207,7 +1186,7 @@
 
 	if (GOT_ERR != dl_open(dev, unit, &fd)) {
         	if (GOT_ERR != dl_bind(fd, INSAP, mac_addr)) {
-                	bcopy( mac_addr, addr, 6);
+				memcpy(addr, mac_addr, 6);
                 	return 0;
                 }
 	}
diff -urN ../orig.nplg/plugins/check_nagios.c ./plugins/check_nagios.c
--- ../orig.nplg/plugins/check_nagios.c	2005-05-26 14:12:21.000000000 +0200
+++ ./plugins/check_nagios.c	2005-06-01 07:28:00.000000000 +0200
@@ -55,7 +55,6 @@
 	int procrss = 0;
 	float procpcpu = 0;
 	char procstat[8];
-	char procetime[MAX_INPUT_BUFFER];
 	char procprog[MAX_INPUT_BUFFER];
 	char *procargs;
 	int pos, cols;
diff -urN ../orig.nplg/plugins/check_swap.c ./plugins/check_swap.c
--- ../orig.nplg/plugins/check_swap.c	2005-01-24 08:29:54.000000000 +0100
+++ ./plugins/check_swap.c	2005-06-01 07:28:45.000000000 +0200
@@ -383,7 +383,7 @@
 			}
 			else if (strstr (optarg, ",") &&
 							 strstr (optarg, "%") &&
-							 sscanf (optarg, "%.0f,%d%%", &warn_size, &warn_percent) == 2) {
+							 sscanf (optarg, "%f,%d%%", &warn_size, &warn_percent) == 2) {
 				break;
 			}
 			else if (strstr (optarg, "%") &&
@@ -400,7 +400,7 @@
 			}
 			else if (strstr (optarg, ",") &&
 							 strstr (optarg, "%") &&
-							 sscanf (optarg, "%.0f,%d%%", &crit_size, &crit_percent) == 2) {
+							 sscanf (optarg, "%f,%d%%", &crit_size, &crit_percent) == 2) {
 				break;
 			}
 			else if (strstr (optarg, "%") &&
diff -urN ../orig.nplg/plugins/common.h ./plugins/common.h
--- ../orig.nplg/plugins/common.h	2004-12-10 11:42:00.000000000 +0100
+++ ./plugins/common.h	2005-06-01 07:31:26.000000000 +0200
@@ -80,10 +80,7 @@
 #include <signal.h>
 #endif
 
-/* TODO: define can be removed when all ifdef in each plugin has been removed */
-#define HAVE_GETOPT_H
 #include <getopt.h>
-
 #include <ctype.h>
 
 #ifdef HAVE_LWRES_NETDB_H
Binary files ../orig.nplg/po/de.gmo and ./po/de.gmo differ
Binary files ../orig.nplg/po/fr.gmo and ./po/fr.gmo differ
