* ext/socket/option.c (inspect_local_peercred): constfied.
* ext/socket/ancdata.c (anc_inspect_socket_creds): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
395abae93d
commit
160c230f94
@ -433,7 +433,6 @@ anc_inspect_passcred_credentials(int level, int type, VALUE data, VALUE ret)
|
|||||||
static int
|
static int
|
||||||
anc_inspect_socket_creds(int level, int type, VALUE data, VALUE ret)
|
anc_inspect_socket_creds(int level, int type, VALUE data, VALUE ret)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
if (level != SOL_SOCKET && type != SCM_CREDS)
|
if (level != SOL_SOCKET && type != SCM_CREDS)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
@ -457,7 +456,8 @@ anc_inspect_socket_creds(int level, int type, VALUE data, VALUE ret)
|
|||||||
rb_str_catf(ret, " euid=%u", cred.cmcred_euid);
|
rb_str_catf(ret, " euid=%u", cred.cmcred_euid);
|
||||||
rb_str_catf(ret, " gid=%u", cred.cmcred_gid);
|
rb_str_catf(ret, " gid=%u", cred.cmcred_gid);
|
||||||
if (cred.cmcred_ngroups) {
|
if (cred.cmcred_ngroups) {
|
||||||
char *sep = "=";
|
int i;
|
||||||
|
const char *sep = "=";
|
||||||
rb_str_cat2(ret, " groups");
|
rb_str_cat2(ret, " groups");
|
||||||
for (i = 0; i < cred.cmcred_ngroups; i++) {
|
for (i = 0; i < cred.cmcred_ngroups; i++) {
|
||||||
rb_str_catf(ret, "%s%u", sep, cred.cmcred_groups[i]);
|
rb_str_catf(ret, "%s%u", sep, cred.cmcred_groups[i]);
|
||||||
@ -480,7 +480,8 @@ anc_inspect_socket_creds(int level, int type, VALUE data, VALUE ret)
|
|||||||
rb_str_catf(ret, " gid=%u", cred->sc_gid);
|
rb_str_catf(ret, " gid=%u", cred->sc_gid);
|
||||||
rb_str_catf(ret, " egid=%u", cred->sc_egid);
|
rb_str_catf(ret, " egid=%u", cred->sc_egid);
|
||||||
if (cred0.sc_ngroups) {
|
if (cred0.sc_ngroups) {
|
||||||
char *sep = "=";
|
int i;
|
||||||
|
const char *sep = "=";
|
||||||
rb_str_cat2(ret, " groups");
|
rb_str_cat2(ret, " groups");
|
||||||
for (i = 0; i < cred0.sc_ngroups; i++) {
|
for (i = 0; i < cred0.sc_ngroups; i++) {
|
||||||
rb_str_catf(ret, "%s%u", sep, cred->sc_groups[i]);
|
rb_str_catf(ret, "%s%u", sep, cred->sc_groups[i]);
|
||||||
|
@ -272,7 +272,7 @@ inspect_local_peercred(int level, int optname, VALUE data, VALUE ret)
|
|||||||
rb_str_catf(ret, " euid=%u", cred.cr_uid);
|
rb_str_catf(ret, " euid=%u", cred.cr_uid);
|
||||||
if (cred.cr_ngroups) {
|
if (cred.cr_ngroups) {
|
||||||
int i;
|
int i;
|
||||||
char *sep = " groups=";
|
const char *sep = " groups=";
|
||||||
for (i = 0; i < cred.cr_ngroups; i++) {
|
for (i = 0; i < cred.cr_ngroups; i++) {
|
||||||
rb_str_catf(ret, "%s%u", sep, cred.cr_groups[i]);
|
rb_str_catf(ret, "%s%u", sep, cred.cr_groups[i]);
|
||||||
sep = ",";
|
sep = ",";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user