Removed never executed if statements. Used g_strlcpy instead of strncpy.

	* procargs.c: (glibtop_get_proc_args_s): Removed never executed if statements.
	* procstate.c: (glibtop_get_proc_state_s): Used g_strlcpy instead of
	strncpy.

3 files changed, 7 insertions, 15 deletions

diff --git a/sysdeps/aix/ChangeLog b/sysdeps/aix/ChangeLog
index 8adbc08c..87bbd6da 100644
--- a/sysdeps/aix/ChangeLog
+++ b/sysdeps/aix/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-06  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procargs.c: (glibtop_get_proc_args_s): Removed never executed if statements.
+	* procstate.c: (glibtop_get_proc_state_s): Used g_strlcpy instead of
+	strncpy.
+
 2004-05-25  Benoît Dejean  <tazforever@dlfp.org>
 
 	* uptime.c: (glibtop_get_uptime_p): Added boot_time.
diff --git a/sysdeps/aix/procargs.c b/sysdeps/aix/procargs.c
index e0f2790b..3d0b3ee1 100644
--- a/sysdeps/aix/procargs.c
+++ b/sysdeps/aix/procargs.c
@@ -74,13 +74,6 @@ glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
 	
 	size = max_len != 0 ? max_len : 4096;
 	args_buffer = g_malloc (size);
-	if (args_buffer == NULL)
-	{
-		glibtop_error_io_r (server, "Cannot malloc procsinfo");
-
-		return NULL;
-
-	}
 
 	result = getargs(pinfo, sizeof(struct procsinfo), args_buffer, size);
 	if (result == -1)
@@ -112,14 +105,7 @@ glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
 	}
 
 	args = g_malloc (len);
-	if (args == NULL)
-	{
-		glibtop_error_io_r (server, "Cannot malloc procsinfo");
-
-		g_free(args_buffer);
 
-		return NULL;
-	}
 	memcpy(args, args_buffer, len);
 	g_free(args_buffer);
 
diff --git a/sysdeps/aix/procstate.c b/sysdeps/aix/procstate.c
index b0a9c814..dbd03c7d 100644
--- a/sysdeps/aix/procstate.c
+++ b/sysdeps/aix/procstate.c
@@ -74,7 +74,7 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf,
 	}
 	else
 	{
-		strncpy(buf->cmd, pinfo->pi_comm, 39);
+		g_strlcpy(buf->cmd, pinfo->pi_comm, sizeof buf->cmd);
 	}
 
 	buf->uid = pinfo->pi_uid;