[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/ksysguard/ksysguardd/Linux
From:       John Tapsell <john.tapsell () kdemail ! net>
Date:       2009-11-22 17:17:17
Message-ID: 1258910237.227235.23950.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1052869 by johnflux:

Make the code more consistent


 M  +6 -10     netstat.c  


--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Linux/netstat.c #1052868:1052869
@@ -139,7 +139,7 @@
 		a_addr.s_addr = addr;
 		return inet_ntoa(a_addr);
 	} else {
-		strncpy(buffer, host->h_name, sizeof(buffer));
+		strncpy(buffer, host->h_name, sizeof(buffer)-1);
 		buffer[sizeof(buffer) -1] = 0;
 		return (char *)buffer;
 	}
@@ -154,15 +154,12 @@
 		return (char *)"*";
 	}
 
-	memset(buffer, 0, sizeof(buffer));
+	if ((protocol = getprotobynumber(number)) == NULL)
+		snprintf(buffer, sizeof(buffer)-1, "%d", number);
+	else
+		strncpy(buffer, protocol->p_name, sizeof(buffer)-1);
+    buffer[sizeof(buffer) -1] = 0;
 
-	if ((protocol = getprotobynumber(number)) == NULL) {
-		snprintf(buffer, sizeof(buffer), "%d", number);
-	} else {
-		strncpy(buffer, protocol->p_name, sizeof(buffer));
-		buffer[sizeof(buffer) -1] = 0;
-	}
-
 	return (char *)buffer;
 }
 
@@ -170,7 +167,6 @@
 {
 	char line[1024];
 	int line_count = 0;
-	
 	while (fgets(line, 1024, netstat) != NULL)
 		line_count++;
 
[prev in list] [next in list] [prev in thread] [next in thread]