callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenBSD: use G_N_ELEMENTS instead of nitems

Browse Source 
nitems is never guaranteed to be defined in sys/params.h as it is meant
to be defined within a protected ifdef __KERNEL conditional.
Use G_N_ELEMENTS from GLib which is the proper way of doing this.
This commit is contained in:
Antoine Jacoutot
2012-07-09 18:20:34 +02:00
parent b900016a05
commit 974212ec82
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkmountoperation-x11.c
View File

@ -731,11 +731,11 @@ pid_get_parent (GPid pid)
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
sizeof(struct kinfo_proc), 0 }; sizeof(struct kinfo_proc), 0 };
if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) == -1) if (sysctl(mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
return (-1); return (-1);
mib[5] = (len / sizeof(struct kinfo_proc)); mib[5] = (len / sizeof(struct kinfo_proc));
if (sysctl(mib, nitems(mib), &kp, &len, NULL, 0) < 0) if (sysctl(mib, G_N_ELEMENTS (mib), &kp, &len, NULL, 0) < 0)
return -1; return -1;
ppid = kp.p_ppid; ppid = kp.p_ppid;
@ -760,7 +760,7 @@ pid_get_env (GPid pid, const gchar *key)
key_len = strlen (key); key_len = strlen (key);
ret = NULL; ret = NULL;
if (sysctl(mib, nitems(mib), strs, &len, NULL, 0) != -1) if (sysctl(mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) != -1)
{ {
for (i = 0; strs[i] != NULL; i++) for (i = 0; strs[i] != NULL; i++)
{ {
@ -792,7 +792,7 @@ pid_get_command_line (GPid pid)
strs = (char **)realloc(strs, len); strs = (char **)realloc(strs, len);
if (sysctl(mib, nitems(mib), strs, &len, NULL, 0) == -1) { if (sysctl(mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) == -1) {
g_free (strs); g_free (strs);
return ret; return ret;
} }