From 2f87aa447956208a35a35300d56f4100bf028529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= <bdejean@src.gnome.org>
Date: Sun, 6 Jun 2004 22:03:57 +0000
Subject: [PATCH] s/strncpy/g_strlcpy/.

	* netload.c: (glibtop_get_netload_p):
	* procstate.c: (glibtop_get_proc_state_p):
	* prockernel.c: (glibtop_get_proc_kernel_p): s/strncpy/g_strlcpy/.

	* procargs.c: (glibtop_get_proc_args_p):
	* procmap.c: (glibtop_get_proc_map_p): Cleaned.
---
 sysdeps/freebsd/ChangeLog    | 10 ++++++++++
 sysdeps/freebsd/netload.c    |  3 +--
 sysdeps/freebsd/procargs.c   |  7 +++----
 sysdeps/freebsd/prockernel.c |  5 ++---
 sysdeps/freebsd/procmap.c    |  4 +---
 sysdeps/freebsd/procstate.c  |  3 +--
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog
index af841bc8..4635b05d 100644
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* netload.c: (glibtop_get_netload_p):
+	* procstate.c: (glibtop_get_proc_state_p):	
+	* prockernel.c: (glibtop_get_proc_kernel_p): s/strncpy/g_strlcpy/.
+	
+	* procargs.c: (glibtop_get_proc_args_p):
+	* procmap.c: (glibtop_get_proc_map_p): Cleaned.
+	
+
 2004-05-26  Benoît Dejean  <tazforever@dlfp.org>
 
 	* procdata.c: (glibtop_get_procdata_s): Removed Linux related code.
diff --git a/sysdeps/freebsd/netload.c b/sysdeps/freebsd/netload.c
index bff71587..a2615e8b 100644
--- a/sysdeps/freebsd/netload.c
+++ b/sysdeps/freebsd/netload.c
@@ -118,8 +118,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	    strcat(tname, temp);
 	    tname [15] = 0;
 #else
-	    strncpy (tname, ifnet.if_xname, 16);
-	    tname [15] = 0;
+	    g_strlcpy (tname, ifnet.if_xname, sizeof tname);
 #endif
 
 #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
diff --git a/sysdeps/freebsd/procargs.c b/sysdeps/freebsd/procargs.c
index 07aca5e4..2730d2cf 100644
--- a/sysdeps/freebsd/procargs.c
+++ b/sysdeps/freebsd/procargs.c
@@ -50,7 +50,7 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 {
 	struct kinfo_proc *pinfo;
 	char *retval, **args, **ptr;
-	unsigned size = 0, pos = 0;
+	size_t size = 0, pos = 0;
 	int count;
 
 #ifndef __bsdi__
@@ -93,11 +93,10 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 		size += strlen (*ptr)+1;
 
 	size += 2;
-	retval = g_malloc (size);
-	memset (retval, 0, size);
+	retval = g_malloc0 (size);
 
 	for (ptr = args; *ptr; ptr++) {
-		int len = strlen (*ptr)+1;
+		const size_t len = strlen (*ptr)+1;
 		memcpy (retval+pos, *ptr, len);
 		pos += len;
 	}
diff --git a/sysdeps/freebsd/prockernel.c b/sysdeps/freebsd/prockernel.c
index e579a53e..d601fea7 100644
--- a/sysdeps/freebsd/prockernel.c
+++ b/sysdeps/freebsd/prockernel.c
@@ -138,9 +138,8 @@ glibtop_get_proc_kernel_p (glibtop *server,
 	buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
 
 	if (pinfo [0].PROC_WCHAN && pinfo [0].PROC_WMESG) {
-		strncpy (buf->wchan, pinfo [0].PROC_WMESG,
-			 sizeof (buf->wchan) - 1);
-		buf->wchan [sizeof (buf->wchan) - 1] = 0;
+		g_strlcpy (buf->wchan, pinfo [0].PROC_WMESG,
+			 sizeof buf->wchan);
 		buf->flags |= (1L << GLIBTOP_PROC_KERNEL_WCHAN);
 	} else {
 		buf->wchan [0] = 0;
diff --git a/sysdeps/freebsd/procmap.c b/sysdeps/freebsd/procmap.c
index 21867edb..d3ad3eef 100644
--- a/sysdeps/freebsd/procmap.c
+++ b/sysdeps/freebsd/procmap.c
@@ -150,9 +150,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 	buf->total = buf->number * buf->size;
 
-	maps = g_malloc (buf->total);
-
-	memset (maps, 0, buf->total);
+	maps = g_malloc0(buf->total);
 
 	buf->flags = _glibtop_sysdeps_proc_map;
 
diff --git a/sysdeps/freebsd/procstate.c b/sysdeps/freebsd/procstate.c
index 1dcad616..094425e3 100644
--- a/sysdeps/freebsd/procstate.c
+++ b/sysdeps/freebsd/procstate.c
@@ -90,8 +90,7 @@ glibtop_get_proc_state_p (glibtop *server,
 
 #endif
 
-	strncpy (buf->cmd, pinfo [0].PROC_COMM, sizeof (buf->cmd)-1);
-	buf->cmd [sizeof (buf->cmd)-1] = 0;
+	g_strlcpy (buf->cmd, pinfo [0].PROC_COMM, sizeof buf->cmd);
 
 	buf->uid = pinfo [0].PROC_SVUID;
 	buf->gid = pinfo [0].PROC_SVGID;