packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syntax-check: Add a rule to enforce glnx_autofd over glnx_fd_close 

And fix the one final use.

Closes: #1280
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-10-17 11:18:26 -04:00 committed by Atomic Bot
parent 3577b4a6c6
commit 9955695da3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cfg.mk
View File

@ -31,8 +31,12 @@ sc_glnx_errno_prefix_colon:
@prohibit='\<glnx_throw_errno_prefix *\(.*: ",' halt="don't add trailing : for glnx_throw_errno_prefix" \ @prohibit='\<glnx_throw_errno_prefix *\(.*: ",' halt="don't add trailing : for glnx_throw_errno_prefix" \
$(_sc_search_regexp) $(_sc_search_regexp)
sc_glnx_no_fd_close:
@prohibit='\<glnx_fd_close int' halt="Use glnx_autofd, not glnx_fd_close" \
$(_sc_search_regexp)
#SHELL=bash -x #SHELL=bash -x
show-vc-list-except: show-vc-list-except:
@$(VC_LIST_EXCEPT) @$(VC_LIST_EXCEPT)
VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk|*.gpg|*.sig|.xz$$ VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|cfg.mk|maint.mk|*.gpg|*.sig|.xz$$

2
src/libostree/ostree-repo-commit.c
View File

@ -821,7 +821,7 @@ adopt_and_commit_regfile (OstreeRepo *self,
ot_checksum_init (&hasher); ot_checksum_init (&hasher);
ot_checksum_update_bytes (&hasher, header); ot_checksum_update_bytes (&hasher, header);
glnx_fd_close int fd = -1; glnx_autofd int fd = -1;
if (!glnx_openat_rdonly (dfd, name, FALSE, &fd, error)) if (!glnx_openat_rdonly (dfd, name, FALSE, &fd, error))
return FALSE; return FALSE;