# HG changeset patch # User Rob Landley # Date 1427507292 18000 # Node ID 7ced29d424b701f8cbddc687fb617a290703d9d1 # Parent dbee4e656aa6b9f4bf93bd476a6f047eda8f728d Minor cleanup of load_policy. diff -r dbee4e656aa6 -r 7ced29d424b7 toys/pending/load_policy.c --- a/toys/pending/load_policy.c Thu Mar 26 13:25:20 2015 -0500 +++ b/toys/pending/load_policy.c Fri Mar 27 20:48:12 2015 -0500 @@ -1,4 +1,4 @@ -/* runcon.c - Run command in specified security context +/* load_policy.c - Load a policy file * * Copyright 2015 The Android Open Source Project @@ -30,12 +30,8 @@ close(fd); } - if (!policy_data) { - error_exit("Couldn't read %s: %s", path, strerror(errno)); - } - - if (security_load_policy(policy_data, policy_len) < 0) - error_exit("Couldn't load %s: %s", path, strerror(errno)); + if (!policy_data || security_load_policy(policy_data, policy_len) < 0) + perror_exit("Couldn't %s %s: %s", policy_data ? "load" : "read", path); munmap(policy_data, policy_len); }