Merge pull request #120 from kolyshkin/nits

kolyshkin · web-flow · commit 219c314cf070 · 2025-04-16T12:56:18.000-07:00
Minor assorted fixes

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
Acked-by: Tom Hromatka &lt;tom.hromatka@oracle.com&gt;
diff --git a/seccomp.go b/seccomp.go
@@ -1343,7 +1343,7 @@ func (f *ScmpFilter) TransactionReject() {
 	C.seccomp_transaction_reject(f.filterCtx)
 }
 
-// TransactionReject commits a transaction started by [TransactionStart].
+// TransactionCommit commits a transaction started by [TransactionStart].
 func (f *ScmpFilter) TransactionCommit() error {
 	f.lock.Lock()
 	defer f.lock.Unlock()
diff --git a/seccomp_internal.go b/seccomp_internal.go
@@ -818,10 +818,7 @@ func notifReceive(fd ScmpFd) (*ScmpNotifReq, error) {
 	if retCode := C.seccomp_notify_alloc(&req, &resp); retCode != 0 {
 		return nil, errRc(retCode)
 	}
-
-	defer func() {
-		C.seccomp_notify_free(req, resp)
-	}()
+	defer C.seccomp_notify_free(req, resp)
 
 	for {
 		retCode, errno := C.seccomp_notify_receive(C.int(fd), req)
@@ -855,10 +852,7 @@ func notifRespond(fd ScmpFd, scmpResp *ScmpNotifResp) error {
 	if retCode := C.seccomp_notify_alloc(&req, &resp); retCode != 0 {
 		return errRc(retCode)
 	}
-
-	defer func() {
-		C.seccomp_notify_free(req, resp)
-	}()
+	defer C.seccomp_notify_free(req, resp)
 
 	scmpResp.toNative(resp)
 

Original file line number	Diff line number	Diff line change
`@@ -1343,7 +1343,7 @@ func (f *ScmpFilter) TransactionReject() {`
`1343`	`1343`	`C.seccomp_transaction_reject(f.filterCtx)`
`1344`	`1344`	`}`
`1345`	`1345`
`1346`		`-// TransactionReject commits a transaction started by [TransactionStart].`
	`1346`	`+// TransactionCommit commits a transaction started by [TransactionStart].`
`1347`	`1347`	`func (f *ScmpFilter) TransactionCommit() error {`
`1348`	`1348`	`f.lock.Lock()`
`1349`	`1349`	`defer f.lock.Unlock()`