FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch back all bzero() calls to use memset()

Browse Source 
Even if it's uglier to use memset, bzero seems deprecated.
This commit is contained in:
Landry Breuil
2018-06-03 17:56:31 +02:00
parent fcf8beb64e
commit 993ef78b81
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/process-tree-model.c
View File

@@ -465,7 +465,7 @@ xtm_process_tree_model_row_changed (XtmProcessTreeModel *treemodel, GtkTreePath
s_iter.user_data3 = NULL; s_iter.user_data3 = NULL;
/* Use the root entry as fall-back if no parent could be found */ /* Use the root entry as fall-back if no parent could be found */
bzero(&found, sizeof(found)); memset(&found, 0, sizeof(found));
found.parent = treemodel->tree; found.parent = treemodel->tree;
found.treemodel = treemodel; found.treemodel = treemodel;
gtk_tree_model_get_value (model, iter, treemodel->p_column, &found.p_value); gtk_tree_model_get_value (model, iter, treemodel->p_column, &found.p_value);
@@ -643,7 +643,7 @@ xtm_process_tree_model_row_inserted (XtmProcessTreeModel *treemodel, GtkTreePath
g_sequence_foreach_range (g_sequence_iter_next (lnk->list), g_sequence_get_end_iter (treemodel->list), g_sequence_foreach_range (g_sequence_iter_next (lnk->list), g_sequence_get_end_iter (treemodel->list),
do_path, (gpointer)gtk_tree_path_next); do_path, (gpointer)gtk_tree_path_next);
bzero(&found, sizeof(found)); memset(&found, 0, sizeof(found));
found.parent = treemodel->tree; found.parent = treemodel->tree;
found.treemodel = treemodel; found.treemodel = treemodel;
gtk_tree_model_get_value (model, iter, treemodel->p_column, &found.p_value); gtk_tree_model_get_value (model, iter, treemodel->p_column, &found.p_value);

6
src/task-manager-bsd.c
View File

@@ -99,7 +99,7 @@ gboolean get_task_list (GArray *task_list)
#else #else
struct kinfo_proc2 p = kp[i]; struct kinfo_proc2 p = kp[i];
#endif #endif
bzero(&t, sizeof(t)); memset(&t, 0, sizeof(t));
t.pid = p.p_pid; t.pid = p.p_pid;
t.ppid = p.p_ppid; t.ppid = p.p_ppid;
t.uid = p.p_uid; t.uid = p.p_uid;
@@ -114,11 +114,11 @@ gboolean get_task_list (GArray *task_list)
size = 1024; size = 1024;
if ((args = malloc(size)) == NULL) if ((args = malloc(size)) == NULL)
errx(1,"failed to allocate memory for argv structures at %zu", size); errx(1,"failed to allocate memory for argv structures at %zu", size);
bzero(args, size); memset(args, 0, size);
for (;; size *= 2) { for (;; size *= 2) {
if ((args = realloc(args, size)) == NULL) if ((args = realloc(args, size)) == NULL)
errx(1,"failed to allocate memory (size=%zu) for argv structures of pid %d", size, t.pid); errx(1,"failed to allocate memory (size=%zu) for argv structures of pid %d", size, t.pid);
bzero(args, size); memset(args, 0, size);
mib[0] = CTL_KERN; mib[0] = CTL_KERN;
mib[1] = KERN_PROC_ARGS; mib[1] = KERN_PROC_ARGS;
mib[2] = t.pid; mib[2] = t.pid;

4
src/task-manager-freebsd.c
View File

@@ -135,7 +135,7 @@ get_task_details (struct kinfo_proc *kp, Task *task)
size_t bufsz; size_t bufsz;
int i, oid[4]; int i, oid[4];
bzero(task, sizeof(Task)); memset(task, 0, sizeof(Task));
task->pid = kp->ki_pid; task->pid = kp->ki_pid;
task->ppid = kp->ki_ppid; task->ppid = kp->ki_ppid;
task->cpu_user = 100.0f * ((float)kp->ki_pctcpu / FSCALE); task->cpu_user = 100.0f * ((float)kp->ki_pctcpu / FSCALE);
@@ -151,7 +151,7 @@ get_task_details (struct kinfo_proc *kp, Task *task)
oid[2] = KERN_PROC_ARGS; oid[2] = KERN_PROC_ARGS;
oid[3] = kp->ki_pid; oid[3] = kp->ki_pid;
bufsz = sizeof(buf); bufsz = sizeof(buf);
bzero(buf, sizeof(buf)); memset(buf, 0, sizeof(buf));
if (sysctl(oid, 4, buf, &bufsz, 0, 0) == -1) { if (sysctl(oid, 4, buf, &bufsz, 0, 0) == -1) {
/* /*
* If the supplied buf is too short to hold the requested * If the supplied buf is too short to hold the requested

2
src/task-manager-linux.c
View File

@@ -208,7 +208,7 @@ get_task_details (GPid pid, Task *task)
} }
fclose (file); fclose (file);
bzero(task, sizeof(Task)); memset(task, 0, sizeof(Task));
/* Scanning the short process name is unreliable with scanf when it contains /* Scanning the short process name is unreliable with scanf when it contains
* spaces, retrieve it manually and fill the buffer */ * spaces, retrieve it manually and fill the buffer */

2
src/task-manager-skel.c
View File

@@ -49,7 +49,7 @@ get_cpu_usage (gushort *cpu_count, gfloat *cpu_user, gfloat *cpu_system)
static gboolean static gboolean
get_task_details (GPid pid, Task *task) get_task_details (GPid pid, Task *task)
{ {
bzero(task, sizeof(Task)); memset(task, 0, sizeof(Task));
g_snprintf (task->name, sizeof(task->name), "foo"); g_snprintf (task->name, sizeof(task->name), "foo");
g_snprintf (task->cmdline, sizeof(task->cmdline), "foo -bar"); g_snprintf (task->cmdline, sizeof(task->cmdline), "foo -bar");
g_snprintf (task->uid_name, sizeof(task->uid_name), "baz"); g_snprintf (task->uid_name, sizeof(task->uid_name), "baz");

2
src/task-manager-solaris.c
View File

@@ -184,7 +184,7 @@ get_task_details (GPid pid, Task *task)
return FALSE; return FALSE;
} }
bzero(task, sizeof(Task)); memset(task, 0, sizeof(Task));
task->pid = process.pr_pid; task->pid = process.pr_pid;
task->ppid = process.pr_ppid; task->ppid = process.pr_ppid;
g_strlcpy (task->name, process.pr_fname, sizeof(task->name)); g_strlcpy (task->name, process.pr_fname, sizeof(task->name));

2
src/task-manager.c
View File

@@ -481,7 +481,7 @@ get_uid_name (guint uid)
struct passwd *pw = NULL, pwd_buf; struct passwd *pw = NULL, pwd_buf;
char buf[4096]; char buf[4096];
bzero(buf, sizeof(buf)); memset(buf, 0, sizeof(buf));
error = getpwuid_r(uid, &pwd_buf, buf, sizeof(buf), &pw); error = getpwuid_r(uid, &pwd_buf, buf, sizeof(buf), &pw);
return (g_strdup ((0 == error && pw != NULL) ? pw->pw_name : "nobody")); return (g_strdup ((0 == error && pw != NULL) ? pw->pw_name : "nobody"));