summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoît Dejean <bdejean@src.gnome.org>2004-06-06 21:25:24 +0000
committerBenoît Dejean <bdejean@src.gnome.org>2004-06-06 21:25:24 +0000
commit45f2f19c3ae39d69330d5413e77c6e6639a79958 (patch)
tree22ec8ac3701c2f57eb447e4ec5d5510062660d61
parentfe494bc8468da22a62f5c0a3defd53b40fc39fdc (diff)
downloadlibgtop-45f2f19c3ae39d69330d5413e77c6e6639a79958.tar.gz
Removed duplicated memset. Replaced strncpy by g_strlcpy.
* procdata.c: (glibtop_get_procdata_r): Removed duplicated memset. * procstate.c: (glibtop_get_proc_state_p): Replaced strncpy by g_strlcpy.
-rw-r--r--sysdeps/osf1/ChangeLog5
-rw-r--r--sysdeps/osf1/procdata.c2
-rw-r--r--sysdeps/osf1/procstate.c4
3 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/osf1/ChangeLog b/sysdeps/osf1/ChangeLog
index bc503fa5..b9714f3b 100644
--- a/sysdeps/osf1/ChangeLog
+++ b/sysdeps/osf1/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-06 Benoît Dejean <tazforever@dlfp.org>
+
+ * procdata.c: (glibtop_get_procdata_r): Removed duplicated memset.
+ * procstate.c: (glibtop_get_proc_state_p): Replaced strncpy by g_strlcpy.
+
2004-05-25 Benoît Dejean <tazforever@dlfp.org>
* sem_limits.c:
diff --git a/sysdeps/osf1/procdata.c b/sysdeps/osf1/procdata.c
index 96bb1430..e82e64fa 100644
--- a/sysdeps/osf1/procdata.c
+++ b/sysdeps/osf1/procdata.c
@@ -63,8 +63,6 @@ glibtop_get_procdata_r (glibtop *server, glibtop_procdata *buf, pid_t pid)
task_t thistask;
int ret, info_count;
- memset (buf, 0, sizeof (glibtop_procdata));
-
glibtop_init ();
memset (buf, 0, sizeof (glibtop_procdata));
diff --git a/sysdeps/osf1/procstate.c b/sysdeps/osf1/procstate.c
index 108291c7..71447877 100644
--- a/sysdeps/osf1/procstate.c
+++ b/sysdeps/osf1/procstate.c
@@ -81,9 +81,7 @@ glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf,
return;
}
- strncpy (buf->cmd, procinfo.pi_comm, sizeof (buf->cmd)-1);
-
- buf->cmd [sizeof (buf->cmd)-1] = 0;
+ g_strlcpy (buf->cmd, procinfo.pi_comm, sizeof buf->cmd);
buf->uid = procinfo.pi_svuid;
buf->gid = procinfo.pi_svgid;