diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2016-01-11 21:40:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-11 21:40:43 +0000 |
| commit | 0e080262030f07821eb2c66377eec0ab1e3ef1a5 (patch) | |
| tree | 2d5b40810ac32d03f81814808598d2352151a80b | |
| parent | 4c0e6307875b9d278cf5e94baa3217ce1ce9dadf (diff) | |
| parent | bc67f44aa22f8f31c3386409e6f3fd0fdcbcffbe (diff) | |
| download | minijail-0e080262030f07821eb2c66377eec0ab1e3ef1a5.tar.gz | |
Merge "Make set_supplementary_gids return 'void'."brillo-m9-releasebrillo-m9-dev
| -rw-r--r-- | libminijail.c | 7 | ||||
| -rw-r--r-- | libminijail.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libminijail.c b/libminijail.c index c7b5738..d492522 100644 --- a/libminijail.c +++ b/libminijail.c @@ -195,8 +195,8 @@ void API minijail_change_gid(struct minijail *j, gid_t gid) j->flags.gid = 1; } -int API minijail_set_supplementary_gids(struct minijail *j, size_t size, - const gid_t *list) +void API minijail_set_supplementary_gids(struct minijail *j, size_t size, + const gid_t *list) { size_t i; @@ -208,7 +208,7 @@ int API minijail_set_supplementary_gids(struct minijail *j, size_t size, j->suppl_gid_list = NULL; j->suppl_gid_count = 0; j->flags.suppl_gids = 1; - return 0; + return; } /* Copy the gid_t array. */ @@ -221,7 +221,6 @@ int API minijail_set_supplementary_gids(struct minijail *j, size_t size, } j->suppl_gid_count = size; j->flags.suppl_gids = 1; - return 0; } int API minijail_change_user(struct minijail *j, const char *user) diff --git a/libminijail.h b/libminijail.h index ecc385a..fdd0d93 100644 --- a/libminijail.h +++ b/libminijail.h @@ -41,8 +41,8 @@ struct minijail *minijail_new(void); void minijail_change_uid(struct minijail *j, uid_t uid); void minijail_change_gid(struct minijail *j, gid_t gid); /* Copies |list|. */ -int minijail_set_supplementary_gids(struct minijail *j, size_t size, - const gid_t *list); +void minijail_set_supplementary_gids(struct minijail *j, size_t size, + const gid_t *list); /* Stores user to change to and copies |user| for internal consistency. */ int minijail_change_user(struct minijail *j, const char *user); /* Does not take ownership of |group|. */ |