| author | Danek Duvall <danek.duvall@oracle.com> |
| Tue, 28 Mar 2017 13:52:39 -0700 | |
| changeset 7806 | ffcde471ae10 |
| permissions | -rw-r--r-- |
|
7806
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
The MA_RESERVED1 macro never had any meaning, and it's gone as of S12 build 121 |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
as part of PSARC/2017/031. In conversation with the upstream author, the |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
"R" designator can also go away. The pull request is available at |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
|
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
https://github.com/giampaolo/psutil/pull/1003 |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
|
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
--- psutil-1.2.1/psutil/_psutil_sunos.c 2017-03-28 10:14:25.150344244 -0700 |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
+++ psutil-1.2.1/psutil/_psutil_sunos.c 2017-03-28 11:25:20.578369853 -0700 |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
@@ -609,9 +609,7 @@ |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
sprintf(perms, "%c%c%c%c%c%c", p->pr_mflags & MA_READ ? 'r' : '-', |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
p->pr_mflags & MA_WRITE ? 'w' : '-', |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
p->pr_mflags & MA_EXEC ? 'x' : '-', |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
- p->pr_mflags & MA_SHARED ? 's' : '-', |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
- p->pr_mflags & MA_NORESERVE ? 'R' : '-', |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
- p->pr_mflags & MA_RESERVED1 ? '*' : ' '); |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
+ p->pr_mflags & MA_SHARED ? 's' : '-'); |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
|
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
// name |
|
ffcde471ae10
25789139 MA_RESERVED1 removal breaks psutil
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
if (strlen(p->pr_mapname) > 0) {
|