Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gratuitous style bug. #1

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: Style Checker

on:
pull_request: # maybe pull_request_target
branches: [ main ]
branches: [ dev, disable_style ]
types: [ opened, reopened, edited, synchronize ]

permissions:
Expand All @@ -31,4 +31,4 @@ jobs:
- name: Run checker
run: |
sha=$(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }})
tools/build/checkstyle9.pl --github ${sha}..${{ github.event.pull_request.head.sha }}
git diff ${sha}..${{ github.event.pull_request.head.sha }} | tools/build/checkstyle9.pl --github - || true
15 changes: 8 additions & 7 deletions sys/kern/kern_exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1080,12 +1080,13 @@
VM_OBJECT_WUNLOCK(object);
}
#endif
error = vm_page_grab_valid_unlocked(&m, object, 0,
VM_ALLOC_COUNT(VM_INITIAL_PAGEIN) |
error = vm_page_grab_valid_unlocked(&m, object, 0, VM_ALLOC_COUNT(VM_INITIAL_PAGEIN) |

Check warning on line 1083 in sys/kern/kern_exec.c

View workflow job for this annotation

GitHub Actions / Style Checker

line over 80 characters
VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY | VM_ALLOC_WIRED);

if (error != VM_PAGER_OK)

Check failure on line 1086 in sys/kern/kern_exec.c

View workflow job for this annotation

GitHub Actions / Style Checker

that open brace { should be on the previous line
{
return (EIO);
}
imgp->firstpage = sf_buf_alloc(m, 0);
imgp->image_header = (char *)sf_buf_kva(imgp->firstpage);

Expand Down Expand Up @@ -2380,12 +2381,12 @@
int
sbuf_drain_core_output(void *arg, const char *data, int len)
{
struct coredump_params *cp;
struct proc *p;
int error, locked;
struct coredump_params *cp;
struct proc *p;
int error, locked;

cp = arg;
p = cp->td->td_proc;
cp = arg;
p = cp->td->td_proc;

/*
* Some kern_proc out routines that print to this sbuf may
Expand Down