generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 53df4bfc: Merge "Use a more specific return type for app_id_from_name."

Browse Source 
* commit '53df4bfce81d8a6cfd4b5d991f5299f18dc4c958':
  Use a more specific return type for app_id_from_name.
This commit is contained in:
Elliott Hughes 2015-01-22 20:21:30 +00:00 committed by Android Git Automerger
commit d4517fb37c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/stubs.cpp
View File

@ -207,7 +207,7 @@ static group* android_name_to_group(group_state_t* state, const char* name) {
// u2_i1000 -> 2 * AID_USER + AID_ISOLATED_START + 1000 // u2_i1000 -> 2 * AID_USER + AID_ISOLATED_START + 1000
// u1_system -> 1 * AID_USER + android_ids['system'] // u1_system -> 1 * AID_USER + android_ids['system']
// returns 0 and sets errno to ENOENT in case of error // returns 0 and sets errno to ENOENT in case of error
static unsigned app_id_from_name(const char* name, bool is_group) { static id_t app_id_from_name(const char* name, bool is_group) {
char* end; char* end;
unsigned long userid; unsigned long userid;
bool is_shared_gid = false; bool is_shared_gid = false;
@ -272,7 +272,7 @@ static unsigned app_id_from_name(const char* name, bool is_group) {
return 0; return 0;
} }
return static_cast<unsigned>(appid + userid*AID_USER); return (appid + userid*AID_USER);
} }
static void print_app_name_from_uid(const uid_t uid, char* buffer, const int bufferlen) { static void print_app_name_from_uid(const uid_t uid, char* buffer, const int bufferlen) {