mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 15:25:27 +00:00
Code Issues Releases Wiki Activity

Merge Fix wording of some warnings

Browse Source 
pwarn() prints "Warning" itsself, therefore it doesn't make sense to include/repeat that word in the actual warning text.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/650
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2020-10-11 11:34:29 +00:00
parent 21060e802a 01f5954b5c
commit 40b7019d72
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parser/parser_main.c
View File

@@ -1301,7 +1301,7 @@ static void setup_parallel_compile(void)
jobs_max = compute_jobs(maxn, jobs_max); jobs_max = compute_jobs(maxn, jobs_max);
if (jobs > jobs_max) { if (jobs > jobs_max) {
pwarn(WARN_JOBS, "%s: Warning capping number of jobs to %ld * # of cpus == '%ld'", pwarn(WARN_JOBS, "%s: Capping number of jobs to %ld * # of cpus == '%ld'",
progname, jobs_max, jobs); progname, jobs_max, jobs);
jobs = jobs_max; jobs = jobs_max;
} else if (jobs < jobs_max) } else if (jobs < jobs_max)

2
parser/policy_cache.c
View File

@@ -179,7 +179,7 @@ void install_cache(const char *cachetmpname, const char *cachename)
} }
if (rename(cachetmpname, cachename) < 0) { if (rename(cachetmpname, cachename) < 0) {
pwarn(WARN_CACHE, "Warning failed to write cache: %s\n", cachename); pwarn(WARN_CACHE, "Failed to write cache: %s\n", cachename);
unlink(cachetmpname); unlink(cachetmpname);
} }
else if (show_cache) { else if (show_cache) {