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-12-2009, 10:10 PM
Laszlo Papp
 
Default Refactor do/while cycle and multiple while cycles

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

diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index aea71db..bc594f9 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -261,7 +261,9 @@ int SYMEXPORT alpm_trans_release()
/* unlock db */
if(!nolock_flag) {
if(handle->lckfd != -1) {
- while(close(handle->lckfd) == -1 && errno == EINTR);
+ int fd;
+ fd = close(handle->lckfd);
+ while( fd == -1 && errno == EINTR);
handle->lckfd = -1;
}
if(_alpm_lckrm()) {
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index cf2d623..005e004 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)) {
@@ -511,7 +512,9 @@ int _alpm_run_chroot(const char *root, const char *cmd)
/* this code runs for the parent only (wait on the child) */
pid_t retpid;
int status;
- while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR);
+ do {
+ retpid = waitpid(pid, &status, 0);
+ } while( retpid == -1 && errno == EINTR);
if(retpid == -1) {
_alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)
"),
strerror(errno));
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index f4f8044..eb01824 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -234,7 +234,9 @@ static void cleanup(int ret) {
static ssize_t xwrite(int fd, const void *buf, size_t count)
{
ssize_t ret;
- while((ret = write(fd, buf, count)) == -1 && errno == EINTR);
+ do {
+ ret = write(fd, buf, count);
+ } while( ret == -1 && errno == EINTR);
return(ret);
}

--
1.6.5
 
Old 11-12-2009, 10:50 PM
Xavier
 
Default Refactor do/while cycle and multiple while cycles

On Fri, Nov 13, 2009 at 12:10 AM, Laszlo Papp <djszapi2@gmail.com> 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/trans.c | * *4 +++-
> *lib/libalpm/util.c *| * 11 +++++++----
> *src/pacman/pacman.c | * *4 +++-
> *3 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
> index aea71db..bc594f9 100644
> --- a/lib/libalpm/trans.c
> +++ b/lib/libalpm/trans.c
> @@ -261,7 +261,9 @@ int SYMEXPORT alpm_trans_release()
> * * * */* unlock db */
> * * * *if(!nolock_flag) {
> * * * * * * * *if(handle->lckfd != -1) {
> - * * * * * * * * * * * while(close(handle->lckfd) == -1 && errno == EINTR);
> + * * * * * * * * * * * int fd;
> + * * * * * * * * * * * fd = close(handle->lckfd);
> + * * * * * * * * * * * while( fd == -1 && errno == EINTR);
> * * * * * * * * * * * *handle->lckfd = -1;
> * * * * * * * *}

Hmmmmmmmmmmm ok.
Thanks ? Bye ?
 
Old 11-12-2009, 10:59 PM
Laszlo Papp
 
Default Refactor do/while cycle and multiple while cycles

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

diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index aea71db..17fc1b3 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -261,7 +261,10 @@ int SYMEXPORT alpm_trans_release()
/* unlock db */
if(!nolock_flag) {
if(handle->lckfd != -1) {
- while(close(handle->lckfd) == -1 && errno == EINTR);
+ int fd;
+ do {
+ fd = close(handle->lckfd);
+ } while( fd == -1 && errno == EINTR);
handle->lckfd = -1;
}
if(_alpm_lckrm()) {
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index cf2d623..005e004 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)) {
@@ -511,7 +512,9 @@ int _alpm_run_chroot(const char *root, const char *cmd)
/* this code runs for the parent only (wait on the child) */
pid_t retpid;
int status;
- while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR);
+ do {
+ retpid = waitpid(pid, &status, 0);
+ } while( retpid == -1 && errno == EINTR);
if(retpid == -1) {
_alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)
"),
strerror(errno));
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index f4f8044..eb01824 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -234,7 +234,9 @@ static void cleanup(int ret) {
static ssize_t xwrite(int fd, const void *buf, size_t count)
{
ssize_t ret;
- while((ret = write(fd, buf, count)) == -1 && errno == EINTR);
+ do {
+ ret = write(fd, buf, count);
+ } while( ret == -1 && errno == EINTR);
return(ret);
}

--
1.6.5
 
Old 11-12-2009, 11:15 PM
Xavier
 
Default Refactor do/while cycle and multiple while cycles

On Fri, Nov 13, 2009 at 12:59 AM, Laszlo Papp <djszapi2@gmail.com> 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/trans.c | * *5 ++++-
> *lib/libalpm/util.c *| * 11 +++++++----
> *src/pacman/pacman.c | * *4 +++-
> *3 files changed, 14 insertions(+), 6 deletions(-)
>

The 6th iteration of this trivial patch looks good to me.

Thanks for your hard work
 
Old 11-16-2009, 07:11 AM
Laszlo Papp
 
Default Refactor do/while cycle and multiple while cycles

On Fri, Nov 13, 2009 at 1:15 AM, Xavier <shiningxc@gmail.com> wrote:
> On Fri, Nov 13, 2009 at 12:59 AM, Laszlo Papp <djszapi2@gmail.com> 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/trans.c | * *5 ++++-
>> *lib/libalpm/util.c *| * 11 +++++++----
>> *src/pacman/pacman.c | * *4 +++-
>> *3 files changed, 14 insertions(+), 6 deletions(-)
>>
>
> The 6th iteration of this trivial patch looks good to me.
>
> Thanks for your hard work
>
>

Okay, Dan applied it, thank you the helps Xavier, really.

Best Regards,
Laszlo Papp
 

Thread Tools




All times are GMT. The time now is 11:42 AM.

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