FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 11-11-2009, 08:08 PM
Laszlo Papp
 
Default Refactor do-while cycle in the api, util.c

* It makes the code clearer to read/understand
* Cppcheck tool doesn't show this anymore: [./util.c:215]: (error) Resource leak: fd
---
lib/libalpm/util.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index cf2d623..f54b2bf 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -212,8 +212,9 @@ int _alpm_lckmk()
_alpm_makepath(dir);
FREE(dir);

- while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1
- && errno == EINTR);
+ do {
+ fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000);
+ } while ( fd == -1 && errno == EINTR);
if(fd > 0) {
FILE *f = fdopen(fd, "w");
fprintf(f, "%ld
", (long)getpid());
@@ -315,7 +316,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int

st = archive_entry_stat(entry);
entryname = archive_entry_pathname(entry);
-
+
if(S_ISREG(st->st_mode)) {
archive_entry_set_perm(entry, 0644);
} else if(S_ISDIR(st->st_mode)) {
--
1.6.5.1
 
Old 11-12-2009, 07:20 AM
Dan McGee
 
Default Refactor do-while cycle in the api, util.c

On Wed, Nov 11, 2009 at 3:08 PM, Laszlo Papp <djszapi@archlinux.us> wrote:
> * It makes the code clearer to read/understand
> * Cppcheck tool doesn't show this anymore: [./util.c:215]: (error) Resource leak: fd
> ---
> *lib/libalpm/util.c | * *7 ++++---
> *1 files changed, 4 insertions(+), 3 deletions(-)

I have no idea why it doesn't apply cleanly, but I'm not going to bust
my butt at 2am working on this. Can you grab the raw email and apply
it yourself to a clean master?

Most likely it is the whitespace change you tried to sneak in there,
as I don't see any whitespace after the "-" in the actual email body.
If you resubmit without that this will get applied.

And argh, now I'm rambling, but why didn't we fix the ones in trans.c,
the other one in util.c, pacman.c, etc?

-Dan

dmcgee@galway ~/projects/pacman (master)
$ git am -3 -s < /tmp/do-while.patch
Applying: Refactor do-while cycle in the api, util.c
Using index info to reconstruct a base tree...
error: patch failed: lib/libalpm/util.c:315
error: lib/libalpm/util.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 Refactor do-while cycle in the api, util.c
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".
 

Thread Tools




All times are GMT. The time now is 02:07 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org